diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index f34f8eb294424b3c616f5183db35732362b9a8fc..5a9e385868488b141b7b103341bbdd29885ee9ad 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -450,6 +450,7 @@ sflphone_pick_up()
if (selectedCall) {
switch (selectedCall->_state) {
case CALL_STATE_DIALING:
+ DEBUG("------------------------------------ PLACING A NEW CALL FROM SFLPHONE PICKUP");
sflphone_place_call (selectedCall);
// if instant messaging window is visible, create new tab (deleted automatically if not used)
@@ -638,7 +639,7 @@ sflphone_incoming_call (callable_obj_t * c)
}
void
-process_dialing (callable_obj_t * c, guint keyval, gchar * key)
+process_dialing (callable_obj_t *c, guint keyval, gchar *key)
{
// We stop the tone
if (strlen (c->_peer_number) == 0 && c->_state != CALL_STATE_TRANSFERT) {
@@ -646,8 +647,8 @@ process_dialing (callable_obj_t * c, guint keyval, gchar * key)
//dbus_play_dtmf( key );
}
- DEBUG ("process_dialing : keyval : %i",keyval);
- DEBUG ("process_dialing : key : %s",key);
+ DEBUG ("--------------------- SFLphone: process dialing : keyval: %d", keyval);
+ DEBUG ("--------------------- SFLphone: process dialing : key: %s", key);
switch (keyval) {
case 65293: /* ENTER */
@@ -670,7 +671,7 @@ process_dialing (callable_obj_t * c, guint keyval, gchar * key)
} else {
c->_peer_number = g_strndup (c->_peer_number, strlen (c->_peer_number) -1);
g_free (before);
- DEBUG ("TO: backspace %s", c->_peer_number);
+ DEBUG ("SFLphone: TO: backspace %s", c->_peer_number);
}
calltree_update_call (current_calls, c, NULL);
@@ -749,6 +750,8 @@ sflphone_keypad (guint keyval, gchar * key)
{
callable_obj_t * c = calltab_get_selected_call (current_calls);
+ DEBUG("SFLphone: Keypad");
+
if ( (active_calltree != current_calls) || (active_calltree == current_calls && !c)) {
DEBUG ("Not in a call, not dialing, create a new call");
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index 5958bb29e919dd8d2320ed20353219d8bc880350..09add526b11ca96c4e7362a5352d5c3a02996345 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -217,7 +217,7 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID ,
DEBUG ("CallableObj: Create new call");
- DEBUG ("Account: %s", accountID);
+ DEBUG ("CallableObj: Account: %s", accountID);
// Allocate memory
obj = g_new0 (callable_obj_t, 1);
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 2860bd810afe569218f2550824d0d90906f1c912..24abe44f3e35a2767d37de6dcd08c2a84d68dd96 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -200,7 +200,7 @@ row_activated (GtkTreeView *tree_view UNUSED,
conference_obj_t* selectedConf = NULL;
gchar *account_id;
- DEBUG ("CallTree: Double click action");
+ DEBUG ("----------------------------------------------- CallTree: Double click action");
if (calltab_get_selected_type (active_calltree) == A_CALL) {
@@ -229,6 +229,7 @@ row_activated (GtkTreeView *tree_view UNUSED,
break;
case CALL_STATE_DIALING:
sflphone_place_call (selectedCall);
+ DEBUG("---------------------------- PLACING A NEW CALL FROM ROW ACTIVATED (current_calls)");
break;
default:
WARN ("Row activated - Should not happen!");
@@ -245,11 +246,14 @@ row_activated (GtkTreeView *tree_view UNUSED,
// Create a new call
create_new_call (CALL, CALL_STATE_DIALING, "", account_id, selectedCall->_peer_name, selectedCall->_peer_number, &new_call);
+ DEBUG("------------------------------------ PLACING A NEW CALL FROM ROW ACTIVATED (history)");
+ // sflphone_place_call(new_call);
- calllist_add (current_calls, new_call);
- calltree_add_call (current_calls, new_call, NULL);
+ // calllist_add (current_calls, new_call);
+ // calltree_add_call (current_calls, new_call, NULL);
// Function sflphone_place_call (new_call) is processed in process_dialing
- calltree_display (current_calls);
+ sflphone_place_call(new_call);
+ // calltree_display (current_calls);
}
}
} else if (calltab_get_selected_type (current_calls) == A_CONFERENCE) {
@@ -593,7 +597,6 @@ calltree_create (calltab_t* tab, gboolean searchbar_type)
if (tab != history && tab!=contacts) {
- DEBUG ("SET TREE VIEW REORDABLE");
// Make calltree reordable for drag n drop
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (tab->view), TRUE);
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 43885433f7204ae575351c396031a195e4778afe..8a95a6ed6eed6f5e932f0e136a43bceaa5dbaf67 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -62,7 +62,7 @@ static void
incoming_call_cb (DBusGProxy *proxy UNUSED, const gchar* accountID,
const gchar* callID, const gchar* from, void * foo UNUSED)
{
- DEBUG ("Incoming call (%s) from %s", callID, from);
+ DEBUG ("DBus: Incoming call (%s) from %s", callID, from);
callable_obj_t * c;
gchar *peer_name, *peer_number;
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index d8ae8e1d180d8ba6ddbb2886d9f9ead8d89ca417..2f837c8a629da32e13a59eec15759948d0ac3ea3 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -131,25 +131,40 @@ main_window_ask_quit ()
static gboolean
on_key_released (GtkWidget *widget, GdkEventKey *event, gpointer user_data UNUSED)
{
- DEBUG ("On key released from Main Window : %s", gtk_widget_get_name (widget));
+ DEBUG ("MainWindow: On key released: %s", gtk_widget_get_name (widget));
if (focus_is_on_searchbar == FALSE) {
+ if(event->keyval == 65293) {
+ DEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ if(active_calltree == current_calls) {
+ DEBUG("Active calltree is current_calls");
+ sflphone_keypad (event->keyval, event->string);
+ return TRUE;
+ }
+ else if(active_calltree == history) {
+ DEBUG("Active calltree is history");
+ return FALSE;
+ }
+ }
+
// If a modifier key is pressed, it's a shortcut, pass along
if (event->state & GDK_CONTROL_MASK || event->state & GDK_MOD1_MASK
|| event->keyval == 60 || // <
event->keyval == 62 || // >
event->keyval == 34 || // "
event->keyval == 65289 || // tab
+ event->keyval == 65293 || // enter
event->keyval == 65361 || // left arrow
event->keyval == 65362 || // up arrow
event->keyval == 65363 || // right arrow
event->keyval == 65364 || // down arrow
event->keyval >= 65470 || // F-keys
- event->keyval == 32 // space
+ event->keyval == 32 //
)
return FALSE;
- else
+ else {
sflphone_keypad (event->keyval, event->string);
+ }
}
return TRUE;