diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c index 664867ff4..6aa844782 100644 --- a/sflphone-client-gnome/src/actions.c +++ b/sflphone-client-gnome/src/actions.c @@ -448,6 +448,12 @@ sflphone_unset_transfert() toolbar_update_buttons(); } +void +sflphone_display_transfer_status(const gchar* message) +{ + statusbar_push_message( message , __MSG_ACCOUNT_DEFAULT); +} + void sflphone_incoming_call (call_t * c) { diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c index 6fcf71ae6..58368931f 100644 --- a/sflphone-client-gnome/src/dbus/dbus.c +++ b/sflphone-client-gnome/src/dbus/dbus.c @@ -194,8 +194,8 @@ static void transfer_succeded_cb (DBusGProxy *proxy UNUSED, void * foo UNUSED ) { - DEBUG ("Accounts changed"); - + DEBUG ("Transfer succeded\n"); + sflphone_display_transfer_status("Transfer successfull\n"); } @@ -203,8 +203,8 @@ static void transfer_failed_cb (DBusGProxy *proxy UNUSED, void * foo UNUSED ) { - DEBUG ("Accounts changed"); - + DEBUG ("Transfer failed\n"); + sflphone_display_transfer_status("Transfer failed\n"); } @@ -324,6 +324,16 @@ dbus_connect () dbus_g_proxy_connect_signal (callManagerProxy, "volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL); + dbus_g_proxy_add_signal (callManagerProxy, + "transferSucceded", G_TYPE_INVALID); + dbus_g_proxy_connect_signal (callManagerProxy, + "transferSucceded", G_CALLBACK(transfer_succeded_cb), NULL, NULL); + + dbus_g_proxy_add_signal (callManagerProxy, + "transferFailed", G_TYPE_INVALID); + dbus_g_proxy_connect_signal (callManagerProxy, + "transferFailed", G_CALLBACK(transfer_failed_cb), NULL, NULL); + configurationManagerProxy = dbus_g_proxy_new_for_name (connection, "org.sflphone.SFLphone", @@ -349,16 +359,6 @@ dbus_connect () dbus_g_proxy_connect_signal (configurationManagerProxy, "accountsChanged", G_CALLBACK(accounts_changed_cb), NULL, NULL); - dbus_g_proxy_add_signal (callManagerProxy, - "transferSucceded", G_TYPE_INVALID); - dbus_g_proxy_connect_signal (callManagerProxy, - "transferSucceded", G_CALLBACK(transfer_succeded_cb), NULL, NULL); - - dbus_g_proxy_add_signal (callManagerProxy, - "transferFailed", G_TYPE_INVALID); - dbus_g_proxy_connect_signal (callManagerProxy, - "transferFailed", G_CALLBACK(transfer_failed_cb), NULL, NULL); - dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__INT, G_TYPE_NONE, G_TYPE_INT , G_TYPE_INVALID); dbus_g_proxy_add_signal (configurationManagerProxy, diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp index cfd73bd70..a2d2cb43e 100644 --- a/sflphone-common/src/dbus/callmanager.cpp +++ b/sflphone-common/src/dbus/callmanager.cpp @@ -84,6 +84,8 @@ CallManager::transfert( const std::string& callID, const std::string& to ) Manager::instance().transferCall(callID, to); } + + void CallManager::setVolume( const std::string& device, const double& value ) {