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

[#1108] Add messges in main window concerning transfer success failure

parent 0a7e61e9
No related branches found
No related tags found
No related merge requests found
...@@ -448,6 +448,12 @@ sflphone_unset_transfert() ...@@ -448,6 +448,12 @@ sflphone_unset_transfert()
toolbar_update_buttons(); toolbar_update_buttons();
} }
void
sflphone_display_transfer_status(const gchar* message)
{
statusbar_push_message( message , __MSG_ACCOUNT_DEFAULT);
}
void void
sflphone_incoming_call (call_t * c) sflphone_incoming_call (call_t * c)
{ {
......
...@@ -194,8 +194,8 @@ static void ...@@ -194,8 +194,8 @@ static void
transfer_succeded_cb (DBusGProxy *proxy UNUSED, transfer_succeded_cb (DBusGProxy *proxy UNUSED,
void * foo UNUSED ) void * foo UNUSED )
{ {
DEBUG ("Accounts changed"); DEBUG ("Transfer succeded\n");
sflphone_display_transfer_status("Transfer successfull\n");
} }
...@@ -203,8 +203,8 @@ static void ...@@ -203,8 +203,8 @@ static void
transfer_failed_cb (DBusGProxy *proxy UNUSED, transfer_failed_cb (DBusGProxy *proxy UNUSED,
void * foo UNUSED ) void * foo UNUSED )
{ {
DEBUG ("Accounts changed"); DEBUG ("Transfer failed\n");
sflphone_display_transfer_status("Transfer failed\n");
} }
...@@ -324,6 +324,16 @@ dbus_connect () ...@@ -324,6 +324,16 @@ 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);
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, configurationManagerProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone", "org.sflphone.SFLphone",
...@@ -349,16 +359,6 @@ dbus_connect () ...@@ -349,16 +359,6 @@ dbus_connect ()
dbus_g_proxy_connect_signal (configurationManagerProxy, dbus_g_proxy_connect_signal (configurationManagerProxy,
"accountsChanged", G_CALLBACK(accounts_changed_cb), NULL, NULL); "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, dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__INT,
G_TYPE_NONE, G_TYPE_INT , G_TYPE_INVALID); G_TYPE_NONE, G_TYPE_INT , G_TYPE_INVALID);
dbus_g_proxy_add_signal (configurationManagerProxy, dbus_g_proxy_add_signal (configurationManagerProxy,
......
...@@ -84,6 +84,8 @@ CallManager::transfert( const std::string& callID, const std::string& to ) ...@@ -84,6 +84,8 @@ CallManager::transfert( const std::string& callID, const std::string& to )
Manager::instance().transferCall(callID, to); Manager::instance().transferCall(callID, to);
} }
void void
CallManager::setVolume( const std::string& device, const double& value ) CallManager::setVolume( const std::string& device, const double& value )
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment