summaryrefslogtreecommitdiff
path: root/gst-mixer-applet/applet.c
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-03-19 13:47:25 +0300
committerStefano Karapetsas <[email protected]>2015-03-23 10:21:31 +0100
commitc2a83bb51b890a08d07ca71867573019aa33e283 (patch)
tree4bda0f9b787aadf7ea20e5d959bfaedd52f6d148 /gst-mixer-applet/applet.c
parent52fd538bd1d823b6263efa3526bab797f0ab0827 (diff)
downloadmate-media-c2a83bb51b890a08d07ca71867573019aa33e283.tar.bz2
mate-media-c2a83bb51b890a08d07ca71867573019aa33e283.tar.xz
first connect to settings, then read them.
fixes the issue with GLib >= 2.43, https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619 Closes https://github.com/mate-desktop/mate-media/pull/58
Diffstat (limited to 'gst-mixer-applet/applet.c')
-rw-r--r--gst-mixer-applet/applet.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gst-mixer-applet/applet.c b/gst-mixer-applet/applet.c
index 377ed8e..1dddef7 100644
--- a/gst-mixer-applet/applet.c
+++ b/gst-mixer-applet/applet.c
@@ -422,6 +422,12 @@ mate_volume_applet_setup (MateVolumeApplet *applet,
GstMixerTrack *first_track;
gboolean res;
+ /* gsettings */
+ g_signal_connect (applet->settings, "changed::" MATE_VOLUME_APPLET_KEY_ACTIVE_ELEMENT,
+ G_CALLBACK (cb_gsettings), applet);
+ g_signal_connect (applet->settings, "changed::" MATE_VOLUME_APPLET_KEY_ACTIVE_TRACK,
+ G_CALLBACK (cb_gsettings), applet);
+
active_element_name = g_settings_get_string (applet->settings,
MATE_VOLUME_APPLET_KEY_ACTIVE_ELEMENT);
@@ -474,12 +480,6 @@ mate_volume_applet_setup (MateVolumeApplet *applet,
mate_volume_applet_refresh (applet, TRUE, -1, -1);
if (res) {
mate_volume_applet_setup_timeout (applet);
-
- /* gsettings */
- g_signal_connect (applet->settings, "changed::" MATE_VOLUME_APPLET_KEY_ACTIVE_ELEMENT,
- G_CALLBACK (cb_gsettings), applet);
- g_signal_connect (applet->settings, "changed::" MATE_VOLUME_APPLET_KEY_ACTIVE_TRACK,
- G_CALLBACK (cb_gsettings), applet);
}
gtk_widget_show (GTK_WIDGET (applet));