diff options
| -rw-r--r-- | src/indicator-sound.c | 4 | ||||
| -rw-r--r-- | src/sound-service.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 49fa4ed..07ffe30 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -25,7 +25,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib-object.h> #include <gtk/gtk.h> #include <libdbusmenu-gtk/menu.h> -#include <idoscalemenuitem.h> +#include <libido/idoscalemenuitem.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-bindings.h> @@ -93,6 +93,7 @@ static void fetch_mute_value_from_dbus(); // DBUS communication static DBusGProxy *sound_dbus_proxy = NULL; static void connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata); + static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean value, gpointer userdata); static void catch_signal_sink_volume_update(DBusGProxy * proxy, gdouble volume_percent, gpointer userdata); static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata); @@ -192,6 +193,7 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u } g_debug("about to connect to the signals"); dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_TYPE_BOOLEAN, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_CALLBACK(catch_signal_sink_input_while_muted), NULL, NULL); dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_TYPE_DOUBLE, G_TYPE_INVALID); dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_CALLBACK(catch_signal_sink_volume_update), NULL, NULL); diff --git a/src/sound-service.c b/src/sound-service.c index 503dc5a..4f76dd1 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -122,10 +122,10 @@ service_shutdown (IndicatorService *service, gpointer user_data) { if (mainloop != NULL) { - g_debug("Service shutdown - but commented out for right now"); - // TODO: uncomment for release -/* close_pulse_activites()*/ -/* g_main_loop_quit(mainloop);*/ + g_debug("Service shutdown !"); + // TODO: uncomment for release !! + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } |