diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index c638854fdf6e5e9cce90e1731df22adb6a5f419b..7376584018da0a7f4e03c499c3b8bb38a75d0890 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -293,7 +293,7 @@ gboolean sflphone_init()
sflphone_fill_codec_list();
// Fetch the conference list
- sflphone_fill_conference_list();
+ // sflphone_fill_conference_list();
return TRUE;
}
@@ -484,6 +484,7 @@ sflphone_busy( callable_obj_t * c )
void
sflphone_current( callable_obj_t * c )
{
+
if( c->_state != CALL_STATE_HOLD )
set_timestamp (&c->_time_start);
c->_state = CALL_STATE_CURRENT;
@@ -510,7 +511,6 @@ sflphone_set_transfert()
c->_state = CALL_STATE_TRANSFERT;
c->_trsft_to = g_strdup("");
calltree_update_call(current_calls, c, NULL);
- update_actions();
}
update_actions();
}
@@ -524,7 +524,6 @@ sflphone_unset_transfert()
c->_state = CALL_STATE_CURRENT;
c->_trsft_to = g_strdup("");
calltree_update_call(current_calls, c, NULL);
- update_actions();
}
update_actions();
}
@@ -1154,6 +1153,8 @@ void sflphone_fill_call_list (void)
void sflphone_fill_conference_list(void)
{
+ // TODO Fetch the active conferences at client startup
+ /*
gchar** conferences = (gchar**)dbus_get_conference_list();
gchar** pl;
GHashTable *conference_details;
@@ -1176,6 +1177,7 @@ void sflphone_fill_conference_list(void)
conferencelist_add(c);
}
}
+ */
}
void sflphone_fill_history (void)
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 1135ed7d12eb703a09eed76df9e7269704d3d1a1..bd480229c6e80a3816f9b10f1c8e0ab29e266d24 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -43,7 +43,7 @@ gchar *selected_path;
gint dragged_path_depth;
gint selected_path_depth;
-
+
callable_obj_t *dragged_call;
callable_obj_t *selected_call;
@@ -57,1044 +57,1044 @@ void drag_data_received_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y
enum {
- COLUMN_ACCOUNT_STATE = 0,
- COLUMN_ACCOUNT_DESC,
- COLUMN_ACCOUNT_SECURITY,
- COLUMN_ACCOUNT_PTR,
+ COLUMN_ACCOUNT_STATE = 0,
+ COLUMN_ACCOUNT_DESC,
+ COLUMN_ACCOUNT_SECURITY,
+ COLUMN_ACCOUNT_PTR,
};
/**
* Show popup menu
*/
-static gboolean
+ static gboolean
popup_menu (GtkWidget *widget,
- gpointer user_data UNUSED)
+ gpointer user_data UNUSED)
{
- show_popup_menu(widget, NULL);
- return TRUE;
+ show_popup_menu(widget, NULL);
+ return TRUE;
}
/* Call back when the user click on a call in the list */
-static void
+ static void
call_selected_cb(GtkTreeSelection *sel, void* data UNUSED )
{
- DEBUG("Selection Callback");
+ DEBUG("Selection Callback");
- GtkTreeIter iter;
- GValue val;
- GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
+ GtkTreeIter iter;
+ GValue val;
+ GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
- GtkTreePath* path;
- gchar* string_path;
+ GtkTreePath* path;
+ gchar* string_path;
- if (! gtk_tree_selection_get_selected (sel, &model, &iter))
- return;
+ if (! gtk_tree_selection_get_selected (sel, &model, &iter))
+ return;
- // store info for dragndrop
- path = gtk_tree_model_get_path(model, &iter);
- string_path = gtk_tree_path_to_string(path);
- selected_path_depth = gtk_tree_path_get_depth(path);
+ // store info for dragndrop
+ path = gtk_tree_model_get_path(model, &iter);
+ string_path = gtk_tree_path_to_string(path);
+ selected_path_depth = gtk_tree_path_get_depth(path);
- if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &iter))
- {
- DEBUG("SELECTED A CONFERENCE");
- selected_type = A_CONFERENCE;
+ if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &iter))
+ {
+ DEBUG("SELECTED A CONFERENCE");
+ selected_type = A_CONFERENCE;
- val.g_type = 0;
- gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
+ val.g_type = 0;
+ gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
- calltab_select_conf((conference_obj_t*) g_value_get_pointer(&val));
+ calltab_select_conf((conference_obj_t*) g_value_get_pointer(&val));
- selected_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ selected_conf = (conference_obj_t*)g_value_get_pointer(&val);
- if(selected_conf)
- {
+ if(selected_conf)
+ {
- selected_call_id = selected_conf->_confID;
- selected_path = string_path;
+ selected_call_id = selected_conf->_confID;
+ selected_path = string_path;
- }
+ }
- }
- else
- {
- DEBUG("SELECTED A CALL");
- selected_type = A_CALL;
- // gtk_tree_model_iter_parent(GTK_TREE_MODEL(model), parent_conference, &iter);
+ }
+ else
+ {
+ DEBUG("SELECTED A CALL");
+ selected_type = A_CALL;
+ // gtk_tree_model_iter_parent(GTK_TREE_MODEL(model), parent_conference, &iter);
- val.g_type = 0;
- gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
+ val.g_type = 0;
+ gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
- calltab_select_call(active_calltree, (callable_obj_t*) g_value_get_pointer(&val));
+ calltab_select_call(active_calltree, (callable_obj_t*) g_value_get_pointer(&val));
- selected_call = (callable_obj_t*)g_value_get_pointer(&val);
+ selected_call = (callable_obj_t*)g_value_get_pointer(&val);
- selected_call_id = selected_call->_callID;
- selected_path = string_path;
- }
+ selected_call_id = selected_call->_callID;
+ selected_path = string_path;
+ }
- DEBUG("selected_cb\n");
- DEBUG(" selected_path %s, selected_call_id %s, selected_path_depth %i\n", selected_path, selected_call_id, selected_path_depth);
+ DEBUG("selected_cb\n");
+ DEBUG(" selected_path %s, selected_call_id %s, selected_path_depth %i\n", selected_path, selected_call_id, selected_path_depth);
- // conferencelist_reset ();
- // sflphone_fill_conference_list();
+ // conferencelist_reset ();
+ // sflphone_fill_conference_list();
- g_value_unset(&val);
- update_actions();
+ g_value_unset(&val);
+ update_actions();
}
/* A row is activated when it is double clicked */
-void
+ void
row_activated(GtkTreeView *tree_view UNUSED,
- GtkTreePath *path UNUSED,
- GtkTreeViewColumn *column UNUSED,
- void * data UNUSED)
+ GtkTreePath *path UNUSED,
+ GtkTreeViewColumn *column UNUSED,
+ void * data UNUSED)
{
- callable_obj_t* selectedCall = NULL;
- callable_obj_t* new_call;
- conference_obj_t* selectedConf = NULL;
- gchar *account_id;
+ callable_obj_t* selectedCall = NULL;
+ callable_obj_t* new_call;
+ conference_obj_t* selectedConf = NULL;
+ gchar *account_id;
- DEBUG("double click action");
+ DEBUG("double click action");
- if(calltab_get_selected_type(active_calltree) == A_CALL)
- {
+ if(calltab_get_selected_type(active_calltree) == A_CALL)
+ {
- DEBUG("Selected a call\n");
- selectedCall = calltab_get_selected_call(active_calltree);
+ DEBUG("Selected a call\n");
+ selectedCall = calltab_get_selected_call(active_calltree);
- if (selectedCall)
- {
- DEBUG("there is a selected call\n");
+ if (selectedCall)
+ {
+ DEBUG("there is a selected call\n");
- // Get the right event from the right calltree
- if( active_calltree == current_calls )
- {
+ // Get the right event from the right calltree
+ if( active_calltree == current_calls )
+ {
- DEBUG("active tree is current calls");
+ DEBUG("active tree is current calls");
+
+ switch(selectedCall->_state)
+ {
+ case CALL_STATE_INCOMING:
+ dbus_accept(selectedCall);
+ stop_notification();
+ break;
+ case CALL_STATE_HOLD:
+ dbus_unhold(selectedCall);
+ break;
+ case CALL_STATE_RINGING:
+ case CALL_STATE_CURRENT:
+ case CALL_STATE_BUSY:
+ case CALL_STATE_FAILURE:
+ break;
+ case CALL_STATE_DIALING:
+ sflphone_place_call (selectedCall);
+ break;
+ default:
+ WARN("Row activated - Should not happen!");
+ break;
+ }
+ }
- switch(selectedCall->_state)
- {
- case CALL_STATE_INCOMING:
- dbus_accept(selectedCall);
- stop_notification();
- break;
- case CALL_STATE_HOLD:
- dbus_unhold(selectedCall);
- break;
- case CALL_STATE_RINGING:
- case CALL_STATE_CURRENT:
- case CALL_STATE_BUSY:
- case CALL_STATE_FAILURE:
- break;
- case CALL_STATE_DIALING:
- sflphone_place_call (selectedCall);
- break;
- default:
- WARN("Row activated - Should not happen!");
- break;
+ // If history or contact: double click action places a new call
+ else
+ {
+ DEBUG("active tree is history or contact");
+
+ account_id = g_strdup (selectedCall->_accountID);
+
+ // Create a new call
+ create_new_call (CALL, CALL_STATE_DIALING, "", account_id, selectedCall->_peer_name, selectedCall->_peer_number, &new_call);
+
+ calllist_add(current_calls, new_call);
+ calltree_add_call(current_calls, new_call, NULL);
+ sflphone_place_call(new_call);
+ calltree_display(current_calls);
+ }
}
- }
-
- // If history or contact: double click action places a new call
- else
- {
- DEBUG("active tree is history or contact");
-
- account_id = g_strdup (selectedCall->_accountID);
-
- // Create a new call
- create_new_call (CALL, CALL_STATE_DIALING, "", account_id, selectedCall->_peer_name, selectedCall->_peer_number, &new_call);
-
- calllist_add(current_calls, new_call);
- calltree_add_call(current_calls, new_call, NULL);
- sflphone_place_call(new_call);
- calltree_display(current_calls);
- }
}
- }
- else if(calltab_get_selected_type(current_calls) == A_CONFERENCE)
- {
- DEBUG("Selected a conference\n");
-
- if( active_calltree == current_calls )
+ else if(calltab_get_selected_type(current_calls) == A_CONFERENCE)
{
+ DEBUG("Selected a conference\n");
- selectedConf = calltab_get_selected_conf(current_calls);
-
- if(selectedConf)
- {
- switch(selectedConf->_state)
+ if( active_calltree == current_calls )
{
- case CONFERENCE_STATE_ACTIVE_ATACHED:
- sflphone_add_main_participant(selectedConf);
- break;
- case CONFERENCE_STATE_ACTIVE_DETACHED:
- sflphone_add_main_participant(selectedConf);
- break;
- case CONFERENCE_STATE_HOLD:
- sflphone_conference_off_hold(selectedConf);
- break;
+
+ selectedConf = calltab_get_selected_conf(current_calls);
+
+ if(selectedConf)
+ {
+ switch(selectedConf->_state)
+ {
+ case CONFERENCE_STATE_ACTIVE_ATACHED:
+ sflphone_add_main_participant(selectedConf);
+ break;
+ case CONFERENCE_STATE_ACTIVE_DETACHED:
+ sflphone_add_main_participant(selectedConf);
+ break;
+ case CONFERENCE_STATE_HOLD:
+ sflphone_conference_off_hold(selectedConf);
+ break;
+ }
+ }
}
- }
}
- }
-
-
+
+
}
/* Catch cursor-activated signal. That is, when the entry is single clicked */
-void
+ void
row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
{
- DEBUG("single click action");
- callable_obj_t * selectedCall=NULL;
- account_t * account_details=NULL;
- gchar * displaySasOnce="";
-
- selectedCall = calltab_get_selected_call( active_calltree );
-
- if (selectedCall != NULL)
- {
- account_details = account_list_get_by_id(selectedCall->_accountID);
- DEBUG("AccountID %s", selectedCall->_accountID);
-
- if(account_details != NULL) {
- displaySasOnce = g_hash_table_lookup(account_details->properties, ACCOUNT_DISPLAY_SAS_ONCE);
- DEBUG("Display SAS once %s", displaySasOnce);
- } else {
- GHashTable * properties = NULL;
- properties = sflphone_get_ip2ip_properties();
- if(properties != NULL)
- { displaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE); DEBUG("IP2IP displaysasonce %s", displaySasOnce); }
- }
-
- /* Make sure that we are not in the history tab since
- * nothing is defined for it yet
- */
- if( active_calltree == current_calls )
- {
-
- // sflphone_selected_call_codec(selectedCall);
-
- // DEBUG("single click action: %s", dbus_get_current_codec_name(selectedCall));
- sflphone_display_selected_codec(dbus_get_current_codec_name(selectedCall));
-
- switch(selectedCall->_srtp_state)
- {
- case SRTP_STATE_SAS_UNCONFIRMED:
- selectedCall->_srtp_state = SRTP_STATE_SAS_CONFIRMED;
- if(g_strcasecmp(displaySasOnce,"true") == 0) {
- selectedCall->_zrtp_confirmed = TRUE;
- }
- dbus_confirm_sas(selectedCall);
- calltree_update_call(current_calls, selectedCall, NULL);
- break;
- case SRTP_STATE_SAS_CONFIRMED:
- selectedCall->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
- dbus_reset_sas(selectedCall);
- calltree_update_call(current_calls, selectedCall, NULL);
- break;
- default:
- DEBUG("Single click but no action");
- break;
- }
- }
- }
+ DEBUG("single click action");
+ callable_obj_t * selectedCall=NULL;
+ account_t * account_details=NULL;
+ gchar * displaySasOnce="";
+
+ selectedCall = calltab_get_selected_call( active_calltree );
+
+ if (selectedCall != NULL)
+ {
+ account_details = account_list_get_by_id(selectedCall->_accountID);
+ DEBUG("AccountID %s", selectedCall->_accountID);
+
+ if(account_details != NULL) {
+ displaySasOnce = g_hash_table_lookup(account_details->properties, ACCOUNT_DISPLAY_SAS_ONCE);
+ DEBUG("Display SAS once %s", displaySasOnce);
+ } else {
+ GHashTable * properties = NULL;
+ properties = sflphone_get_ip2ip_properties();
+ if(properties != NULL)
+ { displaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE); DEBUG("IP2IP displaysasonce %s", displaySasOnce); }
+ }
+
+ /* Make sure that we are not in the history tab since
+ * nothing is defined for it yet
+ */
+ if( active_calltree == current_calls )
+ {
+
+ // sflphone_selected_call_codec(selectedCall);
+
+ // DEBUG("single click action: %s", dbus_get_current_codec_name(selectedCall));
+ sflphone_display_selected_codec(dbus_get_current_codec_name(selectedCall));
+
+ switch(selectedCall->_srtp_state)
+ {
+ case SRTP_STATE_SAS_UNCONFIRMED:
+ selectedCall->_srtp_state = SRTP_STATE_SAS_CONFIRMED;
+ if(g_strcasecmp(displaySasOnce,"true") == 0) {
+ selectedCall->_zrtp_confirmed = TRUE;
+ }
+ dbus_confirm_sas(selectedCall);
+ calltree_update_call(current_calls, selectedCall, NULL);
+ break;
+ case SRTP_STATE_SAS_CONFIRMED:
+ selectedCall->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
+ dbus_reset_sas(selectedCall);
+ calltree_update_call(current_calls, selectedCall, NULL);
+ break;
+ default:
+ DEBUG("Single click but no action");
+ break;
+ }
+ }
+ }
}
-static gboolean
+ static gboolean
button_pressed(GtkWidget* widget, GdkEventButton *event, gpointer user_data UNUSED)
{
- if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
- {
- if( active_calltree == current_calls )
- {
- show_popup_menu(widget, event);
- return TRUE;
- }
- else if (active_calltree == history)
- {
- show_popup_menu_history (widget, event);
- return TRUE;
- }
- else{
- show_popup_menu_contacts (widget, event);
- return TRUE;
- }
- }
- return FALSE;
+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+ {
+ if( active_calltree == current_calls )
+ {
+ show_popup_menu(widget, event);
+ return TRUE;
+ }
+ else if (active_calltree == history)
+ {
+ show_popup_menu_history (widget, event);
+ return TRUE;
+ }
+ else{
+ show_popup_menu_contacts (widget, event);
+ return TRUE;
+ }
+ }
+ return FALSE;
}
/**
* Reset call tree
*/
-void
+ void
calltree_reset (calltab_t* tab)
{
- gtk_tree_store_clear (tab->store);
+ gtk_tree_store_clear (tab->store);
}
void
focus_on_calltree_out(){
- //DEBUG("set_focus_on_calltree_out");
- // gtk_widget_grab_focus(GTK_WIDGET(sw));
- focus_is_on_calltree = FALSE;
+ //DEBUG("set_focus_on_calltree_out");
+ // gtk_widget_grab_focus(GTK_WIDGET(sw));
+ focus_is_on_calltree = FALSE;
}
void
focus_on_calltree_in(){
- //DEBUG("set_focus_on_calltree_in");
- // gtk_widget_grab_focus(GTK_WIDGET(sw));
- focus_is_on_calltree = TRUE;
+ //DEBUG("set_focus_on_calltree_in");
+ // gtk_widget_grab_focus(GTK_WIDGET(sw));
+ focus_is_on_calltree = TRUE;
}
-void
+ void
calltree_create (calltab_t* tab, gboolean searchbar_type)
{
- tab->tree = gtk_vbox_new(FALSE, 10);
-
- // Fix bug #708 (resize)
- gtk_widget_set_size_request(tab->tree,100,80);
-
- gtk_container_set_border_width (GTK_CONTAINER (tab->tree), 0);
-
- sw = gtk_scrolled_window_new( NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
-
-
- tab->store = gtk_tree_store_new (4,
- GDK_TYPE_PIXBUF,// Icon
- G_TYPE_STRING, // Description
- GDK_TYPE_PIXBUF, // Security Icon
- G_TYPE_POINTER // Pointer to the Object
- );
-
- tab->view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(tab->store));
- gtk_tree_view_set_enable_search( GTK_TREE_VIEW(tab->view), FALSE);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tab->view), FALSE);
- g_signal_connect (G_OBJECT (tab->view), "row-activated",
- G_CALLBACK (row_activated),
- NULL);
-
- GTK_WIDGET_SET_FLAGS (GTK_WIDGET(sw),GTK_CAN_FOCUS);
- gtk_widget_grab_focus (GTK_WIDGET(sw));
-
- g_signal_connect (G_OBJECT (tab->view), "cursor-changed",
- G_CALLBACK (row_single_click),
- NULL);
-
- // Connect the popup menu
- g_signal_connect (G_OBJECT (tab->view), "popup-menu",
- G_CALLBACK (popup_menu),
- NULL);
- g_signal_connect (G_OBJECT (tab->view), "button-press-event",
- G_CALLBACK (button_pressed),
- NULL);
-
- // g_signal_connect (G_OBJECT (sw), "key-release-event",
- // G_CALLBACK (on_key_released), NULL);
-
- g_signal_connect_after (G_OBJECT (tab->view), "focus-in-event",
- G_CALLBACK (focus_on_calltree_in), NULL);
- g_signal_connect_after (G_OBJECT (tab->view), "focus-out-event",
- G_CALLBACK (focus_on_calltree_out), NULL);
-
-
- 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);
-
- // source widget drag n drop signals
- g_signal_connect (G_OBJECT (tab->view), "drag_begin", G_CALLBACK (drag_begin_cb), NULL);
- g_signal_connect (G_OBJECT (tab->view), "drag_end", G_CALLBACK (drag_end_cb), NULL);
-
- // destination widget drag n drop signals
- g_signal_connect (G_OBJECT (tab->view), "drag_data_received", G_CALLBACK (drag_data_received_cb), NULL);
-
- }
-
-
- gtk_widget_grab_focus(GTK_WIDGET(tab->view));
-
- rend = gtk_cell_renderer_pixbuf_new();
- col = gtk_tree_view_column_new_with_attributes ("Icon",
- rend,
- "pixbuf", 0,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
-
- rend = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes ("Description",
- rend,
- "markup", COLUMN_ACCOUNT_DESC,
- NULL);
- g_object_set(rend, "wrap-mode", (PangoWrapMode) PANGO_WRAP_WORD_CHAR, NULL);
- g_object_set(rend, "wrap-width", (gint) CALLTREE_TEXT_WIDTH, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
-
- /* Security icon */
- rend = gtk_cell_renderer_pixbuf_new();
- col = gtk_tree_view_column_new_with_attributes ("Icon",
- rend,
- "pixbuf", COLUMN_ACCOUNT_SECURITY,
- NULL);
- g_object_set(rend, "xalign", (gfloat) 1.0, NULL);
- g_object_set(rend, "yalign", (gfloat) 0.0, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
-
-
- g_object_unref(G_OBJECT(tab->store));
- gtk_container_add(GTK_CONTAINER(sw), tab->view);
-
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tab->view));
- g_signal_connect (G_OBJECT (sel), "changed",
- G_CALLBACK (call_selected_cb),
- NULL);
-
- gtk_box_pack_start(GTK_BOX(tab->tree), sw, TRUE, TRUE, 0);
-
- // search bar if tab is either "history" or "addressbook"
- if(searchbar_type){
- calltab_create_searchbar (tab);
- gtk_box_pack_start(GTK_BOX(tab->tree), tab->searchbar, FALSE, TRUE, 0);
- }
-
- gtk_widget_show(tab->tree);
+ tab->tree = gtk_vbox_new(FALSE, 10);
+
+ // Fix bug #708 (resize)
+ gtk_widget_set_size_request(tab->tree,100,80);
+
+ gtk_container_set_border_width (GTK_CONTAINER (tab->tree), 0);
+
+ sw = gtk_scrolled_window_new( NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+
+
+ tab->store = gtk_tree_store_new (4,
+ GDK_TYPE_PIXBUF,// Icon
+ G_TYPE_STRING, // Description
+ GDK_TYPE_PIXBUF, // Security Icon
+ G_TYPE_POINTER // Pointer to the Object
+ );
+
+ tab->view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(tab->store));
+ gtk_tree_view_set_enable_search( GTK_TREE_VIEW(tab->view), FALSE);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tab->view), FALSE);
+ g_signal_connect (G_OBJECT (tab->view), "row-activated",
+ G_CALLBACK (row_activated),
+ NULL);
+
+ GTK_WIDGET_SET_FLAGS (GTK_WIDGET(sw),GTK_CAN_FOCUS);
+ gtk_widget_grab_focus (GTK_WIDGET(sw));
+
+ g_signal_connect (G_OBJECT (tab->view), "cursor-changed",
+ G_CALLBACK (row_single_click),
+ NULL);
+
+ // Connect the popup menu
+ g_signal_connect (G_OBJECT (tab->view), "popup-menu",
+ G_CALLBACK (popup_menu),
+ NULL);
+ g_signal_connect (G_OBJECT (tab->view), "button-press-event",
+ G_CALLBACK (button_pressed),
+ NULL);
+
+ // g_signal_connect (G_OBJECT (sw), "key-release-event",
+ // G_CALLBACK (on_key_released), NULL);
+
+ g_signal_connect_after (G_OBJECT (tab->view), "focus-in-event",
+ G_CALLBACK (focus_on_calltree_in), NULL);
+ g_signal_connect_after (G_OBJECT (tab->view), "focus-out-event",
+ G_CALLBACK (focus_on_calltree_out), NULL);
+
+
+ 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);
+
+ // source widget drag n drop signals
+ g_signal_connect (G_OBJECT (tab->view), "drag_begin", G_CALLBACK (drag_begin_cb), NULL);
+ g_signal_connect (G_OBJECT (tab->view), "drag_end", G_CALLBACK (drag_end_cb), NULL);
+
+ // destination widget drag n drop signals
+ g_signal_connect (G_OBJECT (tab->view), "drag_data_received", G_CALLBACK (drag_data_received_cb), NULL);
+
+ }
+
+
+ gtk_widget_grab_focus(GTK_WIDGET(tab->view));
+
+ rend = gtk_cell_renderer_pixbuf_new();
+ col = gtk_tree_view_column_new_with_attributes ("Icon",
+ rend,
+ "pixbuf", 0,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
+
+ rend = gtk_cell_renderer_text_new();
+ col = gtk_tree_view_column_new_with_attributes ("Description",
+ rend,
+ "markup", COLUMN_ACCOUNT_DESC,
+ NULL);
+ g_object_set(rend, "wrap-mode", (PangoWrapMode) PANGO_WRAP_WORD_CHAR, NULL);
+ g_object_set(rend, "wrap-width", (gint) CALLTREE_TEXT_WIDTH, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
+
+ /* Security icon */
+ rend = gtk_cell_renderer_pixbuf_new();
+ col = gtk_tree_view_column_new_with_attributes ("Icon",
+ rend,
+ "pixbuf", COLUMN_ACCOUNT_SECURITY,
+ NULL);
+ g_object_set(rend, "xalign", (gfloat) 1.0, NULL);
+ g_object_set(rend, "yalign", (gfloat) 0.0, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(tab->view), col);
+
+
+ g_object_unref(G_OBJECT(tab->store));
+ gtk_container_add(GTK_CONTAINER(sw), tab->view);
+
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tab->view));
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (call_selected_cb),
+ NULL);
+
+ gtk_box_pack_start(GTK_BOX(tab->tree), sw, TRUE, TRUE, 0);
+
+ // search bar if tab is either "history" or "addressbook"
+ if(searchbar_type){
+ calltab_create_searchbar (tab);
+ gtk_box_pack_start(GTK_BOX(tab->tree), tab->searchbar, FALSE, TRUE, 0);
+ }
+
+ gtk_widget_show(tab->tree);
}
-void
+ void
calltree_remove_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{
- DEBUG("calltree_remove_call %s", c->_callID);
-
- GtkTreeIter iter;
- GValue val;
- callable_obj_t * iterCall;
- GtkTreeStore* store = tab->store;
-
- int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
- int i;
- for( i = 0; i < nbChild; i++)
- {
- if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i))
- {
- if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
- {
- calltree_remove_call (tab, c, &iter);
- }
-
- val.g_type = 0;
- gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
-
- iterCall = (callable_obj_t*) g_value_get_pointer(&val);
- g_value_unset(&val);
-
- if(iterCall == c)
- {
- gtk_tree_store_remove(store, &iter);
- }
- }
- }
- callable_obj_t * selectedCall = calltab_get_selected_call(tab);
- if(selectedCall == c)
- calltab_select_call(tab, NULL);
- update_actions();
+ DEBUG("calltree_remove_call %s", c->_callID);
+
+ GtkTreeIter iter;
+ GValue val;
+ callable_obj_t * iterCall;
+ GtkTreeStore* store = tab->store;
+
+ int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
+ int i;
+ for( i = 0; i < nbChild; i++)
+ {
+ if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i))
+ {
+ if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
+ {
+ calltree_remove_call (tab, c, &iter);
+ }
+
+ val.g_type = 0;
+ gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
+
+ iterCall = (callable_obj_t*) g_value_get_pointer(&val);
+ g_value_unset(&val);
+
+ if(iterCall == c)
+ {
+ gtk_tree_store_remove(store, &iter);
+ }
+ }
+ }
+ callable_obj_t * selectedCall = calltab_get_selected_call(tab);
+ if(selectedCall == c)
+ calltab_select_call(tab, NULL);
+ update_actions();
}
-void
+ void
calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
- GValue val;
- callable_obj_t * iterCall;
- GtkTreeStore* store = tab->store;
-
- gchar* srtp_enabled = "";
- gboolean display_sas = TRUE;
- account_t* account_details=NULL;
-
-
- int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
- int i;
-
- if(c != NULL) {
- account_details = account_list_get_by_id(c->_accountID);
- if(account_details != NULL) {
- srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
- if(g_strcasecmp(g_hash_table_lookup(account_details->properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
- { display_sas = FALSE; }
- } else {
- GHashTable * properties = NULL;
- properties = sflphone_get_ip2ip_properties();
- if(properties != NULL) {
- if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
- { display_sas = FALSE; }
- }
- }
- }
-
- for( i = 0; i < nbChild; i++)
- {
-
- if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i))
- {
-
- if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
- {
- calltree_update_call (tab, c, &iter);
- }
-
- val.g_type = 0;
- gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
-
-
- iterCall = (callable_obj_t*) g_value_get_pointer(&val);
- g_value_unset(&val);
-
- if(iterCall != c) {
- continue;
- }
-
- /* Update text */
- gchar * description;
- gchar * date="";
- gchar * duration="";
-
- if(c->_state == CALL_STATE_TRANSFERT)
- {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
- c->_peer_number,
- c->_peer_name,
- c->_trsft_to);
- }
- else
- {
- // c->_zrtp_confirmed == FALSE : Hack explained in callable_obj.h
- if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
- c->_peer_number,
- c->_peer_name,
- c->_sas);
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+ GValue val;
+ callable_obj_t * iterCall;
+ GtkTreeStore* store = tab->store;
+
+ gchar* srtp_enabled = "";
+ gboolean display_sas = TRUE;
+ account_t* account_details=NULL;
+
+
+ int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
+ int i;
+
+ if(c != NULL) {
+ account_details = account_list_get_by_id(c->_accountID);
+ if(account_details != NULL) {
+ srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
+ if(g_strcasecmp(g_hash_table_lookup(account_details->properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
+ { display_sas = FALSE; }
} else {
- DEBUG("Updating state code %d %s", c->_state_code, c->_state_code_description);
- if (c->_state_code) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
- c->_peer_number,
- c->_peer_name,
- c->_state_code_description,
- c->_state_code);
- } else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_number,
- c->_peer_name );
- }
+ GHashTable * properties = NULL;
+ properties = sflphone_get_ip2ip_properties();
+ if(properties != NULL) {
+ if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
+ { display_sas = FALSE; }
+ }
}
- }
+ }
- /* Update icons */
- if( tab == current_calls )
- {
- DEBUG("Receiving in state %d", c->_state);
- switch(c->_state)
- {
- case CALL_STATE_HOLD:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
- break;
- case CALL_STATE_INCOMING:
- case CALL_STATE_RINGING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
- break;
- case CALL_STATE_CURRENT:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
- break;
- case CALL_STATE_DIALING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
- break;
- case CALL_STATE_FAILURE:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
- break;
- case CALL_STATE_BUSY:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/busy.svg", NULL);
- break;
- case CALL_STATE_TRANSFERT:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/transfert.svg", NULL);
- break;
- case CALL_STATE_RECORD:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/icon_rec.svg", NULL);
- break;
- default:
- WARN("Update calltree - Should not happen!");
- }
+ for( i = 0; i < nbChild; i++)
+ {
- switch(c->_srtp_state)
+ if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i))
{
- case SRTP_STATE_SAS_UNCONFIRMED:
- DEBUG("Secure is ON");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_unconfirmed.svg", NULL);
- if(c->_sas != NULL) { DEBUG("SAS is ready with value %s", c->_sas); }
- break;
- case SRTP_STATE_SAS_CONFIRMED:
- DEBUG("SAS is confirmed");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
- break;
- case SRTP_STATE_SAS_SIGNED:
- DEBUG("Secure is ON with SAS signed and verified");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_certified.svg", NULL);
- break;
- case SRTP_STATE_UNLOCKED:
- DEBUG("Secure is off calltree %d", c->_state);
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+
+ if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
+ {
+ calltree_update_call (tab, c, &iter);
}
- break;
- default:
- WARN("Update calltree srtp state #%d- Should not happen!", c->_srtp_state);
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+
+ val.g_type = 0;
+ gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
+
+
+ iterCall = (callable_obj_t*) g_value_get_pointer(&val);
+ g_value_unset(&val);
+
+ if(iterCall != c) {
+ continue;
}
- }
- gtk_tree_store_set(store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security,
- 3, c,
- -1);
+ /* Update text */
+ gchar * description;
+ gchar * date="";
+ gchar * duration="";
+
+ if(c->_state == CALL_STATE_TRANSFERT)
+ {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
+ c->_peer_number,
+ c->_peer_name,
+ c->_trsft_to);
+ }
+ else
+ {
+ // c->_zrtp_confirmed == FALSE : Hack explained in callable_obj.h
+ if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
+ c->_peer_number,
+ c->_peer_name,
+ c->_sas);
+ } else {
+ DEBUG("Updating state code %d %s", c->_state_code, c->_state_code_description);
+ if (c->_state_code) {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
+ c->_peer_number,
+ c->_peer_name,
+ c->_state_code_description,
+ c->_state_code);
+ } else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ c->_peer_number,
+ c->_peer_name );
+ }
+ }
+ }
- if (pixbuf != NULL)
- g_object_unref(G_OBJECT(pixbuf));
+ /* Update icons */
+ if( tab == current_calls )
+ {
+ DEBUG("Receiving in state %d", c->_state);
+ switch(c->_state)
+ {
+ case CALL_STATE_HOLD:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
+ break;
+ case CALL_STATE_INCOMING:
+ case CALL_STATE_RINGING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
+ break;
+ case CALL_STATE_CURRENT:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
+ break;
+ case CALL_STATE_DIALING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
+ break;
+ case CALL_STATE_FAILURE:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
+ break;
+ case CALL_STATE_BUSY:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/busy.svg", NULL);
+ break;
+ case CALL_STATE_TRANSFERT:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/transfert.svg", NULL);
+ break;
+ case CALL_STATE_RECORD:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/icon_rec.svg", NULL);
+ break;
+ default:
+ WARN("Update calltree - Should not happen!");
+ }
+
+ switch(c->_srtp_state)
+ {
+ case SRTP_STATE_SAS_UNCONFIRMED:
+ DEBUG("Secure is ON");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_unconfirmed.svg", NULL);
+ if(c->_sas != NULL) { DEBUG("SAS is ready with value %s", c->_sas); }
+ break;
+ case SRTP_STATE_SAS_CONFIRMED:
+ DEBUG("SAS is confirmed");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
+ break;
+ case SRTP_STATE_SAS_SIGNED:
+ DEBUG("Secure is ON with SAS signed and verified");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_certified.svg", NULL);
+ break;
+ case SRTP_STATE_UNLOCKED:
+ DEBUG("Secure is off calltree %d", c->_state);
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+ }
+ break;
+ default:
+ WARN("Update calltree srtp state #%d- Should not happen!", c->_srtp_state);
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+ }
+
+ }
+ gtk_tree_store_set(store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security,
+ 3, c,
+ -1);
+
+ if (pixbuf != NULL)
+ g_object_unref(G_OBJECT(pixbuf));
- }
- }
+ }
+ }
- }
- update_actions();
+ }
+ update_actions();
}
void calltree_add_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{
- DEBUG("calltree_add_call %s", c->_callID);
+ DEBUG("calltree_add_call %s", c->_callID);
- if (tab == history)
- {
- calltree_add_history_entry (c);
- return;
- }
+ if (tab == history)
+ {
+ calltree_add_history_entry (c);
+ return;
+ }
- account_t* account_details=NULL;
+ account_t* account_details=NULL;
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
- gchar* key_exchange="";
- gchar* srtp_enabled="";
-
- // New call in the list
- gchar * description;
- gchar * date="";
- gchar *duration="";
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+ gchar* key_exchange="";
+ gchar* srtp_enabled="";
- if(c->_state_code == 0) {
+ // New call in the list
+ gchar * description;
+ gchar * date="";
+ gchar *duration="";
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_number,
- c->_peer_name);
-
- }
- else {
-
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
- c->_peer_number,
- c->_peer_name,
- c->_state_code_description,
- c->_state_code);
- }
-
- gtk_tree_store_prepend (tab->store, &iter, parent);
-
- if(c != NULL) {
- account_details = account_list_get_by_id(c->_callID);
- if(account_details != NULL) {
- srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
- key_exchange = g_hash_table_lookup(account_details->properties, ACCOUNT_KEY_EXCHANGE);
- }
- }
-
- if( tab == current_calls )
- {
- switch(c->_state)
- {
- case CALL_STATE_INCOMING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
- break;
- case CALL_STATE_DIALING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
- break;
- case CALL_STATE_RINGING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
- break;
- case CALL_STATE_CURRENT:
- // If the call has been initiated by a another client and, when we start, it is already current
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
- break;
- case CALL_STATE_HOLD:
- // If the call has been initiated by a another client and, when we start, it is already current
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
- break;
- case CALL_STATE_FAILURE:
- // If the call has been initiated by a another client and, when we start, it is already current
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
- break;
- default:
- WARN("Update calltree add - Should not happen!");
- }
-
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/secure_off.svg", NULL);
- }
- }
-
- else if (tab == contacts) {
- pixbuf = c->_contact_thumbnail;
- description = g_strconcat( description , NULL);
- }
-
- else {
- WARN ("This widget doesn't exist - This is a bug in the application.");
- }
-
-
- //Resize it
- if(pixbuf)
- {
- if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
- {
- pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
- }
- }
-
- if(pixbuf_security)
- {
- if(gdk_pixbuf_get_width(pixbuf_security) > 32 || gdk_pixbuf_get_height(pixbuf_security) > 32)
- {
- pixbuf_security = gdk_pixbuf_scale_simple(pixbuf_security, 32, 32, GDK_INTERP_BILINEAR);
- }
- }
-
- gtk_tree_store_set(tab->store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security, // Informs user about the state of security
- 3, c, // Pointer
- -1);
-
- if (pixbuf != NULL)
- { g_object_unref(G_OBJECT(pixbuf)); }
- if (pixbuf_security != NULL)
- { g_object_unref(G_OBJECT(pixbuf)); }
-
- gtk_tree_view_set_model (GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(history->store));
-
- gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view)), &iter);
-
- history_reinit(history);
-}
+ if(c->_state_code == 0) {
-void calltree_add_history_entry (callable_obj_t * c)
-{
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ c->_peer_number,
+ c->_peer_name);
- DEBUG("calltree_add_history_entry %s", c->_callID);
-
- if ( g_strcasecmp (dbus_get_history_enabled (), "false") == 0)
- return;
-
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
-
- // New call in the list
- gchar * description, *date="", *duration="";
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_number,
- c->_peer_name);
-
- gtk_tree_store_prepend (history->store, &iter, NULL);
-
- switch(c->_history_state)
- {
- case INCOMING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
- break;
- case OUTGOING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/outgoing.svg", NULL);
- break;
- case MISSED:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/missed.svg", NULL);
- break;
- default:
- WARN("History - Should not happen!");
- }
-
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
-
- date = get_formatted_start_timestamp (c);
- duration = get_call_duration (c);
- duration = g_strconcat( date , duration , NULL);
- description = g_strconcat( description , duration, NULL);
-
- //Resize it
- if(pixbuf)
- {
- if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
- {
- pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
- }
- }
-
- if(pixbuf_security != NULL)
- {
- if(gdk_pixbuf_get_width(pixbuf_security) > 32 || gdk_pixbuf_get_height(pixbuf_security) > 32)
- {
- pixbuf_security = gdk_pixbuf_scale_simple(pixbuf_security, 32, 32, GDK_INTERP_BILINEAR);
- }
- }
- gtk_tree_store_set(history->store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security, // Icon
- 3, c, // Pointer
- -1);
-
- if (pixbuf != NULL)
- g_object_unref(G_OBJECT(pixbuf));
- if (pixbuf_security != NULL)
- { g_object_unref(G_OBJECT(pixbuf_security)); }
-
- gtk_tree_view_set_model (GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(history->store));
-
- history_reinit(history);
-}
+ }
+ else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
+ c->_peer_number,
+ c->_peer_name,
+ c->_state_code_description,
+ c->_state_code);
+ }
-void calltree_add_conference (calltab_t* tab, conference_obj_t* conf)
-{
+ gtk_tree_store_prepend (tab->store, &iter, parent);
- DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID);
+ if(c != NULL) {
+ account_details = account_list_get_by_id(c->_callID);
+ if(account_details != NULL) {
+ srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
+ key_exchange = g_hash_table_lookup(account_details->properties, ACCOUNT_KEY_EXCHANGE);
+ }
+ }
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
+ if( tab == current_calls )
+ {
+ switch(c->_state)
+ {
+ case CALL_STATE_INCOMING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
+ break;
+ case CALL_STATE_DIALING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
+ break;
+ case CALL_STATE_RINGING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
+ break;
+ case CALL_STATE_CURRENT:
+ // If the call has been initiated by a another client and, when we start, it is already current
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
+ break;
+ case CALL_STATE_HOLD:
+ // If the call has been initiated by a another client and, when we start, it is already current
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
+ break;
+ case CALL_STATE_FAILURE:
+ // If the call has been initiated by a another client and, when we start, it is already current
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
+ break;
+ default:
+ WARN("Update calltree add - Should not happen!");
+ }
- gchar** participant = conf->participant;
- gchar** pl;
- gchar* call_id;
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/secure_off.svg", NULL);
+ }
+ }
- callable_obj_t * call;
+ else if (tab == contacts) {
+ pixbuf = c->_contact_thumbnail;
+ description = g_strconcat( description , NULL);
+ }
- account_t* account_details=NULL;
- gchar* srtp_enabled="";
+ else {
+ WARN ("This widget doesn't exist - This is a bug in the application.");
+ }
- // New call in the list
-
- gchar * description;
- // description = g_markup_printf_escaped("<b>%s</b>", conf->_confID);
- description = g_markup_printf_escaped("<b>%s</b>", "");
- gtk_tree_store_append (tab->store, &iter, NULL);
+ //Resize it
+ if(pixbuf)
+ {
+ if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
+ {
+ pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
+ }
+ }
- if( tab == current_calls )
- {
+ if(pixbuf_security)
+ {
+ if(gdk_pixbuf_get_width(pixbuf_security) > 32 || gdk_pixbuf_get_height(pixbuf_security) > 32)
+ {
+ pixbuf_security = gdk_pixbuf_scale_simple(pixbuf_security, 32, 32, GDK_INTERP_BILINEAR);
+ }
+ }
+
+ gtk_tree_store_set(tab->store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security, // Informs user about the state of security
+ 3, c, // Pointer
+ -1);
+
+ if (pixbuf != NULL)
+ { g_object_unref(G_OBJECT(pixbuf)); }
+ if (pixbuf_security != NULL)
+ { g_object_unref(G_OBJECT(pixbuf)); }
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(history->store));
+
+ gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view)), &iter);
+
+ history_reinit(history);
+}
- DEBUG("------------- calltree_add_conference %s, %s ------------------------", tab, current_calls);
- switch(conf->_state)
+void calltree_add_history_entry (callable_obj_t * c)
+{
+
+ DEBUG("calltree_add_history_entry %s", c->_callID);
+
+ if ( g_strcasecmp (dbus_get_history_enabled (), "false") == 0)
+ return;
+
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+
+ // New call in the list
+ gchar * description, *date="", *duration="";
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ c->_peer_number,
+ c->_peer_name);
+
+ gtk_tree_store_prepend (history->store, &iter, NULL);
+
+ switch(c->_history_state)
{
- case CONFERENCE_STATE_ACTIVE_ATACHED:
- {
-
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/usersActive.svg", NULL);
- break;
- }
- case CONFERENCE_STATE_ACTIVE_DETACHED:
- case CONFERENCE_STATE_HOLD:
- {
-
-
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/users.svg", NULL);
- break;
- }
- default:
- WARN("Update conference add - Should not happen!");
+ case INCOMING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
+ break;
+ case OUTGOING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/outgoing.svg", NULL);
+ break;
+ case MISSED:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/missed.svg", NULL);
+ break;
+ default:
+ WARN("History - Should not happen!");
}
-
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
+
+ date = get_formatted_start_timestamp (c);
+ duration = get_call_duration (c);
+ duration = g_strconcat( date , duration , NULL);
+ description = g_strconcat( description , duration, NULL);
//Resize it
if(pixbuf)
{
- if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
- {
- pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
- }
+ if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
+ {
+ pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
+ }
}
- else
+
+ if(pixbuf_security != NULL)
{
- DEBUG("Error no pixbuff for conference from %s", ICONS_DIR);
+ if(gdk_pixbuf_get_width(pixbuf_security) > 32 || gdk_pixbuf_get_height(pixbuf_security) > 32)
+ {
+ pixbuf_security = gdk_pixbuf_scale_simple(pixbuf_security, 32, 32, GDK_INTERP_BILINEAR);
+ }
}
+ gtk_tree_store_set(history->store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security, // Icon
+ 3, c, // Pointer
+ -1);
+ if (pixbuf != NULL)
+ g_object_unref(G_OBJECT(pixbuf));
+ if (pixbuf_security != NULL)
+ { g_object_unref(G_OBJECT(pixbuf_security)); }
- // Used to determine if at least one participant use a security feature
- // If true (at least on call use a security feature) we need to display security icons
- conf->_conf_srtp_enabled = FALSE;
+ gtk_tree_view_set_model (GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(history->store));
- // Used to determine if the conference is secured
- // Every participant to a conference must be secured, the conference is not secured elsewhere
- conf->_conference_secured = TRUE;
+ history_reinit(history);
+}
- DEBUG("Determine if conference is secured");
- participant = conf->participant;
- if(participant)
+void calltree_add_conference (calltab_t* tab, conference_obj_t* conf)
+{
+
+ DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID);
+
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
+
+ gchar** participant = conf->participant;
+ gchar** pl;
+ gchar* call_id;
+
+ callable_obj_t * call;
+
+ account_t* account_details=NULL;
+ gchar* srtp_enabled="";
+
+ // New call in the list
+
+ gchar * description;
+ // description = g_markup_printf_escaped("<b>%s</b>", conf->_confID);
+ description = g_markup_printf_escaped("<b>%s</b>", "");
+
+ gtk_tree_store_append (tab->store, &iter, NULL);
+
+ if( tab == current_calls )
{
- DEBUG(" determine if at least one participant uses srtp");
-
- participant = conf->participant;
- for (pl = participant; *participant; participant++)
- {
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
-
- if(call != NULL) {
-
- account_details = account_list_get_by_id(call->_callID);
- if(account_details != NULL) {
- srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
- }
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- DEBUG(" srtp enabled for participant %s\n", participant);
- conf->_conf_srtp_enabled = TRUE;
- break;
- } else {
- DEBUG(" srtp is not enabled for participant %s\n", participant);
- }
-
+ DEBUG("------------- calltree_add_conference %s, %s ------------------------", tab, current_calls);
+ switch(conf->_state)
+ {
+ case CONFERENCE_STATE_ACTIVE_ATACHED:
+ {
+
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/usersActive.svg", NULL);
+ break;
+ }
+ case CONFERENCE_STATE_ACTIVE_DETACHED:
+ case CONFERENCE_STATE_HOLD:
+ {
+
+
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/users.svg", NULL);
+ break;
+ }
+ default:
+ WARN("Update conference add - Should not happen!");
+ }
+
+
+
+ //Resize it
+ if(pixbuf)
+ {
+ if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
+ {
+ pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
+ }
+ }
+ else
+ {
+ DEBUG("Error no pixbuff for conference from %s", ICONS_DIR);
}
- }
- DEBUG(" determine if all conference participant are secured");
+ // Used to determine if at least one participant use a security feature
+ // If true (at least on call use a security feature) we need to display security icons
+ conf->_conf_srtp_enabled = FALSE;
+
+ // Used to determine if the conference is secured
+ // Every participant to a conference must be secured, the conference is not secured elsewhere
+ conf->_conference_secured = TRUE;
+
+ DEBUG("Determine if conference is secured");
- if(conf->_conf_srtp_enabled)
- {
participant = conf->participant;
- for (pl = participant; *participant; participant++)
- {
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
-
- if(call != NULL) {
-
- if(call->_srtp_state == 0)
+ if(participant)
+ {
+ DEBUG(" determine if at least one participant uses srtp");
+
+ participant = conf->participant;
+ for (pl = participant; *participant; participant++)
+ {
+ call_id = (gchar*)(*participant);
+ call = calllist_get (tab, call_id);
+
+ if(call != NULL) {
+
+ account_details = account_list_get_by_id(call->_callID);
+ if(account_details != NULL) {
+ srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
+ }
+
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ DEBUG(" srtp enabled for participant %s\n", participant);
+ conf->_conf_srtp_enabled = TRUE;
+ break;
+ } else {
+ DEBUG(" srtp is not enabled for participant %s\n", participant);
+ }
+
+ }
+
+ }
+
+ DEBUG(" determine if all conference participant are secured");
+
+ if(conf->_conf_srtp_enabled)
{
- DEBUG(" participant %s is not secured", participant);
- conf->_conference_secured = FALSE;
- break;
- } else {
- DEBUG(" participant %s is secured", participant);
+ participant = conf->participant;
+ for (pl = participant; *participant; participant++)
+ {
+ call_id = (gchar*)(*participant);
+ call = calllist_get (tab, call_id);
+
+ if(call != NULL) {
+
+ if(call->_srtp_state == 0)
+ {
+ DEBUG(" participant %s is not secured", participant);
+ conf->_conference_secured = FALSE;
+ break;
+ } else {
+ DEBUG(" participant %s is secured", participant);
+ }
+ }
+ }
}
- }
}
- }
- }
- if(conf->_conf_srtp_enabled)
- {
- if(conf->_conference_secured)
- {
- DEBUG("Conference is secured");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
- }
- else
- {
- DEBUG("Conference is not secured");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
- }
- }
+ if(conf->_conf_srtp_enabled)
+ {
+ if(conf->_conference_secured)
+ {
+ DEBUG("Conference is secured");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
+ }
+ else
+ {
+ DEBUG("Conference is not secured");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+ }
+ }
- DEBUG("add conference to tree store");
-
- gtk_tree_store_set(tab->store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security,
- 3, conf, // Pointer
- -1);
+ DEBUG("add conference to tree store");
- DEBUG("add conference to tree store");
+ gtk_tree_store_set(tab->store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security,
+ 3, conf, // Pointer
+ -1);
-
- if (pixbuf != NULL)
- g_object_unref(G_OBJECT(pixbuf));
+ DEBUG("add conference to tree store");
- participant = conf->participant;
- if(participant)
+ if (pixbuf != NULL)
+ g_object_unref(G_OBJECT(pixbuf));
+
+
+ participant = conf->participant;
+ if(participant)
+ {
+ for (pl = participant; *participant; participant++)
+ {
+
+
+ call_id = (gchar*)(*participant);
+ call = calllist_get (tab, call_id);
+ // create_new_call_from_details (conf_id, conference_details, &c);
+
+ calltree_remove_call(tab, call, NULL);
+ calltree_add_call (tab, call, &iter);
+ }
+ }
+
+ }
+
+ else
{
- for (pl = participant; *participant; participant++)
- {
-
-
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
- // create_new_call_from_details (conf_id, conference_details, &c);
-
- calltree_remove_call(tab, call, NULL);
- calltree_add_call (tab, call, &iter);
- }
+ WARN ("Conferences cannot be added in this widget - This is a bug in the application.");
}
- }
-
- else
- {
- WARN ("Conferences cannot be added in this widget - This is a bug in the application.");
- }
-
- gtk_tree_view_set_model(GTK_TREE_VIEW(tab->view), GTK_TREE_MODEL(tab->store));
+ gtk_tree_view_set_model(GTK_TREE_VIEW(tab->view), GTK_TREE_MODEL(tab->store));
- path = gtk_tree_model_get_path(model, &iter);
+ path = gtk_tree_model_get_path(model, &iter);
- gtk_tree_view_expand_row(GTK_TREE_VIEW(tab->view), path, FALSE);
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(tab->view), path, FALSE);
+
+ update_actions();
- update_actions();
-
}
void calltree_update_conference (calltab_t* tab, const gchar* confID)
{
- DEBUG("calltree_update_conference");
-
+ DEBUG("calltree_update_conference");
+
}
@@ -1102,136 +1102,136 @@ void calltree_update_conference (calltab_t* tab, const gchar* confID)
void calltree_remove_conference (calltab_t* tab, const conference_obj_t* conf, GtkTreeIter *parent)
{
- DEBUG("calltree_remove_conference %s\n", conf->_confID);
-
- GtkTreeIter iter_parent;
- GtkTreeIter iter_child;
- GValue confval;
- GValue callval;
- conference_obj_t * tempconf;
- callable_obj_t * call;
- GtkTreeStore* store = tab->store;
-
- int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
-
- int nbParticipant;
-
- int i, j;
- for( i = 0; i < nbChild; i++)
- {
-
- if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter_parent, parent, i))
- {
-
- if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter_parent))
- {
-
- calltree_remove_conference (tab, conf, &iter_parent);
-
- confval.g_type = 0;
- gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter_parent, COLUMN_ACCOUNT_PTR, &confval);
-
- tempconf = (conference_obj_t*) g_value_get_pointer(&confval);
- g_value_unset(&confval);
-
- if(tempconf == conf)
+ DEBUG("calltree_remove_conference %s\n", conf->_confID);
+
+ GtkTreeIter iter_parent;
+ GtkTreeIter iter_child;
+ GValue confval;
+ GValue callval;
+ conference_obj_t * tempconf;
+ callable_obj_t * call;
+ GtkTreeStore* store = tab->store;
+
+ int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
+
+ int nbParticipant;
+
+ int i, j;
+ for( i = 0; i < nbChild; i++)
+ {
+
+ if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter_parent, parent, i))
{
- nbParticipant = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), &iter_parent);
- DEBUG("nbParticipant: %i\n", nbParticipant);
- for( j = 0; j < nbParticipant; j++)
- {
- call = NULL;
- if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter_child, &iter_parent, j))
+
+ if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter_parent))
{
-
- callval.g_type = 0;
- gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter_child, COLUMN_ACCOUNT_PTR, &callval);
-
- call = (callable_obj_t*)g_value_get_pointer(&callval);
- g_value_unset(&callval);
-
- if(call)
- {
- calltree_add_call (tab, call, NULL);
- }
- }
-
- }
- gtk_tree_store_remove(store, &iter_parent);
+ calltree_remove_conference (tab, conf, &iter_parent);
+
+ confval.g_type = 0;
+ gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter_parent, COLUMN_ACCOUNT_PTR, &confval);
+
+ tempconf = (conference_obj_t*) g_value_get_pointer(&confval);
+ g_value_unset(&confval);
+
+ if(tempconf == conf)
+ {
+ nbParticipant = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), &iter_parent);
+ DEBUG("nbParticipant: %i\n", nbParticipant);
+ for( j = 0; j < nbParticipant; j++)
+ {
+ call = NULL;
+ if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter_child, &iter_parent, j))
+ {
+
+ callval.g_type = 0;
+ gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter_child, COLUMN_ACCOUNT_PTR, &callval);
+
+ call = (callable_obj_t*)g_value_get_pointer(&callval);
+ g_value_unset(&callval);
+
+ if(call)
+ {
+ calltree_add_call (tab, call, NULL);
+ }
+ }
+
+ }
+
+ gtk_tree_store_remove(store, &iter_parent);
+ }
+ }
}
- }
- }
- }
+ }
+
+ // callable_obj_t * selectedCall = calltab_get_selected_call(tab);
+ // if(selectedCall == c)
+ // calltab_select_call(tab, NULL);
- // callable_obj_t * selectedCall = calltab_get_selected_call(tab);
- // if(selectedCall == c)
- // calltab_select_call(tab, NULL);
+ update_actions();
- update_actions();
-
}
void calltree_display (calltab_t *tab) {
- GtkTreeSelection *sel;
+ GtkTreeSelection *sel;
+
+ /* If we already are displaying the specified calltree */
+ if (active_calltree == tab)
+ return;
- /* If we already are displaying the specified calltree */
- if (active_calltree == tab)
- return;
+ /* case 1: we want to display the main calltree */
+ if (tab==current_calls) {
- /* case 1: we want to display the main calltree */
- if (tab==current_calls) {
+ DEBUG ("display main tab");
- DEBUG ("display main tab");
-
- if (active_calltree==contacts) {
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
- } else {
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
- }
+ if (active_calltree==contacts) {
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
+ } else {
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
+ }
gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)currentCallsButton, TRUE);
-
- }
- /* case 2: we want to display the history */
- else if (tab==history) {
+ }
+
+ /* case 2: we want to display the history */
+ else if (tab==history) {
- DEBUG ("display history tab");
+ DEBUG ("display history tab");
- if (active_calltree==contacts) {
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
- }
+ if (active_calltree==contacts) {
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
+ }
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
- }
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
+ }
- else if (tab==contacts) {
+ else if (tab==contacts) {
- DEBUG ("display contact tab");
+ DEBUG ("display contact tab");
- if (active_calltree==history) {
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
- }
+ if (active_calltree==history) {
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
+ }
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
- }
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
+ }
- else
- ERROR ("calltree.c line %d . This is probably a bug in the application", __LINE__);
+ else
+ ERROR ("calltree.c line %d . This is probably a bug in the application", __LINE__);
- gtk_widget_hide (active_calltree->tree);
- active_calltree = tab;
- gtk_widget_show (active_calltree->tree);
+ gtk_widget_hide (active_calltree->tree);
+ active_calltree = tab;
+ gtk_widget_show (active_calltree->tree);
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (active_calltree->view));
- DEBUG("Emit signal changed from calltree_display");
- g_signal_emit_by_name(sel, "changed");
- update_actions();
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (active_calltree->view));
+ DEBUG("Emit signal changed from calltree_display");
+ g_signal_emit_by_name(sel, "changed");
+ update_actions();
}
@@ -1240,291 +1240,291 @@ void calltree_display (calltab_t *tab) {
static void drag_begin_cb(GtkWidget *widget, GdkDragContext *dc, gpointer data)
{
- GtkTargetList* target_list;
+ GtkTargetList* target_list;
+
+ // g_print("drag_begin_cb %s\n", dragged_path);
+ if((target_list = gtk_drag_source_get_target_list(widget)) != NULL);
+
- // g_print("drag_begin_cb %s\n", dragged_path);
- if((target_list = gtk_drag_source_get_target_list(widget)) != NULL);
-
-
}
static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer data)
{
- DEBUG("drag_end_cb\n");
- DEBUG(" selected_path %s, selected_call_id %s, selected_path_depth %i\n", selected_path, selected_call_id, selected_path_depth);
- DEBUG(" dragged path %s, dragged_call_id %s, dragged_path_depth %i\n", selected_path, selected_call_id, dragged_path_depth);
-
- GtkTreeModel* model = (GtkTreeModel*)current_calls->store;
- GtkTreePath *path = gtk_tree_path_new_from_string(dragged_path);
- GtkTreePath *dpath = gtk_tree_path_new_from_string(dragged_path);
- GtkTreePath *spath = gtk_tree_path_new_from_string(selected_path);
-
- GtkTreeIter iter;
- GtkTreeIter iter_parent;
- GtkTreeIter iter_children;
- GtkTreeIter parent_conference;
-
- GValue val;
-
- conference_obj_t* conf;
-
-
- if(selected_path_depth == 1)
- {
- if(dragged_path_depth == 1)
- {
-
- if (selected_type == A_CALL && dragged_type == A_CALL)
- {
-
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
- // draged a call on itself
- }
- else
- {
- // dragged a single call on a single call
- if(selected_call != NULL && dragged_call != NULL)
- sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
- }
- }
- else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
- {
- // dragged a single call on a conference
- selected_call->_confID = g_strdup(dragged_call_id);
- sflphone_add_participant(selected_call_id, dragged_call_id);
- }
- else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
- {
- // dragged a conference on a single call (make no sence)
- calltree_remove_conference(current_calls, selected_conf, NULL);
- calltree_add_conference(current_calls, selected_conf);
-
-
- }
- else if(selected_type == A_CONFERENCE && dragged_type == A_CONFERENCE)
- {
- // dragged a conference on a conference
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
- DEBUG("Joined the same conference!\n");
- gtk_tree_view_expand_row(GTK_TREE_VIEW(current_calls->view), path, FALSE);
- }
- else
- {
- DEBUG("Joined two conference %s, %s!\n", dragged_path, selected_path);
- sflphone_join_conference(selected_conf->_confID, dragged_conf->_confID);
- }
- }
+ DEBUG("drag_end_cb\n");
+ DEBUG(" selected_path %s, selected_call_id %s, selected_path_depth %i\n", selected_path, selected_call_id, selected_path_depth);
+ DEBUG(" dragged path %s, dragged_call_id %s, dragged_path_depth %i\n", selected_path, selected_call_id, dragged_path_depth);
- // TODO: dragged a single call on a NULL element (should do nothing)
- // TODO: dragged a conference on a NULL element (should do nothing)
-
- }
- else // dragged_path_depth == 2
- {
- if (selected_type == A_CALL && dragged_type == A_CALL)
- {
- // TODO: dragged a call on a conference call
- calltree_remove_call(current_calls, selected_call, NULL);
- calltree_add_call(current_calls, selected_call, NULL);
- }
- else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
- {
- // TODO: dragged a conference on a conference call
- calltree_remove_conference(current_calls, selected_conf, NULL);
- calltree_add_conference(current_calls, selected_conf);
- }
-
- // TODO: dragged a single call on a NULL element
- // TODO: dragged a conference on a NULL element
- }
- }
- else // selected_path_depth == 2
- {
-
- if(dragged_path_depth == 1)
+ GtkTreeModel* model = (GtkTreeModel*)current_calls->store;
+ GtkTreePath *path = gtk_tree_path_new_from_string(dragged_path);
+ GtkTreePath *dpath = gtk_tree_path_new_from_string(dragged_path);
+ GtkTreePath *spath = gtk_tree_path_new_from_string(selected_path);
+
+ GtkTreeIter iter;
+ GtkTreeIter iter_parent;
+ GtkTreeIter iter_children;
+ GtkTreeIter parent_conference;
+
+ GValue val;
+
+ conference_obj_t* conf;
+
+
+ if(selected_path_depth == 1)
{
-
- if(selected_type == A_CALL && dragged_type == A_CALL)
- {
-
- // dragged a conference call on a call
- sflphone_detach_participant(selected_call_id);
-
- if(selected_call != NULL && dragged_call != NULL)
- sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
-
- }
- else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
- {
- // dragged a conference call on a conference
- sflphone_detach_participant(selected_call_id);
-
- if(selected_call != NULL && dragged_conf != NULL)
+ if(dragged_path_depth == 1)
{
- DEBUG("Adding a participant, since dragged call on a conference");
-
- sflphone_add_participant(selected_call_id, dragged_call_id);
+
+ if (selected_type == A_CALL && dragged_type == A_CALL)
+ {
+
+ if(gtk_tree_path_compare (dpath, spath) == 0)
+ {
+ // draged a call on itself
+ }
+ else
+ {
+ // dragged a single call on a single call
+ if(selected_call != NULL && dragged_call != NULL)
+ sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
+ }
+ }
+ else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
+ {
+ // dragged a single call on a conference
+ selected_call->_confID = g_strdup(dragged_call_id);
+ sflphone_add_participant(selected_call_id, dragged_call_id);
+ }
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
+ {
+ // dragged a conference on a single call (make no sence)
+ calltree_remove_conference(current_calls, selected_conf, NULL);
+ calltree_add_conference(current_calls, selected_conf);
+
+
+ }
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CONFERENCE)
+ {
+ // dragged a conference on a conference
+ if(gtk_tree_path_compare (dpath, spath) == 0)
+ {
+ DEBUG("Joined the same conference!\n");
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(current_calls->view), path, FALSE);
+ }
+ else
+ {
+ DEBUG("Joined two conference %s, %s!\n", dragged_path, selected_path);
+ sflphone_join_conference(selected_conf->_confID, dragged_conf->_confID);
+ }
+ }
+
+ // TODO: dragged a single call on a NULL element (should do nothing)
+ // TODO: dragged a conference on a NULL element (should do nothing)
+
}
- }
- else
- {
- // dragged a conference call on a NULL element
- sflphone_detach_participant(selected_call_id);
- }
+ else // dragged_path_depth == 2
+ {
+ if (selected_type == A_CALL && dragged_type == A_CALL)
+ {
+ // TODO: dragged a call on a conference call
+ calltree_remove_call(current_calls, selected_call, NULL);
+ calltree_add_call(current_calls, selected_call, NULL);
+ }
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
+ {
+ // TODO: dragged a conference on a conference call
+ calltree_remove_conference(current_calls, selected_conf, NULL);
+ calltree_add_conference(current_calls, selected_conf);
+ }
+ // TODO: dragged a single call on a NULL element
+ // TODO: dragged a conference on a NULL element
+ }
}
- else // dragged_path_depth == 2
+ else // selected_path_depth == 2
{
- // dragged a conference call on another conference call (same conference)
- // TODO: dragged a conference call on another conference call (different conference)
-
- gtk_tree_path_up(path);
- gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &parent_conference, path);
+ if(dragged_path_depth == 1)
+ {
- gtk_tree_path_up(dpath);
- gtk_tree_path_up(spath);
+ if(selected_type == A_CALL && dragged_type == A_CALL)
+ {
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
-
- DEBUG("Dragged a call in the same conference");
- calltree_remove_call (current_calls, selected_call, NULL);
- calltree_add_call (current_calls, selected_call, &parent_conference);
- }
- else
- {
- DEBUG("Dragged a conference call onto another conference call %s, %s", gtk_tree_path_to_string(dpath), gtk_tree_path_to_string(spath));
+ // dragged a conference call on a call
+ sflphone_detach_participant(selected_call_id);
- conf = NULL;
+ if(selected_call != NULL && dragged_call != NULL)
+ sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
- val.g_type = 0;
- if(gtk_tree_model_get_iter (model, &iter, dpath))
- {
- DEBUG("we got an iter!");
- gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
+ }
+ else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
+ {
+ // dragged a conference call on a conference
+ sflphone_detach_participant(selected_call_id);
- conf = (conference_obj_t*)g_value_get_pointer(&val);
- }
- g_value_unset(&val);
+ if(selected_call != NULL && dragged_conf != NULL)
+ {
+ DEBUG("Adding a participant, since dragged call on a conference");
- sflphone_detach_participant(selected_call_id);
+ sflphone_add_participant(selected_call_id, dragged_call_id);
+ }
+ }
+ else
+ {
+ // dragged a conference call on a NULL element
+ sflphone_detach_participant(selected_call_id);
+ }
- if(conf)
- {
- DEBUG("we got a conf!");
- sflphone_add_participant(selected_call_id, conf->_confID);
}
- else
+ else // dragged_path_depth == 2
{
- DEBUG("didn't find a conf!");
- }
- }
+ // dragged a conference call on another conference call (same conference)
+ // TODO: dragged a conference call on another conference call (different conference)
+ gtk_tree_path_up(path);
- // TODO: dragged a conference call on another conference call (different conference)
- // TODO: dragged a conference call on a NULL element (same conference)
- // TODO: dragged a conference call on a NULL element (different conference)
- }
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &parent_conference, path);
+
+ gtk_tree_path_up(dpath);
+ gtk_tree_path_up(spath);
+
+ if(gtk_tree_path_compare (dpath, spath) == 0)
+ {
+
+ DEBUG("Dragged a call in the same conference");
+ calltree_remove_call (current_calls, selected_call, NULL);
+ calltree_add_call (current_calls, selected_call, &parent_conference);
+ }
+ else
+ {
+ DEBUG("Dragged a conference call onto another conference call %s, %s", gtk_tree_path_to_string(dpath), gtk_tree_path_to_string(spath));
+
+ conf = NULL;
+
+ val.g_type = 0;
+ if(gtk_tree_model_get_iter (model, &iter, dpath))
+ {
+ DEBUG("we got an iter!");
+ gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
+
+ conf = (conference_obj_t*)g_value_get_pointer(&val);
+ }
+ g_value_unset(&val);
+
+ sflphone_detach_participant(selected_call_id);
+
+ if(conf)
+ {
+ DEBUG("we got a conf!");
+ sflphone_add_participant(selected_call_id, conf->_confID);
+ }
+ else
+ {
+ DEBUG("didn't find a conf!");
+ }
+ }
+
+
+ // TODO: dragged a conference call on another conference call (different conference)
+ // TODO: dragged a conference call on a NULL element (same conference)
+ // TODO: dragged a conference call on a NULL element (different conference)
+ }
+
+ }
- }
-
}
void drag_data_received_cb(GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, guint info, guint t, gpointer data)
{
- // g_print("drag_data_received_cb\n");
- GtkTreeView *tree_view = GTK_TREE_VIEW(widget);
- GtkTreePath *drop_path;
- GtkTreeViewDropPosition position;
- GValue val;
-
- GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
- GtkTreeModel* tree_model = gtk_tree_view_get_model(tree_view);
+ // g_print("drag_data_received_cb\n");
+ GtkTreeView *tree_view = GTK_TREE_VIEW(widget);
+ GtkTreePath *drop_path;
+ GtkTreeViewDropPosition position;
+ GValue val;
- GtkTreeIter iter;
- gchar value;
+ GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
+ GtkTreeModel* tree_model = gtk_tree_view_get_model(tree_view);
+ GtkTreeIter iter;
+ gchar value;
- val.g_type = 0;
- gtk_tree_view_get_drag_dest_row(tree_view, &drop_path, &position);
- if(drop_path)
- {
+ val.g_type = 0;
+ gtk_tree_view_get_drag_dest_row(tree_view, &drop_path, &position);
- gtk_tree_model_get_iter(tree_model, &iter, drop_path);
- gtk_tree_model_get_value(tree_model, &iter, COLUMN_ACCOUNT_PTR, &val);
+ if(drop_path)
+ {
+ gtk_tree_model_get_iter(tree_model, &iter, drop_path);
+ gtk_tree_model_get_value(tree_model, &iter, COLUMN_ACCOUNT_PTR, &val);
- if(gtk_tree_model_iter_has_child(tree_model, &iter))
- {
- DEBUG("DRAGGING ON A CONFERENCE");
- dragged_type = A_CONFERENCE;
- }
- else
- {
- DEBUG("DRAGGING ON A CALL");
- dragged_type = A_CALL;
- }
- switch (position)
- {
- case GTK_TREE_VIEW_DROP_AFTER:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- dragged_call_id = "NULL";
- dragged_call = NULL;
- dragged_conf = NULL;
- g_print(" AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
-
- case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- if (dragged_type == A_CALL)
+ if(gtk_tree_model_iter_has_child(tree_model, &iter))
{
- dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
- dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
+ DEBUG("DRAGGING ON A CONFERENCE");
+ dragged_type = A_CONFERENCE;
}
else
{
- dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
- dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ DEBUG("DRAGGING ON A CALL");
+ dragged_type = A_CALL;
}
- g_print(" INTO_OR_AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
-
- case GTK_TREE_VIEW_DROP_BEFORE:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- dragged_call_id = "NULL";
- dragged_call = NULL;
- dragged_conf = NULL;
- g_print(" BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
-
- case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- if (dragged_type == A_CALL)
- {
- dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
- dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
- }
- else
+
+ switch (position)
{
- dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
- dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ case GTK_TREE_VIEW_DROP_AFTER:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ dragged_call_id = "NULL";
+ dragged_call = NULL;
+ dragged_conf = NULL;
+ g_print(" AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
+ break;
+
+ case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ if (dragged_type == A_CALL)
+ {
+ dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
+ dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
+ }
+ else
+ {
+ dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
+ dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ }
+ g_print(" INTO_OR_AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
+ break;
+
+ case GTK_TREE_VIEW_DROP_BEFORE:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ dragged_call_id = "NULL";
+ dragged_call = NULL;
+ dragged_conf = NULL;
+ g_print(" BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
+ break;
+
+ case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ if (dragged_type == A_CALL)
+ {
+ dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
+ dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
+ }
+ else
+ {
+ dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
+ dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ }
+ g_print(" INTO_OR_BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
+ break;
+
+ default:
+ return;
}
- g_print(" INTO_OR_BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
-
- default:
- return;
- }
- }
+ }
}
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 4fa26489885e12f03c0975c7754caddd18fe4bd0..e7d0c2c584675a58aadbd6c5c56ed92104d2da61 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -224,8 +224,8 @@ void update_actions()
gtk_widget_set_sensitive( GTK_WIDGET(contactButton), FALSE);
gtk_widget_set_tooltip_text (GTK_WIDGET (contactButton), _("No address book selected"));
- //g_object_ref (holdToolbar);
- //g_object_ref (unholdButton);
+ g_object_ref (holdToolbar);
+ g_object_ref (offHoldToolbar);
g_object_ref (contactButton);
if (is_inserted (GTK_WIDGET(contactButton), GTK_WIDGET (toolbarWindows)))
@@ -246,9 +246,8 @@ void update_actions()
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (newCallWidget), 0);
// If addressbook support has been enabled and all addressbooks are loaded, display the icon
-
if (addressbook_is_enabled () && addressbook_is_ready()) {
- gtk_toolbar_insert (GTK_TOOLBAR (toolbarWindows), contactButton, 2);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbarWindows), GTK_TOOL_ITEM (contactButton), 2);
// Make the icon clickable only if at least one address book is active
if (addressbook_is_active ())
{
@@ -257,9 +256,9 @@ void update_actions()
}
}
- g_signal_handler_block ( (gpointer)transferToolbar, transfertButtonConnId);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
- g_signal_handler_unblock ( (gpointer)transferToolbar, transfertButtonConnId);
+ // g_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
+ // gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
+ // g_signal_handler_unblock ( GTK_OBJECT (transferToolbar), transfertButtonConnId);
callable_obj_t * selectedCall = calltab_get_selected_call(active_calltree);
conference_obj_t * selectedConf = calltab_get_selected_conf(active_calltree);
@@ -285,7 +284,7 @@ void update_actions()
gtk_widget_set_sensitive (GTK_WIDGET (offHoldToolbar), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (newCallWidget), TRUE);
// Replace the hold button with the off-hold button
- g_object_ref (holdToolbar);
+ //g_object_ref (holdToolbar);
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET(holdToolbar));
gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM (offHoldToolbar), 3);
break;
@@ -310,6 +309,9 @@ void update_actions()
gtk_widget_set_sensitive (GTK_WIDGET (transferToolbar), TRUE);
//gtk_action_set_sensitive( GTK_ACTION(newCallMenu),TRUE);
gtk_action_set_sensitive( GTK_ACTION (recordAction), TRUE);
+ gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
+ gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
break;
case CALL_STATE_BUSY:
case CALL_STATE_FAILURE:
@@ -317,7 +319,7 @@ void update_actions()
break;
case CALL_STATE_TRANSFERT:
gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON(transferToolbar), TRUE);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar), TRUE);
gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
gtk_action_set_sensitive (GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (holdMenu), TRUE);
@@ -366,7 +368,8 @@ void update_actions()
// gtk_action_set_sensitive( GTK_ACTION(newCallMenu), TRUE);
}
- //gtk_signal_handler_unblock (holdToolbar, holdConnId);
+ // gtk_signal_handler_unblock (holdToolbar, holdConnId);
+ // gtk_signal_handler_unblock (offHoldToolbar, holdConnId);
}
@@ -642,6 +645,7 @@ edit_copy ( void * foo UNUSED)
static void
edit_paste ( void * foo UNUSED)
{
+
GtkClipboard* clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
callable_obj_t * selectedCall = calltab_get_selected_call(current_calls);
gchar * no = gtk_clipboard_wait_for_text (clip);
@@ -747,13 +751,29 @@ static void calltree_switch_cb (GtkRadioAction *action, GtkRadioAction *current)
}
}
-
/**
* Transfert the line
*/
static void call_transfer_cb ()
{
- gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar))? sflphone_set_transfert() : sflphone_unset_transfert() ;
+ g_print ("call transfer cd !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+ gboolean active = gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar));
+ //g_print ("vsmb;dbfmd; bm: %i\n", active);
+ active ? sflphone_set_transfert() : sflphone_unset_transfert() ;
+ /*callable_obj_t * selectedCall = calltab_get_selected_call(current_calls);
+
+
+ if(selectedCall)
+ {
+ if(selectedCall->_state == CALL_STATE_TRANSFERT)
+ {
+ sflphone_unset_transfert ();
+ }
+ else
+ {
+ sflphone_set_transfert ();
+ }
+ }*/
}
static void call_mailbox_cb (void)
@@ -785,6 +805,8 @@ static const GtkActionEntry menu_entries[] = {
{ "NewCall", GTK_STOCK_DIAL, "_New call", "<control>N", "Place a new call", G_CALLBACK (call_new_call) },
{ "PickUp", GTK_STOCK_PICKUP, "_Pick up", NULL, "Answer the call", G_CALLBACK (call_pick_up) },
{ "HangUp", GTK_STOCK_HANGUP, "_Hang up", "<control>S", "Finish the call", G_CALLBACK (call_hang_up) },
+ { "OnHold", GTK_STOCK_ONHOLD, "O_n hold", "<control>P", "Place the call on hold", G_CALLBACK (call_hold) },
+ { "OffHold", GTK_STOCK_OFFHOLD, "O_ff hold", "<control>P", "Place the call off hold", G_CALLBACK (call_hold) },
{ "Record", GTK_STOCK_MEDIA_RECORD, "_Record", "<control>R", "Record the current conversation", G_CALLBACK (call_record) },
{ "AccountAssistant", NULL, "Configuration _Assistant", NULL, "Run the configuration assistant", G_CALLBACK (call_configuration_assistant) },
{ "Voicemail", "mail-message-new", "Voicemail", NULL, "Call your voicemail", G_CALLBACK (call_mailbox_cb) },
@@ -811,9 +833,7 @@ static const GtkActionEntry menu_entries[] = {
static const GtkToggleActionEntry toggle_menu_entries[] = {
- { "OnHold", GTK_STOCK_ONHOLD, "O_n hold", "<control>P", "Place the call on hold", G_CALLBACK (call_hold) },
- { "OffHold", GTK_STOCK_OFFHOLD, "O_ff hold", "<control>P", "Place the call off hold", G_CALLBACK (call_hold) },
- { "Transfer", GTK_STOCK_TRANSFER, "_Transfer", "<control>T", "Transfer the call", G_CALLBACK (call_transfer_cb) },
+ { "Transfer", GTK_STOCK_TRANSFER, "_Transfer", "<control>T", "Transfer the call", NULL }, //G_CALLBACK (call_transfer_cb) },
{ "Toolbar", NULL, "_Show toolbar", "<control>T", "Show the toolbar", NULL },
{ "Dialpad", NULL, "_Dialpad", "<control>D", "Show the dialpad", G_CALLBACK (dialpad_bar_cb) },
{ "VolumeControls",NULL, "_Volume controls", "<control>V", "Show the volume controls", G_CALLBACK (volume_bar_cb) }
@@ -1409,7 +1429,7 @@ GtkWidget* create_toolbar_actions (GtkUIManager *ui_manager)
// Set the handler ID for the transfer
transfertButtonConnId = g_signal_connect (G_OBJECT (transferToolbar), "toggled", G_CALLBACK (call_transfer_cb), NULL);
- holdConnId = g_signal_connect (G_OBJECT (holdToolbar), "toggled", G_CALLBACK (call_hold), NULL);
+ // holdConnId = g_signal_connect (G_OBJECT (holdToolbar), "toggled", G_CALLBACK (call_hold), NULL);
return toolbar;
}
diff --git a/sflphone-client-gnome/src/uimanager.h b/sflphone-client-gnome/src/uimanager.h
index 62c0e9d4928c775a0d4bd8642dbf6a1507e20330..4c33f55a2c9357823ff6c470bd454572ab95150a 100644
--- a/sflphone-client-gnome/src/uimanager.h
+++ b/sflphone-client-gnome/src/uimanager.h
@@ -34,6 +34,8 @@ GtkAction *volumeToggle;
gboolean uimanager_new (GtkUIManager**);
+static void show_edit_number ();
+
G_END_DECLS
#endif