summaryrefslogtreecommitdiff
path: root/mate-volume-control/src/gvc-applet.c
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2014-08-21 01:22:43 +0200
committerinfirit <[email protected]>2014-10-09 16:53:01 +0200
commit11fd36a91709a4e279718eca0cf90b08f6853b36 (patch)
tree17b2d69aa064e38f74d09a9bedede63fc252a2b3 /mate-volume-control/src/gvc-applet.c
parent1699403b1f771b6f9c66889d54b645baf46c7d4d (diff)
downloadmate-media-11fd36a91709a4e279718eca0cf90b08f6853b36.tar.bz2
mate-media-11fd36a91709a4e279718eca0cf90b08f6853b36.tar.xz
Fixes for applet, remove application controls correctly and fix the device test button
Diffstat (limited to 'mate-volume-control/src/gvc-applet.c')
-rw-r--r--mate-volume-control/src/gvc-applet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mate-volume-control/src/gvc-applet.c b/mate-volume-control/src/gvc-applet.c
index fd5affc..ab2d2cc 100644
--- a/mate-volume-control/src/gvc-applet.c
+++ b/mate-volume-control/src/gvc-applet.c
@@ -98,7 +98,7 @@ update_icon_input (GvcApplet *applet)
if G_UNLIKELY (control == NULL) {
/* In the unlikely case when there is no
- * default output control, use the application
+ * default input control, use the application
* control for the icon */
control = input;
}
@@ -165,7 +165,7 @@ on_input_stream_control_added (MateMixerStream *stream,
mate_mixer_stream_control_get_role (control);
/* Non-application input control doesn't affect the icon */
- if (role == MATE_MIXER_STREAM_CONTROL_ROLE_APPLICATION)
+ if (role != MATE_MIXER_STREAM_CONTROL_ROLE_APPLICATION)
return;
}
@@ -201,7 +201,7 @@ update_default_input_stream (GvcApplet *applet)
g_object_unref (applet->priv->input);
}
- applet->priv->input = mate_mixer_context_get_default_input_stream (applet->priv->context);
+ applet->priv->input = g_object_ref (stream);
if (applet->priv->input != NULL) {
g_signal_connect (G_OBJECT (applet->priv->input),
"control-added",