Skip to content
Snippets Groups Projects
Commit 2d98506c authored by pierre-luc's avatar pierre-luc
Browse files

[#1743] Re-implementation of the "automatically remove error dialogs [...]"

feature.
parent 61164f53
No related branches found
No related tags found
No related merge requests found
...@@ -142,6 +142,7 @@ sflphone_hung_up( callable_obj_t * c) ...@@ -142,6 +142,7 @@ sflphone_hung_up( callable_obj_t * c)
calllist_remove( current_calls, c->_callID); calllist_remove( current_calls, c->_callID);
calltree_remove_call(current_calls, c); calltree_remove_call(current_calls, c);
c->_state = CALL_STATE_DIALING; c->_state = CALL_STATE_DIALING;
call_remove_all_errors(c);
update_menus(); update_menus();
#if GTK_CHECK_VERSION(2,10,0) #if GTK_CHECK_VERSION(2,10,0)
status_tray_icon_blink( FALSE ); status_tray_icon_blink( FALSE );
...@@ -308,6 +309,7 @@ sflphone_hang_up() ...@@ -308,6 +309,7 @@ sflphone_hang_up()
break; break;
case CALL_STATE_RINGING: case CALL_STATE_RINGING:
dbus_hang_up (selectedCall); dbus_hang_up (selectedCall);
call_remove_all_errors(selectedCall);
selectedCall->_state = CALL_STATE_DIALING; selectedCall->_state = CALL_STATE_DIALING;
//selectedCall->_stop = 0; //selectedCall->_stop = 0;
break; break;
...@@ -316,20 +318,24 @@ sflphone_hang_up() ...@@ -316,20 +318,24 @@ sflphone_hang_up()
case CALL_STATE_BUSY: case CALL_STATE_BUSY:
case CALL_STATE_RECORD: case CALL_STATE_RECORD:
dbus_hang_up (selectedCall); dbus_hang_up (selectedCall);
call_remove_all_errors(selectedCall);
selectedCall->_state = CALL_STATE_DIALING; selectedCall->_state = CALL_STATE_DIALING;
set_timestamp (&selectedCall->_time_stop); set_timestamp (&selectedCall->_time_stop);
break; break;
case CALL_STATE_FAILURE: case CALL_STATE_FAILURE:
dbus_hang_up (selectedCall); dbus_hang_up (selectedCall);
call_remove_all_errors(selectedCall);
selectedCall->_state = CALL_STATE_DIALING; selectedCall->_state = CALL_STATE_DIALING;
break; break;
case CALL_STATE_INCOMING: case CALL_STATE_INCOMING:
dbus_refuse (selectedCall); dbus_refuse (selectedCall);
call_remove_all_errors(selectedCall);
selectedCall->_state = CALL_STATE_DIALING; selectedCall->_state = CALL_STATE_DIALING;
DEBUG("from sflphone_hang_up : "); stop_notification(); DEBUG("from sflphone_hang_up : "); stop_notification();
break; break;
case CALL_STATE_TRANSFERT: case CALL_STATE_TRANSFERT:
dbus_hang_up (selectedCall); dbus_hang_up (selectedCall);
call_remove_all_errors(selectedCall);
set_timestamp (&selectedCall->_time_stop); set_timestamp (&selectedCall->_time_stop);
break; break;
default: default:
......
...@@ -93,6 +93,8 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID , ...@@ -93,6 +93,8 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID ,
// Allocate memory // Allocate memory
obj = g_new0 (callable_obj_t, 1); obj = g_new0 (callable_obj_t, 1);
obj->_error_dialogs = g_ptr_array_new();
// Set fields // Set fields
obj->_type = type; obj->_type = type;
obj->_state = state; obj->_state = state;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment