aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-25 19:28:29 -0600
committerConor Curran <conor.curran@canonical.com>2011-01-25 19:28:29 -0600
commitd20e8f85ca28589e486fd395bd2071d63b2069ae (patch)
treea1ff74cc4b631aeb645c47f851047aa20cda1685 /src
parent9643b10b825c13fe46d211b6ab1cd2230392f299 (diff)
downloadayatana-indicator-sound-d20e8f85ca28589e486fd395bd2071d63b2069ae.tar.gz
ayatana-indicator-sound-d20e8f85ca28589e486fd395bd2071d63b2069ae.tar.bz2
ayatana-indicator-sound-d20e8f85ca28589e486fd395bd2071d63b2069ae.zip
tidy up
Diffstat (limited to 'src')
-rw-r--r--src/dbus-shared-names.h2
-rw-r--r--src/indicator-sound.c21
-rw-r--r--src/sound-service-dbus.c7
-rw-r--r--src/sound-service.list2
-rw-r--r--src/sound-state-manager.c4
5 files changed, 26 insertions, 10 deletions
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index b90d7a2..385a997 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef __DBUS_SHARED_NAMES_H__
-#define __DBUS_SHARED_NAMES_H__ 1
+#define __DBUS_SHARED_NAMES_H__
#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicators.sound"
#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 59b9c92..ea67011 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -99,6 +99,11 @@ static void connection_changed (IndicatorServiceManager * sm,
gboolean connected,
gpointer userdata);
+static void g_signal_cb ( GDBusProxy* proxy,
+ gchar* sender_name,
+ gchar* signal_name,
+ GVariant* parameters,
+ gpointer user_data);
static void
indicator_sound_class_init (IndicatorSoundClass *klass)
@@ -274,12 +279,26 @@ static void create_connection_to_service (GObject *source_object,
g_error_free(error);
return;
}
-
+ g_debug ("Connection to dbus seemed to work fine from the indicator side");
sound_state_manager_connect_to_dbus (priv->state_manager,
priv->dbus_proxy);
+ g_signal_connect (priv->dbus_proxy, "g-signal",
+ G_CALLBACK (g_signal_cb), self);
+
+}
+
+static void
+g_signal_cb ( GDBusProxy* proxy,
+ gchar* sender_name,
+ gchar* signal_name,
+ GVariant* parameters,
+ gpointer user_data)
+{
+ g_debug ( "!!! indicator-sound signal_cb" );
}
+
static gboolean
new_transport_widget (DbusmenuMenuitem * newitem,
DbusmenuMenuitem * parent,
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index ad4ac71..1e7b6d5 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -312,20 +312,19 @@ void sound_service_dbus_update_sound_state (SoundServiceDbus* self,
GError * error = NULL;
+ g_debug ("emitting signal with value %i", (int)update);
g_dbus_connection_emit_signal( priv->connection,
NULL,
INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH,
INDICATOR_SOUND_DBUS_INTERFACE,
INDICATOR_SOUND_SIGNAL_SOUND_STATE_UPDATE,
- v_output,
- &error );
+ v_output,
+ &error );
if (error != NULL) {
g_error("Unable to emit signal 'sinkinputwhilemuted' because : %s", error->message);
g_error_free(error);
return;
}
-
-
}
static SoundState sound_service_dbus_get_state_from_volume (SoundServiceDbus* self)
diff --git a/src/sound-service.list b/src/sound-service.list
deleted file mode 100644
index ee376e9..0000000
--- a/src/sound-service.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:INT,BOOLEAN
-
diff --git a/src/sound-state-manager.c b/src/sound-state-manager.c
index 83fb952..f6d39d0 100644
--- a/src/sound-state-manager.c
+++ b/src/sound-state-manager.c
@@ -190,7 +190,7 @@ sound_state_manager_connect_to_dbus (SoundStateManager* self, GDBusProxy* proxy)
{
SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
priv->dbus_proxy = proxy;
- g_debug (" here about to register for signal callback");
+ g_debug (" here about to register for signal callback on %s", g_dbus_proxy_get_name (priv->dbus_proxy));
g_signal_connect (priv->dbus_proxy, "g-signal",
G_CALLBACK (sound_state_signal_cb), self);
@@ -203,7 +203,7 @@ sound_state_signal_cb ( GDBusProxy* proxy,
GVariant* parameters,
gpointer user_data)
{
- g_debug ( "!!! signal_cb with value" );
+ g_debug ( "!!! sound state manager signal_cb" );
g_return_if_fail (SOUND_IS_STATE_MANAGER (user_data));
SoundStateManager* self = SOUND_STATE_MANAGER (user_data);