From 817f4e495095d096589e8ff9e6cb2f5a359b0bbd Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
Date: Tue, 12 May 2009 10:19:38 -0400
Subject: [PATCH] Second test with DBUS owner
---
sflphone-client-gnome/src/dbus/dbus.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 178dc55c87..cad464f7fa 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -215,12 +215,12 @@ dbus_connect ()
/* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
- // instanceProxy = dbus_g_proxy_new_for_name_owner (connection,
- instanceProxy = dbus_g_proxy_new_for_name (connection,
+ // instanceProxy = dbus_g_proxy_new_for_name (connection,
+ instanceProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/Instance",
- "org.sflphone.SFLphone.Instance");
- // &error);
+ "org.sflphone.SFLphone.Instance",
+ &error);
if (instanceProxy==NULL)
{
@@ -230,13 +230,12 @@ dbus_connect ()
DEBUG ("DBus connected to Instance");
-
- // callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
- callManagerProxy = dbus_g_proxy_new_for_name (connection,
+ // callManagerProxy = dbus_g_proxy_new_for_name (connection,
+ callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/CallManager",
- "org.sflphone.SFLphone.CallManager");
- // &error);
+ "org.sflphone.SFLphone.CallManager",
+ &error);
if (callManagerProxy==NULL)
{
@@ -288,12 +287,12 @@ dbus_connect ()
dbus_g_proxy_connect_signal (callManagerProxy,
"volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
- // configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
- configurationManagerProxy = dbus_g_proxy_new_for_name (connection,
+ // configurationManagerProxy = dbus_g_proxy_new_for_name (connection,
+ configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/ConfigurationManager",
- "org.sflphone.SFLphone.ConfigurationManager");
- // &error);
+ "org.sflphone.SFLphone.ConfigurationManager",
+ &error);
if (!configurationManagerProxy)
{
--
GitLab