Skip to content
Snippets Groups Projects
Commit 2212128e authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Changes for name based dbus connection

parent 188b975e
No related branches found
No related tags found
No related merge requests found
...@@ -215,18 +215,18 @@ dbus_connect () ...@@ -215,18 +215,18 @@ dbus_connect ()
/* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */ /* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
/*
instanceProxy = dbus_g_proxy_new_for_name (connection, instanceProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/Instance", "/org/sflphone/SFLphone/Instance",
"org.sflphone.SFLphone.Instance"); "org.sflphone.SFLphone.Instance");
*/ /*
instanceProxy = dbus_g_proxy_new_for_name_owner (connection, instanceProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/Instance", "/org/sflphone/SFLphone/Instance",
"org.sflphone.SFLphone.Instance", "org.sflphone.SFLphone.Instance",
&error); &error);
*/
if (instanceProxy==NULL) if (instanceProxy==NULL)
{ {
...@@ -237,19 +237,19 @@ dbus_connect () ...@@ -237,19 +237,19 @@ dbus_connect ()
DEBUG ("DBus connected to Instance"); DEBUG ("DBus connected to Instance");
/*
callManagerProxy = dbus_g_proxy_new_for_name (connection, callManagerProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/CallManager", "/org/sflphone/SFLphone/CallManager",
"org.sflphone.SFLphone.CallManager"); "org.sflphone.SFLphone.CallManager");
*/ /*
callManagerProxy = dbus_g_proxy_new_for_name_owner (connection, callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/CallManager", "/org/sflphone/SFLphone/CallManager",
"org.sflphone.SFLphone.CallManager", "org.sflphone.SFLphone.CallManager",
&error); &error);
*/
if (callManagerProxy==NULL) if (callManagerProxy==NULL)
{ {
ERROR ("Failed to get proxy to CallManagers"); ERROR ("Failed to get proxy to CallManagers");
...@@ -300,20 +300,20 @@ dbus_connect () ...@@ -300,20 +300,20 @@ dbus_connect ()
dbus_g_proxy_connect_signal (callManagerProxy, dbus_g_proxy_connect_signal (callManagerProxy,
"volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL); "volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
/*
configurationManagerProxy = dbus_g_proxy_new_for_name (connection, configurationManagerProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/ConfigurationManager", "/org/sflphone/SFLphone/ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager"); "org.sflphone.SFLphone.ConfigurationManager");
*/ /*
configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection, configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
"/org/sflphone/SFLphone/ConfigurationManager", "/org/sflphone/SFLphone/ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager", "org.sflphone.SFLphone.ConfigurationManager",
&error); &error);
*/
if (!configurationManagerProxy) if (!configurationManagerProxy)
{ {
ERROR ("Failed to get proxy to ConfigurationManager"); ERROR ("Failed to get proxy to ConfigurationManager");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment