Skip to content
Snippets Groups Projects
Commit 7d52d0de authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Remove libnotify critical warnings

parent 78b1ed01
Branches
Tags
No related merge requests found
...@@ -122,7 +122,6 @@ sflphone_hung_up( call_t * c) ...@@ -122,7 +122,6 @@ sflphone_hung_up( call_t * c)
c->state = CALL_STATE_DIALING; c->state = CALL_STATE_DIALING;
update_menus(); update_menus();
status_tray_icon_blink( FALSE ); status_tray_icon_blink( FALSE );
stop_notification();
} }
/** Internal to actions: Fill account list */ /** Internal to actions: Fill account list */
...@@ -234,7 +233,7 @@ sflphone_hang_up() ...@@ -234,7 +233,7 @@ sflphone_hang_up()
case CALL_STATE_INCOMING: case CALL_STATE_INCOMING:
dbus_refuse (selectedCall); dbus_refuse (selectedCall);
selectedCall->state = CALL_STATE_DIALING; selectedCall->state = CALL_STATE_DIALING;
stop_notification(); g_print("from sflphone_hang_up : "); stop_notification();
break; break;
case CALL_STATE_TRANSFERT: case CALL_STATE_TRANSFERT:
dbus_hang_up (selectedCall); dbus_hang_up (selectedCall);
...@@ -262,7 +261,7 @@ sflphone_pick_up() ...@@ -262,7 +261,7 @@ sflphone_pick_up()
selectedCall->history_state = INCOMING; selectedCall->history_state = INCOMING;
update_call_tree( history , selectedCall ); update_call_tree( history , selectedCall );
dbus_accept (selectedCall); dbus_accept (selectedCall);
stop_notification(); g_print("from sflphone_pick_up : "); stop_notification();
break; break;
case CALL_STATE_HOLD: case CALL_STATE_HOLD:
sflphone_new_call(); sflphone_new_call();
...@@ -517,11 +516,11 @@ sflphone_keypad( guint keyval, gchar * key) ...@@ -517,11 +516,11 @@ sflphone_keypad( guint keyval, gchar * key)
c->history_state = INCOMING; c->history_state = INCOMING;
update_call_tree( history , c ); update_call_tree( history , c );
dbus_accept(c); dbus_accept(c);
stop_notification(); g_print("from sflphone_keypad ( enter ) : "); stop_notification();
break; break;
case 65307: /* ESCAPE */ case 65307: /* ESCAPE */
dbus_refuse(c); dbus_refuse(c);
stop_notification(); g_print("from sflphone_keypad ( escape ) : "); stop_notification();
break; break;
} }
break; break;
......
...@@ -205,7 +205,6 @@ toolbar_update_buttons () ...@@ -205,7 +205,6 @@ toolbar_update_buttons ()
{ {
case CALL_STATE_INCOMING: case CALL_STATE_INCOMING:
gtk_widget_set_sensitive( GTK_WIDGET(pickupButton), TRUE); gtk_widget_set_sensitive( GTK_WIDGET(pickupButton), TRUE);
//gtk_widget_set_sensitive( GTK_WIDGET(mailboxButton), TRUE);
gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE);
g_object_ref(callButton); g_object_ref(callButton);
gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(callButton)); gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(callButton));
...@@ -218,7 +217,6 @@ toolbar_update_buttons () ...@@ -218,7 +217,6 @@ toolbar_update_buttons ()
g_object_ref(holdButton); g_object_ref(holdButton);
gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton)); gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), unholdButton, 3); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), unholdButton, 3);
//gtk_widget_set_sensitive( GTK_WIDGET(mailboxButton), TRUE);
break; break;
case CALL_STATE_RINGING: case CALL_STATE_RINGING:
gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE);
......
...@@ -104,6 +104,7 @@ call_state_cb (DBusGProxy *proxy, ...@@ -104,6 +104,7 @@ call_state_cb (DBusGProxy *proxy,
{ {
if ( strcmp(state, "HUNGUP") == 0 ) if ( strcmp(state, "HUNGUP") == 0 )
{ {
g_print("from dbus: "); stop_notification();
sflphone_hung_up (c); sflphone_hung_up (c);
} }
else if ( strcmp(state, "UNHOLD") == 0 ) else if ( strcmp(state, "UNHOLD") == 0 )
......
...@@ -225,6 +225,7 @@ stop_notification( void ) ...@@ -225,6 +225,7 @@ stop_notification( void )
{ {
notify_notification_close( notification , NULL); notify_notification_close( notification , NULL);
g_object_unref( notification ); g_object_unref( notification );
notification = NULL;
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment