aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-11 17:18:47 -0600
committerConor Curran <conor.curran@canonical.com>2011-01-11 17:18:47 -0600
commita43b6ddd497187cc8f3e9267ff6f7144cbbd31c8 (patch)
treef20e5830616590d7a19651a9fd5ea51f6fec80ff
parentd8da7cdced255ac430caa78b9e6d24d9476e76d8 (diff)
downloadayatana-indicator-sound-a43b6ddd497187cc8f3e9267ff6f7144cbbd31c8.tar.gz
ayatana-indicator-sound-a43b6ddd497187cc8f3e9267ff6f7144cbbd31c8.tar.bz2
ayatana-indicator-sound-a43b6ddd497187cc8f3e9267ff6f7144cbbd31c8.zip
indicator dbus fetches now working
-rw-r--r--src/indicator-sound.c7
-rw-r--r--src/sound-service-dbus.c8
2 files changed, 6 insertions, 9 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index cdcc723..3867f27 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -415,7 +415,7 @@ connection_changed (IndicatorServiceManager * sm,
G_DBUS_PROXY_FLAGS_NONE,
interface_info,
INDICATOR_SOUND_DBUS_NAME,
- INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH,
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH,
INDICATOR_SOUND_DBUS_INTERFACE,
NULL,
create_connection_to_service,
@@ -441,10 +441,8 @@ static void create_connection_to_service (GObject *source_object,
return;
}
- g_debug ( "about to connect to g-signal ");
g_signal_connect(priv->dbus_proxy, "g-signal",
G_CALLBACK(g_signal_cb), self);
- g_debug ( "after attempting to connect to g-signal ");
fetch_state (self);
}
@@ -524,7 +522,6 @@ static void get_sink_mute_cb ( GObject *object,
GVariant *result, *value;
GError *error = NULL;
gboolean is_muted;
-
result = g_dbus_proxy_call_finish ( priv->dbus_proxy,
res,
&error );
@@ -537,7 +534,7 @@ static void get_sink_mute_cb ( GObject *object,
value = g_variant_get_child_value(result, 0);
is_muted = g_variant_get_boolean(value);
-
+
if ( is_muted == TRUE ){
update_state(STATE_MUTED);
}
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 9490df8..6057a29 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -218,8 +218,8 @@ void sound_service_dbus_update_sink_mute(SoundServiceDbus* obj,
GVariant* v_output = g_variant_new("(b)", sink_mute);
GError * error = NULL;
g_dbus_connection_emit_signal( priv->connection,
- INDICATOR_SOUND_DBUS_NAME,
- INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH,
+ NULL,
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH,
INDICATOR_SOUND_DBUS_INTERFACE,
INDICATOR_SOUND_SIGNAL_SINK_MUTE_UPDATE,
v_output,
@@ -242,8 +242,8 @@ void sound_service_dbus_update_sink_availability(SoundServiceDbus* obj,
GError * error = NULL;
g_dbus_connection_emit_signal( priv->connection,
- INDICATOR_SOUND_DBUS_NAME,
- INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH,
+ NULL,
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH,
INDICATOR_SOUND_DBUS_INTERFACE,
INDICATOR_SOUND_SIGNAL_SINK_AVAILABLE_UPDATE,
v_output,