aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-03-05 10:38:57 +0000
committerConor Curran <conor.curran@canonical.com>2010-03-05 10:38:57 +0000
commit8d392c8f315f18c1ebc52850141b103897e2eea2 (patch)
tree9b2d839692f3e1668a1cacec9f4eecec5b6542a3 /src
parent378c3c3f79aae564090593af6c6ce6abdb3c541a (diff)
downloadayatana-indicator-sound-8d392c8f315f18c1ebc52850141b103897e2eea2.tar.gz
ayatana-indicator-sound-8d392c8f315f18c1ebc52850141b103897e2eea2.tar.bz2
ayatana-indicator-sound-8d392c8f315f18c1ebc52850141b103897e2eea2.zip
blocking event now being registered, removed unneccessary marshaller
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am18
-rw-r--r--src/dbus-menu-manager.c3
-rw-r--r--src/indicator-sound.c17
-rw-r--r--src/sound-service-dbus.h4
4 files changed, 10 insertions, 32 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 40a8fdd..73bb259 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,7 @@ libsoundmenu_la_SOURCES = \
indicator-sound.h \
indicator-sound.c \
dbus-shared-names.h \
- sound-service-client.h \
- sound-service-marshal.c \
- sound-service-marshal.h
+ sound-service-client.h
libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
libsoundmenu_la_LIBADD = $(APPLET_LIBS)
@@ -30,16 +28,6 @@ sound-service-client.h: $(srcdir)/sound-service.xml
--output=sound-service-client.h \
$(srcdir)/sound-service.xml
-sound-service-marshal.h: $(srcdir)/sound-service.list
- glib-genmarshal --header \
- --prefix=_sound_service_marshal $(srcdir)/sound-service.list \
- > sound-service-marshal.h
-
-sound-service-marshal.c: $(srcdir)/sound-service.list
- glib-genmarshal --body \
- --prefix=_sound_service_marshal $(srcdir)/sound-service.list \
- > sound-service-marshal.c
-
#################
# Session Stuff
@@ -74,9 +62,7 @@ sound-service-server.h: $(srcdir)/sound-service.xml
###############
BUILT_SOURCES = \
sound-service-client.h \
- sound-service-server.h \
- sound-service-marshal.h \
- sound-service-marshal.c
+ sound-service-server.h
EXTRA_DIST = \
sound-service.xml \
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index d2102ef..243a3a7 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -157,7 +157,8 @@ static void refresh_menu()
/**
-
+idle_routine:
+Something for glip mainloop to do when idle
**/
static gboolean idle_routine (gpointer data)
{
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 28f85b8..1fb8090 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -90,7 +90,7 @@ static void slider_size_allocate(GtkWidget *widget, GtkAllocation *allocation,
// 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_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);
static void fetch_volume_percent_from_dbus();
@@ -135,11 +135,6 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
design_team_size = gtk_icon_size_register("design-team-size", 22, 22);
-/* dbus_g_object_register_marshaller (_sound_service_marshal_VOID__INT_BOOLEAN,*/
-/* G_TYPE_NONE,*/
-/* G_TYPE_INT,*/
-/* G_TYPE_BOOLEAN,*/
-/* G_TYPE_INVALID);*/
return;
}
@@ -264,7 +259,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_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);
dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
@@ -393,10 +388,10 @@ static void fetch_mute_value_from_dbus()
g_debug("at the indicator start up and the MUTE returned from dbus method is %i", initial_mute);
}
-/*static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)*/
-/*{*/
-/* g_debug("signal caught - sink input while muted with value %i", block_value);*/
-/*}*/
+static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)
+{
+ g_debug("signal caught - sink input while muted with value %i", block_value);
+}
static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
{
diff --git a/src/sound-service-dbus.h b/src/sound-service-dbus.h
index ef0d7dd..1a06117 100644
--- a/src/sound-service-dbus.h
+++ b/src/sound-service-dbus.h
@@ -49,10 +49,6 @@ struct _SoundServiceDbus {
struct _SoundServiceDbusClass {
GObjectClass parent_class;
- /* Signals -> outward messages to the DBUS and beyond*/
- // TODO - ARE THESE NECESSARY ?
- //void (* sink_input_while_muted) (SoundServiceDbus *self, gboolean block_value, gpointer sound_data);
- //void (* sink_volume_update) (SoundServiceDbus *self, gdouble sink_volume, gpointer sound_data);
};
GType sound_service_dbus_get_type (void) G_GNUC_CONST;