diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index 38500dda9548612c1e5e33346fae835d709534ab..c87e6f7e0280a686a29f3e19adaa700088fe1234 100644
--- a/sflphone-gtk/configure.ac
+++ b/sflphone-gtk/configure.ac
@@ -1,7 +1,7 @@
-AC_INIT([SFLPhone],[0.8],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.8],[sflphoneteam@savoirfairelinux.com],[sflphone])
AM_CONFIG_HEADER(config.h)
-PACKAGE=SFLPhone
+PACKAGE=SFLphone
VERSION=0.8
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index e661f2281f1bdc92098c5e74e2585422005a9c9e..204fbbf2524ce0cfba9d003a3135a3bd87df462f 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -114,7 +114,7 @@ sflphone_init()
account_list_init ();
if(!dbus_connect ())
{
- main_window_error_message("Unable to connect to the SFLPhone server.\nMake sure the daemon is running.");
+ main_window_error_message("Unable to connect to the SFLphone server.\nMake sure the daemon is running.");
return FALSE;
}
else
diff --git a/sflphone-gtk/src/callmanager-glue.h b/sflphone-gtk/src/callmanager-glue.h
index ce61baa8405dfe4eaad20838f14d22d91b1e6046..538a8f72e8481febb602a3d169d537d27869c534 100644
--- a/sflphone-gtk/src/callmanager-glue.h
+++ b/sflphone-gtk/src/callmanager-glue.h
@@ -6,29 +6,29 @@
G_BEGIN_DECLS
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_CallManager
-#define DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_CallManager
+#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_CallManager
+#define DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_CallManager
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_place_call (DBusGProxy *proxy, const char * IN_accountID, const char * IN_callID, const char * IN_to, GError **error)
+org_sflphone_SFLphone_CallManager_place_call (DBusGProxy *proxy, const char * IN_accountID, const char * IN_callID, const char * IN_to, GError **error)
{
return dbus_g_proxy_call (proxy, "placeCall", error, G_TYPE_STRING, IN_accountID, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_place_call_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_place_call_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_place_call_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_place_call_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_place_call_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_place_call_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -37,35 +37,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_place_call_async (DBusGProxy *proxy, const char * IN_accountID, const char * IN_callID, const char * IN_to, org_sflphone_SFLPhone_CallManager_place_call_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_place_call_async (DBusGProxy *proxy, const char * IN_accountID, const char * IN_callID, const char * IN_to, org_sflphone_SFLphone_CallManager_place_call_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "placeCall", org_sflphone_SFLPhone_CallManager_place_call_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "placeCall", org_sflphone_SFLphone_CallManager_place_call_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_refuse (DBusGProxy *proxy, const char * IN_callID, GError **error)
+org_sflphone_SFLphone_CallManager_refuse (DBusGProxy *proxy, const char * IN_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "refuse", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_refuse_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_refuse_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_refuse_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_refuse_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_refuse_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_refuse_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -74,35 +74,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_refuse_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_refuse_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_refuse_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_refuse_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "refuse", org_sflphone_SFLPhone_CallManager_refuse_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "refuse", org_sflphone_SFLphone_CallManager_refuse_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_accept (DBusGProxy *proxy, const char * IN_callID, GError **error)
+org_sflphone_SFLphone_CallManager_accept (DBusGProxy *proxy, const char * IN_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "accept", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_accept_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_accept_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_accept_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_accept_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_accept_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_accept_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -111,35 +111,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_accept_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_accept_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_accept_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_accept_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "accept", org_sflphone_SFLPhone_CallManager_accept_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "accept", org_sflphone_SFLphone_CallManager_accept_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_hang_up (DBusGProxy *proxy, const char * IN_callID, GError **error)
+org_sflphone_SFLphone_CallManager_hang_up (DBusGProxy *proxy, const char * IN_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "hangUp", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_hang_up_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_hang_up_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_hang_up_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_hang_up_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_hang_up_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_hang_up_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -148,35 +148,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_hang_up_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_hang_up_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_hang_up_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_hang_up_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "hangUp", org_sflphone_SFLPhone_CallManager_hang_up_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "hangUp", org_sflphone_SFLphone_CallManager_hang_up_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_hold (DBusGProxy *proxy, const char * IN_callID, GError **error)
+org_sflphone_SFLphone_CallManager_hold (DBusGProxy *proxy, const char * IN_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "hold", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_hold_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_hold_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_hold_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_hold_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_hold_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_hold_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -185,35 +185,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_hold_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_hold_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_hold_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_hold_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "hold", org_sflphone_SFLPhone_CallManager_hold_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "hold", org_sflphone_SFLphone_CallManager_hold_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_unhold (DBusGProxy *proxy, const char * IN_callID, GError **error)
+org_sflphone_SFLphone_CallManager_unhold (DBusGProxy *proxy, const char * IN_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "unhold", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_unhold_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_unhold_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_unhold_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_unhold_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_unhold_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_unhold_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -222,35 +222,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_unhold_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_unhold_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_unhold_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_unhold_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "unhold", org_sflphone_SFLPhone_CallManager_unhold_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "unhold", org_sflphone_SFLphone_CallManager_unhold_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_transfert (DBusGProxy *proxy, const char * IN_callID, const char * IN_to, GError **error)
+org_sflphone_SFLphone_CallManager_transfert (DBusGProxy *proxy, const char * IN_callID, const char * IN_to, GError **error)
{
return dbus_g_proxy_call (proxy, "transfert", error, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_transfert_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_transfert_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_transfert_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_transfert_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_transfert_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_transfert_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -259,35 +259,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_transfert_async (DBusGProxy *proxy, const char * IN_callID, const char * IN_to, org_sflphone_SFLPhone_CallManager_transfert_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_transfert_async (DBusGProxy *proxy, const char * IN_callID, const char * IN_to, org_sflphone_SFLphone_CallManager_transfert_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "transfert", org_sflphone_SFLPhone_CallManager_transfert_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "transfert", org_sflphone_SFLphone_CallManager_transfert_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_STRING, IN_to, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_set_volume (DBusGProxy *proxy, const char * IN_device, const gdouble IN_value, GError **error)
+org_sflphone_SFLphone_CallManager_set_volume (DBusGProxy *proxy, const char * IN_device, const gdouble IN_value, GError **error)
{
return dbus_g_proxy_call (proxy, "setVolume", error, G_TYPE_STRING, IN_device, G_TYPE_DOUBLE, IN_value, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_set_volume_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_set_volume_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_set_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_set_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_set_volume_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_set_volume_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -296,36 +296,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_set_volume_async (DBusGProxy *proxy, const char * IN_device, const gdouble IN_value, org_sflphone_SFLPhone_CallManager_set_volume_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_set_volume_async (DBusGProxy *proxy, const char * IN_device, const gdouble IN_value, org_sflphone_SFLphone_CallManager_set_volume_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "setVolume", org_sflphone_SFLPhone_CallManager_set_volume_async_callback, stuff, g_free, G_TYPE_STRING, IN_device, G_TYPE_DOUBLE, IN_value, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "setVolume", org_sflphone_SFLphone_CallManager_set_volume_async_callback, stuff, g_free, G_TYPE_STRING, IN_device, G_TYPE_DOUBLE, IN_value, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_get_volume (DBusGProxy *proxy, const char * IN_device, gdouble* OUT_value, GError **error)
+org_sflphone_SFLphone_CallManager_get_volume (DBusGProxy *proxy, const char * IN_device, gdouble* OUT_value, GError **error)
{
return dbus_g_proxy_call (proxy, "getVolume", error, G_TYPE_STRING, IN_device, G_TYPE_INVALID, G_TYPE_DOUBLE, OUT_value, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_get_volume_reply) (DBusGProxy *proxy, gdouble OUT_value, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_get_volume_reply) (DBusGProxy *proxy, gdouble OUT_value, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_get_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_get_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
gdouble OUT_value;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_DOUBLE, &OUT_value, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_get_volume_reply)data->cb) (proxy, OUT_value, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_get_volume_reply)data->cb) (proxy, OUT_value, error, data->userdata);
return;
}
@@ -334,36 +334,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_get_volume_async (DBusGProxy *proxy, const char * IN_device, org_sflphone_SFLPhone_CallManager_get_volume_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_get_volume_async (DBusGProxy *proxy, const char * IN_device, org_sflphone_SFLphone_CallManager_get_volume_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getVolume", org_sflphone_SFLPhone_CallManager_get_volume_async_callback, stuff, g_free, G_TYPE_STRING, IN_device, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getVolume", org_sflphone_SFLphone_CallManager_get_volume_async_callback, stuff, g_free, G_TYPE_STRING, IN_device, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_get_call_details (DBusGProxy *proxy, const char * IN_callID, GHashTable** OUT_infos, GError **error)
+org_sflphone_SFLphone_CallManager_get_call_details (DBusGProxy *proxy, const char * IN_callID, GHashTable** OUT_infos, GError **error)
{
return dbus_g_proxy_call (proxy, "getCallDetails", error, G_TYPE_STRING, IN_callID, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), OUT_infos, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_get_call_details_reply) (DBusGProxy *proxy, GHashTable *OUT_infos, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_get_call_details_reply) (DBusGProxy *proxy, GHashTable *OUT_infos, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_get_call_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_get_call_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
GHashTable* OUT_infos;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), &OUT_infos, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_get_call_details_reply)data->cb) (proxy, OUT_infos, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_get_call_details_reply)data->cb) (proxy, OUT_infos, error, data->userdata);
return;
}
@@ -372,36 +372,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_get_call_details_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLPhone_CallManager_get_call_details_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_get_call_details_async (DBusGProxy *proxy, const char * IN_callID, org_sflphone_SFLphone_CallManager_get_call_details_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getCallDetails", org_sflphone_SFLPhone_CallManager_get_call_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getCallDetails", org_sflphone_SFLphone_CallManager_get_call_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_callID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_CallManager_get_current_call_id (DBusGProxy *proxy, char ** OUT_callID, GError **error)
+org_sflphone_SFLphone_CallManager_get_current_call_id (DBusGProxy *proxy, char ** OUT_callID, GError **error)
{
return dbus_g_proxy_call (proxy, "getCurrentCallID", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_callID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_CallManager_get_current_call_id_reply) (DBusGProxy *proxy, char * OUT_callID, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_CallManager_get_current_call_id_reply) (DBusGProxy *proxy, char * OUT_callID, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_CallManager_get_current_call_id_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_CallManager_get_current_call_id_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char * OUT_callID;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_callID, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_CallManager_get_current_call_id_reply)data->cb) (proxy, OUT_callID, error, data->userdata);
+ (*(org_sflphone_SFLphone_CallManager_get_current_call_id_reply)data->cb) (proxy, OUT_callID, error, data->userdata);
return;
}
@@ -410,15 +410,15 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_CallManager_get_current_call_id_async (DBusGProxy *proxy, org_sflphone_SFLPhone_CallManager_get_current_call_id_reply callback, gpointer userdata)
+org_sflphone_SFLphone_CallManager_get_current_call_id_async (DBusGProxy *proxy, org_sflphone_SFLphone_CallManager_get_current_call_id_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getCurrentCallID", org_sflphone_SFLPhone_CallManager_get_current_call_id_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getCurrentCallID", org_sflphone_SFLphone_CallManager_get_current_call_id_async_callback, stuff, g_free, G_TYPE_INVALID);
}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_CallManager */
+#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_CallManager */
G_END_DECLS
diff --git a/sflphone-gtk/src/configurationmanager-glue.h b/sflphone-gtk/src/configurationmanager-glue.h
index 263642380723f8a0627a3e3fe181b54859821b01..209f539612e71d66a0872a3d902c1fb97889f239 100644
--- a/sflphone-gtk/src/configurationmanager-glue.h
+++ b/sflphone-gtk/src/configurationmanager-glue.h
@@ -6,30 +6,30 @@
G_BEGIN_DECLS
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_ConfigurationManager
-#define DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_ConfigurationManager
+#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_ConfigurationManager
+#define DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_ConfigurationManager
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_account_details (DBusGProxy *proxy, const char * IN_accountID, GHashTable** OUT_details, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_account_details (DBusGProxy *proxy, const char * IN_accountID, GHashTable** OUT_details, GError **error)
{
return dbus_g_proxy_call (proxy, "getAccountDetails", error, G_TYPE_STRING, IN_accountID, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), OUT_details, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_account_details_reply) (DBusGProxy *proxy, GHashTable *OUT_details, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_account_details_reply) (DBusGProxy *proxy, GHashTable *OUT_details, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_account_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_account_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
GHashTable* OUT_details;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), &OUT_details, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_account_details_reply)data->cb) (proxy, OUT_details, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_account_details_reply)data->cb) (proxy, OUT_details, error, data->userdata);
return;
}
@@ -38,35 +38,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_account_details_async (DBusGProxy *proxy, const char * IN_accountID, org_sflphone_SFLPhone_ConfigurationManager_get_account_details_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_account_details_async (DBusGProxy *proxy, const char * IN_accountID, org_sflphone_SFLphone_ConfigurationManager_get_account_details_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getAccountDetails", org_sflphone_SFLPhone_ConfigurationManager_get_account_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getAccountDetails", org_sflphone_SFLphone_ConfigurationManager_get_account_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_set_account_details (DBusGProxy *proxy, const char * IN_accountID, const GHashTable* IN_details, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_set_account_details (DBusGProxy *proxy, const char * IN_accountID, const GHashTable* IN_details, GError **error)
{
return dbus_g_proxy_call (proxy, "setAccountDetails", error, G_TYPE_STRING, IN_accountID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_set_account_details_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_set_account_details_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_set_account_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_set_account_details_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_set_account_details_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_set_account_details_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -75,35 +75,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_set_account_details_async (DBusGProxy *proxy, const char * IN_accountID, const GHashTable* IN_details, org_sflphone_SFLPhone_ConfigurationManager_set_account_details_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_set_account_details_async (DBusGProxy *proxy, const char * IN_accountID, const GHashTable* IN_details, org_sflphone_SFLphone_ConfigurationManager_set_account_details_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "setAccountDetails", org_sflphone_SFLPhone_ConfigurationManager_set_account_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "setAccountDetails", org_sflphone_SFLphone_ConfigurationManager_set_account_details_async_callback, stuff, g_free, G_TYPE_STRING, IN_accountID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_add_account (DBusGProxy *proxy, const GHashTable* IN_details, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_add_account (DBusGProxy *proxy, const GHashTable* IN_details, GError **error)
{
return dbus_g_proxy_call (proxy, "addAccount", error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_add_account_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_add_account_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_add_account_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_add_account_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_add_account_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_add_account_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -112,35 +112,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_add_account_async (DBusGProxy *proxy, const GHashTable* IN_details, org_sflphone_SFLPhone_ConfigurationManager_add_account_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_add_account_async (DBusGProxy *proxy, const GHashTable* IN_details, org_sflphone_SFLphone_ConfigurationManager_add_account_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "addAccount", org_sflphone_SFLPhone_ConfigurationManager_add_account_async_callback, stuff, g_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "addAccount", org_sflphone_SFLphone_ConfigurationManager_add_account_async_callback, stuff, g_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_details, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_remove_account (DBusGProxy *proxy, const char * IN_accoundID, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_remove_account (DBusGProxy *proxy, const char * IN_accoundID, GError **error)
{
return dbus_g_proxy_call (proxy, "removeAccount", error, G_TYPE_STRING, IN_accoundID, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_remove_account_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_remove_account_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_remove_account_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_remove_account_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_remove_account_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_remove_account_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -149,36 +149,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_remove_account_async (DBusGProxy *proxy, const char * IN_accoundID, org_sflphone_SFLPhone_ConfigurationManager_remove_account_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_remove_account_async (DBusGProxy *proxy, const char * IN_accoundID, org_sflphone_SFLphone_ConfigurationManager_remove_account_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "removeAccount", org_sflphone_SFLPhone_ConfigurationManager_remove_account_async_callback, stuff, g_free, G_TYPE_STRING, IN_accoundID, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "removeAccount", org_sflphone_SFLphone_ConfigurationManager_remove_account_async_callback, stuff, g_free, G_TYPE_STRING, IN_accoundID, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_account_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_account_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getAccountList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_account_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_account_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_account_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_account_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_account_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_account_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -187,36 +187,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_account_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_account_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_account_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_account_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getAccountList", org_sflphone_SFLPhone_ConfigurationManager_get_account_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getAccountList", org_sflphone_SFLphone_ConfigurationManager_get_account_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_version (DBusGProxy *proxy, char ** OUT_version, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_version (DBusGProxy *proxy, char ** OUT_version, GError **error)
{
return dbus_g_proxy_call (proxy, "getVersion", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_version, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_version_reply) (DBusGProxy *proxy, char * OUT_version, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_version_reply) (DBusGProxy *proxy, char * OUT_version, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_version_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_version_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char * OUT_version;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_version, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_version_reply)data->cb) (proxy, OUT_version, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_version_reply)data->cb) (proxy, OUT_version, error, data->userdata);
return;
}
@@ -225,36 +225,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_version_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_version_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_version_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_version_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getVersion", org_sflphone_SFLPhone_ConfigurationManager_get_version_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getVersion", org_sflphone_SFLphone_ConfigurationManager_get_version_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getRingtoneList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -263,36 +263,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getRingtoneList", org_sflphone_SFLPhone_ConfigurationManager_get_ringtone_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getRingtoneList", org_sflphone_SFLphone_ConfigurationManager_get_ringtone_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getCodecList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_codec_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_codec_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -301,36 +301,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_codec_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getCodecList", org_sflphone_SFLPhone_ConfigurationManager_get_codec_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getCodecList", org_sflphone_SFLphone_ConfigurationManager_get_codec_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getToneLocaleList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -339,35 +339,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getToneLocaleList", org_sflphone_SFLPhone_ConfigurationManager_get_tone_locale_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getToneLocaleList", org_sflphone_SFLphone_ConfigurationManager_get_tone_locale_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order (DBusGProxy *proxy, const char ** IN_ringtone, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order (DBusGProxy *proxy, const char ** IN_ringtone, GError **error)
{
return dbus_g_proxy_call (proxy, "setCodecPreferedOrder", error, G_TYPE_STRV, IN_ringtone, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -376,36 +376,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_async (DBusGProxy *proxy, const char ** IN_ringtone, org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_async (DBusGProxy *proxy, const char ** IN_ringtone, org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "setCodecPreferedOrder", org_sflphone_SFLPhone_ConfigurationManager_set_codec_prefered_order_async_callback, stuff, g_free, G_TYPE_STRV, IN_ringtone, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "setCodecPreferedOrder", org_sflphone_SFLphone_ConfigurationManager_set_codec_prefered_order_async_callback, stuff, g_free, G_TYPE_STRV, IN_ringtone, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order (DBusGProxy *proxy, char *** OUT_ringtone, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order (DBusGProxy *proxy, char *** OUT_ringtone, GError **error)
{
return dbus_g_proxy_call (proxy, "getCodecPreferedOrder", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_ringtone, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_reply) (DBusGProxy *proxy, char * *OUT_ringtone, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_reply) (DBusGProxy *proxy, char * *OUT_ringtone, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_ringtone;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_ringtone, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_reply)data->cb) (proxy, OUT_ringtone, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_reply)data->cb) (proxy, OUT_ringtone, error, data->userdata);
return;
}
@@ -414,36 +414,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getCodecPreferedOrder", org_sflphone_SFLPhone_ConfigurationManager_get_codec_prefered_order_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getCodecPreferedOrder", org_sflphone_SFLphone_ConfigurationManager_get_codec_prefered_order_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getPlaybackDeviceList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -452,36 +452,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getPlaybackDeviceList", org_sflphone_SFLPhone_ConfigurationManager_get_playback_device_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getPlaybackDeviceList", org_sflphone_SFLphone_ConfigurationManager_get_playback_device_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_record_device_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getRecordDeviceList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -490,36 +490,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getRecordDeviceList", org_sflphone_SFLPhone_ConfigurationManager_get_record_device_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getRecordDeviceList", org_sflphone_SFLphone_ConfigurationManager_get_record_device_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list (DBusGProxy *proxy, char *** OUT_list, GError **error)
{
return dbus_g_proxy_call (proxy, "getSampleRateList", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_list, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_reply) (DBusGProxy *proxy, char * *OUT_list, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_list;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_list, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_reply)data->cb) (proxy, OUT_list, error, data->userdata);
return;
}
@@ -528,36 +528,36 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getSampleRateList", org_sflphone_SFLPhone_ConfigurationManager_get_sample_rate_list_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getSampleRateList", org_sflphone_SFLphone_ConfigurationManager_get_sample_rate_list_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_get_parameters (DBusGProxy *proxy, GHashTable** OUT_parameters, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_get_parameters (DBusGProxy *proxy, GHashTable** OUT_parameters, GError **error)
{
return dbus_g_proxy_call (proxy, "getParameters", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), OUT_parameters, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_get_parameters_reply) (DBusGProxy *proxy, GHashTable *OUT_parameters, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_get_parameters_reply) (DBusGProxy *proxy, GHashTable *OUT_parameters, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_get_parameters_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_get_parameters_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
GHashTable* OUT_parameters;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), &OUT_parameters, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_get_parameters_reply)data->cb) (proxy, OUT_parameters, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_get_parameters_reply)data->cb) (proxy, OUT_parameters, error, data->userdata);
return;
}
@@ -566,35 +566,35 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_get_parameters_async (DBusGProxy *proxy, org_sflphone_SFLPhone_ConfigurationManager_get_parameters_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_get_parameters_async (DBusGProxy *proxy, org_sflphone_SFLphone_ConfigurationManager_get_parameters_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "getParameters", org_sflphone_SFLPhone_ConfigurationManager_get_parameters_async_callback, stuff, g_free, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "getParameters", org_sflphone_SFLphone_ConfigurationManager_get_parameters_async_callback, stuff, g_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
-org_sflphone_SFLPhone_ConfigurationManager_set_parameters (DBusGProxy *proxy, const GHashTable* IN_parameters, GError **error)
+org_sflphone_SFLphone_ConfigurationManager_set_parameters (DBusGProxy *proxy, const GHashTable* IN_parameters, GError **error)
{
return dbus_g_proxy_call (proxy, "setParameters", error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_parameters, G_TYPE_INVALID, G_TYPE_INVALID);
}
-typedef void (*org_sflphone_SFLPhone_ConfigurationManager_set_parameters_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+typedef void (*org_sflphone_SFLphone_ConfigurationManager_set_parameters_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
static void
-org_sflphone_SFLPhone_ConfigurationManager_set_parameters_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+org_sflphone_SFLphone_ConfigurationManager_set_parameters_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(org_sflphone_SFLPhone_ConfigurationManager_set_parameters_reply)data->cb) (proxy, error, data->userdata);
+ (*(org_sflphone_SFLphone_ConfigurationManager_set_parameters_reply)data->cb) (proxy, error, data->userdata);
return;
}
@@ -603,15 +603,15 @@ static
inline
#endif
DBusGProxyCall*
-org_sflphone_SFLPhone_ConfigurationManager_set_parameters_async (DBusGProxy *proxy, const GHashTable* IN_parameters, org_sflphone_SFLPhone_ConfigurationManager_set_parameters_reply callback, gpointer userdata)
+org_sflphone_SFLphone_ConfigurationManager_set_parameters_async (DBusGProxy *proxy, const GHashTable* IN_parameters, org_sflphone_SFLphone_ConfigurationManager_set_parameters_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_new (DBusGAsyncData, 1);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "setParameters", org_sflphone_SFLPhone_ConfigurationManager_set_parameters_async_callback, stuff, g_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_parameters, G_TYPE_INVALID);
+ return dbus_g_proxy_begin_call (proxy, "setParameters", org_sflphone_SFLphone_ConfigurationManager_set_parameters_async_callback, stuff, g_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_parameters, G_TYPE_INVALID);
}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLPhone_ConfigurationManager */
+#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_sflphone_SFLphone_ConfigurationManager */
G_END_DECLS
diff --git a/sflphone-gtk/src/dbus.c b/sflphone-gtk/src/dbus.c
index 713572130655ccd0643c56f4c8128f44764aad13..9dc7372218f713be02a585986c7ea2e1efbc6e66 100644
--- a/sflphone-gtk/src/dbus.c
+++ b/sflphone-gtk/src/dbus.c
@@ -96,6 +96,10 @@ call_state_cb (DBusGProxy *proxy,
{
sflphone_hung_up (c);
}
+ else if ( strcmp(state, "UNHOLD") == 0 )
+ {
+ sflphone_current (c);
+ }
else if ( strcmp(state, "HOLD") == 0 )
{
sflphone_hold (c);
@@ -139,9 +143,9 @@ dbus_connect ()
/* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
- "org.sflphone.SFLPhone",
- "/org/sflphone/SFLPhone/CallManager",
- "org.sflphone.SFLPhone.CallManager",
+ "org.sflphone.SFLphone",
+ "/org/sflphone/SFLphone/CallManager",
+ "org.sflphone.SFLphone.CallManager",
&error);
if (error)
{
@@ -188,9 +192,9 @@ dbus_connect ()
"volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
- "org.sflphone.SFLPhone",
- "/org/sflphone/SFLPhone/ConfigurationManager",
- "org.sflphone.SFLPhone.ConfigurationManager",
+ "org.sflphone.SFLphone",
+ "/org/sflphone/SFLphone/ConfigurationManager",
+ "org.sflphone.SFLphone.ConfigurationManager",
&error);
if (error)
{
@@ -212,13 +216,14 @@ void
dbus_clean ()
{
g_object_unref (callManagerProxy);
+ g_object_unref (configurationManagerProxy);
}
void
dbus_hold (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_hold ( callManagerProxy, c->callID, &error);
+ org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call hold() on CallManager: %s\n",
@@ -236,7 +241,7 @@ void
dbus_unhold (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_unhold ( callManagerProxy, c->callID, &error);
+ org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call unhold() on CallManager: %s\n",
@@ -254,7 +259,7 @@ void
dbus_hang_up (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_hang_up ( callManagerProxy, c->callID, &error);
+ org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call hang_up() on CallManager: %s\n",
@@ -272,7 +277,7 @@ void
dbus_transfert (const call_t * c, gchar * to )
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_transfert ( callManagerProxy, c->callID, to, &error);
+ org_sflphone_SFLphone_CallManager_transfert ( callManagerProxy, c->callID, to, &error);
if (error)
{
g_printerr ("Failed to call transfert() on CallManager: %s\n",
@@ -290,7 +295,7 @@ void
dbus_accept (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_accept ( callManagerProxy, c->callID, &error);
+ org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call accept(%s) on CallManager: %s\n", c->callID,
@@ -308,7 +313,7 @@ void
dbus_refuse (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_refuse ( callManagerProxy, c->callID, &error);
+ org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call refuse() on CallManager: %s\n",
@@ -328,7 +333,7 @@ void
dbus_place_call (const call_t * c)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_place_call ( callManagerProxy, c->accountID, c->callID, c->to, &error);
+ org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->accountID, c->callID, c->to, &error);
if (error)
{
g_printerr ("Failed to call placeCall() on CallManager: %s\n",
@@ -348,7 +353,7 @@ dbus_account_list()
{
GError *error = NULL;
char ** array;
- org_sflphone_SFLPhone_ConfigurationManager_get_account_list (
+ org_sflphone_SFLphone_ConfigurationManager_get_account_list (
configurationManagerProxy,
&array,
&error);
@@ -371,7 +376,7 @@ dbus_account_details(gchar * accountID)
{
GError *error = NULL;
GHashTable * details;
- org_sflphone_SFLPhone_ConfigurationManager_get_account_details (
+ org_sflphone_SFLphone_ConfigurationManager_get_account_details (
configurationManagerProxy,
accountID,
&details,
@@ -394,7 +399,7 @@ void
dbus_remove_account(gchar * accountID)
{
GError *error = NULL;
- org_sflphone_SFLPhone_ConfigurationManager_remove_account (
+ org_sflphone_SFLphone_ConfigurationManager_remove_account (
configurationManagerProxy,
accountID,
&error);
@@ -415,7 +420,7 @@ void
dbus_set_account_details(account_t *a)
{
GError *error = NULL;
- org_sflphone_SFLPhone_ConfigurationManager_set_account_details (
+ org_sflphone_SFLphone_ConfigurationManager_set_account_details (
configurationManagerProxy,
a->accountID,
a->properties,
@@ -437,7 +442,7 @@ void
dbus_set_volume(const gchar * device, gdouble value)
{
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_set_volume(
+ org_sflphone_SFLphone_CallManager_set_volume(
callManagerProxy,
device,
value,
@@ -463,7 +468,7 @@ dbus_get_volume(const gchar * device)
gdouble value;
GError *error = NULL;
- org_sflphone_SFLPhone_CallManager_get_volume(
+ org_sflphone_SFLphone_CallManager_get_volume(
callManagerProxy,
device,
&value,
diff --git a/sflphone-gtk/src/dbus.h b/sflphone-gtk/src/dbus.h
index 2493a0de7388877633be1361eb5de3541ed1d160..f6050142ce743652ed2008e427dd5c5f2266b83a 100644
--- a/sflphone-gtk/src/dbus.h
+++ b/sflphone-gtk/src/dbus.h
@@ -41,6 +41,7 @@ void dbus_refuse (const call_t * c);
void dbus_place_call (const call_t * c);
/* ConfigurationManager */
+/** Returns a NULL terminated array of gchar pointers */
gchar ** dbus_account_list();
GHashTable * dbus_account_details(gchar * accountID);
void dbus_set_account_details(account_t *a);
diff --git a/sflphone-gtk/src/main.c b/sflphone-gtk/src/main.c
index 92cb8286a895bc4e36b803ab3553bff8175154dc..a9bc42f7fa804d4fcef21237479e450e69c4ff2a 100644
--- a/sflphone-gtk/src/main.c
+++ b/sflphone-gtk/src/main.c
@@ -85,8 +85,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
/** @file callmanager-glue.h
* @brief CallManager dbus API.
* This file is generated by dbus-binding-tool using the server's
- * callmanager-introspec.xml.
- *
+ * callmanager-introspec.xml:
+ * <pre> dbus-binding-tool --mode=glib-client "../../src/dbus/callmanager-introspec.xml" > callmanager-glue.h</pre>
* This file dbus calls wrapper functions to simplify access to dbus API.
*
*/
@@ -95,7 +95,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
/** @file configurationmanager-glue.h
* @brief ConfigurationManager dbus API.
* This file is generated by dbus-binding-tool using the server's
- * configurationmanager-introspec.xml.
+ * configurationmanager-introspec.xml:
+ * <pre>dbus-binding-tool --mode=glib-client "../../src/dbus/configurationmanager-introspec.xml" > configurationmanager-glue.h</pre>
*
* This file dbus calls wrapper functions to simplify access to dbus API.
*
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index 69a257a3d14d32c68b5876696ff11face00278b4..e812ed86081679b5741f150d3a020c0fba8f5541 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -45,12 +45,12 @@ help_about ( void * foo)
gtk_show_about_dialog( GTK_WINDOW(get_main_window()),
"name", PACKAGE,
- "title", "About SFLPhone",
+ "title", "About SFLphone",
"version", VERSION,
"website", "http://www.sflphone.org",
"copyright", "Copyright © 2004-2007 Savoir-faire Linux Inc.",
"translator-credits", "Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.net>",
- "comments", "SFLPhone is a VOIP client compatible with SIP and IAX protocols.",
+ "comments", "SFLphone is a VOIP client compatible with SIP and IAX protocols.",
"artists", artists,
"authors", authors,
NULL);
diff --git a/sflphone-gtk/src/screen.c b/sflphone-gtk/src/screen.c
index 59f1c1ad96f6b123350ef5c700e281ca2dde7adf..4cb6a4d0704df7be44cc97322c5a03f39199487e 100644
--- a/sflphone-gtk/src/screen.c
+++ b/sflphone-gtk/src/screen.c
@@ -24,8 +24,6 @@
GtkWidget * label;
GtkWidget * hbox;
-
-
GtkWidget *
create_screen()
{
@@ -54,25 +52,15 @@ create_screen()
gtk_box_pack_start (GTK_BOX (subvbox), sw, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-
-
screen_clear();
return subvbox;
-
}
void
screen_clear()
{
- gtk_label_set_markup(GTK_LABEL(label), "<big><b>Welcome to SFLPhone</b></big>\n");
-
- /*gtk_widget_hide( hangupButton );
- gtk_widget_show( callButton );
- gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(holdButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), FALSE);*/
+ gtk_label_set_markup(GTK_LABEL(label), "<big><b>Welcome to SFLphone</b></big>\n");
}
void
@@ -81,28 +69,4 @@ screen_set_call(const call_t * c)
gchar * markup = g_strconcat("<big><b>", call_get_name(c), "</b></big>\n", call_get_number(c), NULL);
gtk_label_set_markup(GTK_LABEL(label), markup);
g_free(markup);
-
- if(c->state == CALL_STATE_DIALING)
- {
- /*gtk_widget_hide( hangupButton );
- gtk_widget_show( callButton );
- gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
- gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(holdButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), FALSE);*/
- }
- else if (c->state == CALL_STATE_CURRENT)
- {
- //gtk_widget_hide( callButton );
- /* Hack : if hangupButton is put on the window in create_screen()
- * the hbox will request space for 4 buttons making the window larger than needed */
- //gtk_box_pack_start (GTK_BOX (hbox), hangupButton, TRUE /*expand*/, TRUE /*fill*/, 10 /*padding*/);
- /*gtk_box_reorder_child(GTK_BOX (hbox), hangupButton, 0);
- gtk_widget_show( hangupButton );
- gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
- gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE);
- gtk_widget_set_sensitive( GTK_WIDGET(holdButton), TRUE);
- gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), TRUE);*/
- }
-
}
diff --git a/src/dbus/callmanager-glue.h b/src/dbus/callmanager-glue.h
index f53e037dceba385fdd1631a63ae08f68360c9c0d..f52f48626ad143c8fa158579818b2c33a2f3f1ab 100644
--- a/src/dbus/callmanager-glue.h
+++ b/src/dbus/callmanager-glue.h
@@ -10,7 +10,7 @@
namespace org {
namespace sflphone {
-namespace SFLPhone {
+namespace SFLphone {
class CallManager
: public ::DBus::InterfaceAdaptor
@@ -18,7 +18,7 @@ class CallManager
public:
CallManager()
- : ::DBus::InterfaceAdaptor("org.sflphone.SFLPhone.CallManager")
+ : ::DBus::InterfaceAdaptor("org.sflphone.SFLphone.CallManager")
{
register_method(CallManager, placeCall, _placeCall_stub);
register_method(CallManager, refuse, _refuse_stub);
@@ -163,7 +163,7 @@ public:
};
static ::DBus::IntrospectedInterface CallManager_interface =
{
- "org.sflphone.SFLPhone.CallManager",
+ "org.sflphone.SFLphone.CallManager",
CallManager_methods,
CallManager_signals,
CallManager_properties
diff --git a/src/dbus/callmanager-introspec.xml b/src/dbus/callmanager-introspec.xml
index 423a92a5e198745d8ce99c5eff566a30be4801ea..2a5d84d1e057fb9644dd3d68710ba85cf2f8181a 100644
--- a/src/dbus/callmanager-introspec.xml
+++ b/src/dbus/callmanager-introspec.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLPhone">
- <interface name="org.sflphone.SFLPhone.CallManager">
+<node name="/org/sflphone/SFLphone">
+ <interface name="org.sflphone.SFLphone.CallManager">
<method name="placeCall">
<arg type="s" name="accountID" direction="in"/>
diff --git a/src/dbus/callmanager.cpp b/src/dbus/callmanager.cpp
index cb199c37cf0bb8787a09f231d4ab8091a68e7aa3..6c779a36d7b354dac58e434832513a8aeaa55957 100644
--- a/src/dbus/callmanager.cpp
+++ b/src/dbus/callmanager.cpp
@@ -20,7 +20,7 @@
#include <callmanager.h>
#include "../manager.h"
-const char* CallManager::SERVER_PATH = "/org/sflphone/SFLPhone/CallManager";
+const char* CallManager::SERVER_PATH = "/org/sflphone/SFLphone/CallManager";
CallManager::CallManager( DBus::Connection& connection )
: DBus::ObjectAdaptor(connection, SERVER_PATH)
@@ -130,7 +130,7 @@ CallManager::getCallDetails( const ::DBus::String& callID )
CallManager::getCurrentCallID( )
{
_debug("CallManager::getCurrentCallID received\n");
- return getCurrentCallId();
+ return Manager::instance().getCurrentCallId();
}
diff --git a/src/dbus/callmanager.h b/src/dbus/callmanager.h
index f4b4ef4999aca01901efedf9beb0b6285518d041..906b7c479bbfe354367c0cc221cb6a4d9ce17a3e 100644
--- a/src/dbus/callmanager.h
+++ b/src/dbus/callmanager.h
@@ -25,7 +25,7 @@
class CallManager
-: public org::sflphone::SFLPhone::CallManager,
+: public org::sflphone::SFLphone::CallManager,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
diff --git a/src/dbus/configurationmanager-glue.h b/src/dbus/configurationmanager-glue.h
index bcaffc94926ea3f0010f8f6767d0aed1a5f7e553..f762c060e341874837647fd14768996aa08ed659 100644
--- a/src/dbus/configurationmanager-glue.h
+++ b/src/dbus/configurationmanager-glue.h
@@ -10,7 +10,7 @@
namespace org {
namespace sflphone {
-namespace SFLPhone {
+namespace SFLphone {
class ConfigurationManager
: public ::DBus::InterfaceAdaptor
@@ -18,7 +18,7 @@ class ConfigurationManager
public:
ConfigurationManager()
- : ::DBus::InterfaceAdaptor("org.sflphone.SFLPhone.ConfigurationManager")
+ : ::DBus::InterfaceAdaptor("org.sflphone.SFLphone.ConfigurationManager")
{
register_method(ConfigurationManager, getAccountDetails, _getAccountDetails_stub);
register_method(ConfigurationManager, setAccountDetails, _setAccountDetails_stub);
@@ -163,7 +163,7 @@ public:
};
static ::DBus::IntrospectedInterface ConfigurationManager_interface =
{
- "org.sflphone.SFLPhone.ConfigurationManager",
+ "org.sflphone.SFLphone.ConfigurationManager",
ConfigurationManager_methods,
ConfigurationManager_signals,
ConfigurationManager_properties
diff --git a/src/dbus/configurationmanager-introspec.xml b/src/dbus/configurationmanager-introspec.xml
index 1d95613c973eba15ba5c128b9968f9797dac289f..9c996bb55ab30ef5a4306fc4c337455d9ad060a4 100644
--- a/src/dbus/configurationmanager-introspec.xml
+++ b/src/dbus/configurationmanager-introspec.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLPhone">
- <interface name="org.sflphone.SFLPhone.ConfigurationManager">
+<node name="/org/sflphone/SFLphone">
+ <interface name="org.sflphone.SFLphone.ConfigurationManager">
<method name="getAccountDetails">
<arg type="s" name="accountID" direction="in"/>
diff --git a/src/dbus/configurationmanager.cpp b/src/dbus/configurationmanager.cpp
index be4aaf450febd54ec3ec6355121c94863299b42a..655d8d2f5cf8bb1c7cee4686567fd2e945f00187 100644
--- a/src/dbus/configurationmanager.cpp
+++ b/src/dbus/configurationmanager.cpp
@@ -21,7 +21,7 @@
#include <configurationmanager.h>
#include "../manager.h"
-const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLPhone/ConfigurationManager";
+const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLphone/ConfigurationManager";
diff --git a/src/dbus/configurationmanager.h b/src/dbus/configurationmanager.h
index 4e213cc41f4eea945d9c983e8471184327787109..2a6a41121e529bd492925bb33731d203de97c8ca 100644
--- a/src/dbus/configurationmanager.h
+++ b/src/dbus/configurationmanager.h
@@ -25,7 +25,7 @@
class ConfigurationManager
-: public org::sflphone::SFLPhone::ConfigurationManager,
+: public org::sflphone::SFLphone::ConfigurationManager,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
diff --git a/src/dbus/dbusmanagerimpl.cpp b/src/dbus/dbusmanagerimpl.cpp
index 77e3bb78cb78c3c175ea4a87c9964bcc42916194..d51afdf1cfd739e787d1e157febfaafd93163bb5 100644
--- a/src/dbus/dbusmanagerimpl.cpp
+++ b/src/dbus/dbusmanagerimpl.cpp
@@ -20,7 +20,7 @@
#include <dbusmanagerimpl.h>
#include "manager.h"
-const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLPhone";
+const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLphone";
int
DBusManagerImpl::exec(){