diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index 5c4e9acc20637a89687a2b9d2bc913624074b3af..89d95ebd7ae5e5b35e2b65ad3a6e11dc09d9d008 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -265,7 +265,6 @@ static void update_credential_cb (GtkWidget *widget, gpointer data UNUSED)
if (credentialStore) {
if (gtk_tree_model_get_iter_from_string ( (GtkTreeModel *) credentialStore, &iter, "0")) {
gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "column"));
- // g_print ("set password to %s\n", (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)));
gtk_list_store_set (GTK_LIST_STORE (credentialStore), &iter, column, (gchar *) gtk_entry_get_text (GTK_ENTRY (widget)), -1);
}
}
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 3d34fc931a6887f168f988b0ba468664ef1b633e..ecfd9bf02f205cb4cecfb41c448a4c06793ef616 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -1820,12 +1820,12 @@ static void menuitem_response( gchar *string )
sflphone_join_participant (selected_call->_callID, dragged_call->_callID);
}
else if(g_strcmp0(string, SFL_TRANSFER_CALL) == 0) {
- g_print("Calltree: Transfering call %s, to %s", selected_call->_peer_number, dragged_call->_peer_number);
+ DEBUG("Calltree: Transfering call %s, to %s", selected_call->_peer_number, dragged_call->_peer_number);
dbus_attended_transfer(selected_call, dragged_call);
calltree_remove_call(current_calls, selected_call, NULL);
}
else {
- g_print("CallTree: Error unknown option selected in menu %s", string);
+ DEBUG("CallTree: Error unknown option selected in menu %s", string);
}
// Make sure the create conference opetion will appear next time the menu pops
diff --git a/sflphone-client-gnome/src/imwindow.c b/sflphone-client-gnome/src/imwindow.c
index 8be6445024270a4e15fbd45adc3ea550864e12a3..fb1fa42415010730e5b50d5ebda6b32db1985061 100644
--- a/sflphone-client-gnome/src/imwindow.c
+++ b/sflphone-client-gnome/src/imwindow.c
@@ -79,7 +79,7 @@ on_switch_page (GtkNotebook *notebook, GtkNotebookPage *page UNUSED, guint page_
gtk_widget_grab_focus (tab);
gtk_widget_show_now (tab);
- g_print ("switch to %i - current = %i\n", page_num, index);
+ DEBUG ("InstantMessaging: switch to %i - current = %i\n", page_num, index);
}
static void
@@ -170,8 +170,10 @@ im_window_add (GtkWidget *widget)
/* Show it all */
gtk_widget_show_all (im_window);
- } else
- ERROR ("Could not create the main instant messaging window");
+ }
+ else {
+ ERROR ("InstantMessaging: Error: Could not create the main instant messaging window");
+ }
}
gint
@@ -234,7 +236,7 @@ im_window_add_tab (GtkWidget *widget)
guint tabIndex = gtk_notebook_append_page (GTK_NOTEBOOK (im_notebook), widget, tab_Container);
/* TODO Switch to the newly opened tab. Still not working */
- DEBUG ("SWITCH TO NEW TAB: %i", tabIndex);
+ DEBUG ("InstantMessaging: Switch to tab: %i", tabIndex);
gtk_notebook_set_current_page (GTK_NOTEBOOK (im_notebook), -1);
/* Decide whether or not displaying the tabs of the notebook */
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index b17673ee5ea427b2caeaff1e13451b1c41ddbf3a..9637f715f1ff693368760e2701d9ad409ce27cd6 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -372,15 +372,13 @@ main_window_info_message (gchar * markup)
void
main_window_dialpad (gboolean state)
{
-
- g_print ("main_window_dialpad\n");
-
if (state) {
dialpad = create_dialpad ();
gtk_box_pack_end (GTK_BOX (subvbox), dialpad, FALSE /*expand*/,
TRUE /*fill*/, 0 /*padding*/);
gtk_widget_show_all (dialpad);
} else {
+
gtk_container_remove (GTK_CONTAINER (subvbox), dialpad);
}
}
diff --git a/sflphone-client-gnome/src/shortcuts.c b/sflphone-client-gnome/src/shortcuts.c
index 0e5b48305a68944ad35412536bc335bf71664d12..0a4b7e0bd4df2078e467d1a0a8d7e068c4bc7657 100644
--- a/sflphone-client-gnome/src/shortcuts.c
+++ b/sflphone-client-gnome/src/shortcuts.c
@@ -87,7 +87,7 @@ filter_keys (const GdkXEvent *xevent, const GdkEvent *event UNUSED, gpointer dat
while (accelerators_list[i].action != NULL) {
if (accelerators_list[i].key == key->keycode && accelerators_list[i].mask
== keystate) {
- DEBUG ("catched key for action: %s", accelerators_list[i].action,
+ DEBUG ("Shortcuts: Catched key for action: %s", accelerators_list[i].action,
accelerators_list[i].key);
// call associated callback function
@@ -99,8 +99,6 @@ filter_keys (const GdkXEvent *xevent, const GdkEvent *event UNUSED, gpointer dat
i++;
}
- DEBUG ("Should not be reached");
-
return GDK_FILTER_CONTINUE;
}
@@ -113,7 +111,7 @@ toggle_pick_up_hang_up_callback ()
callable_obj_t * selectedCall = calltab_get_selected_call (active_calltree);
conference_obj_t * selectedConf = calltab_get_selected_conf (active_calltree);
- g_print ("toggle_pick_up_hang_up_callback\n");
+ DEBUG ("Shortcuts: Toggle pickup/hangup callback");
if (selectedCall) {
switch (selectedCall->_state) {
@@ -159,20 +157,20 @@ toggle_hold_callback ()
switch (selectedCall->_state) {
case CALL_STATE_CURRENT:
case CALL_STATE_RECORD:
- g_print ("on hold\n");
sflphone_on_hold ();
break;
case CALL_STATE_HOLD:
- g_print ("off hold\n");
sflphone_off_hold ();
break;
default:
break;
}
- } else if (selectedConf)
+ }
+ else if (selectedConf)
dbus_hold_conference (selectedConf);
- else
- ERROR ("Should not happen");
+ else {
+ ERROR ("Shortcuts: Error: No callable object selected");
+ }
}
static void
@@ -180,14 +178,12 @@ popup_window_callback ()
{
gtk_widget_hide (GTK_WIDGET (get_main_window()));
gtk_widget_show (GTK_WIDGET (get_main_window()));
- //gtk_window_move (GTK_WINDOW (get_main_window ()),
- // dbus_get_window_position_x (), dbus_get_window_position_y ());
}
static void
default_callback ()
{
- ERROR ("Missing shortcut callback");
+ ERROR ("Shortcuts: Error: Missing shortcut callback");
}
/*
@@ -307,7 +303,7 @@ initialize_binding (const gchar* action, guint key, GdkModifierType mask)
}
if (accelerators_list[i].action == NULL) {
- ERROR ("Should not happen: cannot find corresponding action");
+ ERROR ("Shortcut: Error: Cannot find corresponding action");
return;
}
@@ -373,7 +369,7 @@ update_bindings_data (guint index, guint key, GdkModifierType mask)
while (accelerators_list[i].action != NULL) {
if (accelerators_list[i].key == key && accelerators_list[i].mask == mask
&& accelerators_list[i].key != 0) {
- DEBUG ("Existing mapping found %d+%d", mask, key);
+ DEBUG ("Shortcuts: Existing mapping found %d+%d", mask, key);
// disable old binding
accelerators_list[i].key = 0;
@@ -452,7 +448,7 @@ shortcuts_initialize_bindings ()
// Value not setted
if (token1 && token2) {
- DEBUG ("Ahortcuts: token1 %s, token2 %s", token1, token2);
+ DEBUG ("Shortcuts: token1 %s, token2 %s", token1, token2);
mask = atoi (token1);
key = atoi (token2);
@@ -495,7 +491,7 @@ shortcuts_get_list ()
static void
ungrab_key (guint key, GdkModifierType mask, const GdkWindow *root)
{
- DEBUG ("Ungrabbing key %d+%d", mask, key);
+ DEBUG ("Shortcuts: Ungrabbing key %d+%d", mask, key);
gdk_error_trap_push ();
@@ -515,7 +511,7 @@ ungrab_key (guint key, GdkModifierType mask, const GdkWindow *root)
gdk_flush ();
if (gdk_error_trap_pop ()) {
- DEBUG ("Error ungrabbing key %d+%d", mask, key);
+ ERROR ("Shortcuts: Error: Ungrabbing key %d+%d", mask, key);
}
}
@@ -527,7 +523,7 @@ grab_key (guint key, GdkModifierType mask, const GdkWindow *root)
{
gdk_error_trap_push ();
- DEBUG ("Grabbing key %d+%d", mask, key);
+ DEBUG ("Shortcuts: Grabbing key %d+%d", mask, key);
XGrabKey (GDK_DISPLAY(), key, mask, GDK_WINDOW_XID ( (GdkDrawable*) root), True,
GrabModeAsync, GrabModeAsync);
@@ -549,6 +545,6 @@ grab_key (guint key, GdkModifierType mask, const GdkWindow *root)
gdk_flush ();
if (gdk_error_trap_pop ()) {
- DEBUG ("Error grabbing key %d+%d", mask, key);
+ ERROR ("Shortcuts: Error: Grabbing key %d+%d", mask, key);
}
}