From 1dae8652d8c8114d704f9555a4ea4144a87bc542 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Tue, 15 May 2012 09:53:52 -0400
Subject: [PATCH] #10736: no need of a different received callback for history
entries
---
gnome/src/contacts/calltree.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index 677b567ba7..02b7a0eb27 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -71,7 +71,6 @@ static callable_obj_t *calltree_source_call = NULL;
static conference_obj_t *calltree_source_conf = NULL;
static void drag_data_received_cb(GtkWidget *, GdkDragContext *, gint, gint, GtkSelectionData *, guint, guint, gpointer);
-static void drag_history_received_cb(GtkWidget *, GdkDragContext *, gint, gint, GtkSelectionData *, guint, guint, gpointer);
static void menuitem_response(gchar * string);
static GtkTargetEntry target_list[] = {
@@ -442,8 +441,6 @@ calltree_create(calltab_t* tab, int searchbar_type)
NULL);
if (g_strcmp0(tab->_name, CURRENT_CALLS) == 0) {
- // Make calltree reordable for drag n drop
- //gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tab->view), TRUE);
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tab->view), GDK_BUTTON1_MASK, target_list, n_targets, GDK_ACTION_DEFAULT | GDK_ACTION_MOVE);
gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tab->view), target_list, n_targets, GDK_ACTION_DEFAULT);
@@ -463,9 +460,6 @@ calltree_create(calltab_t* tab, int searchbar_type)
G_CALLBACK(menuitem_response), g_strdup(SFL_CREATE_CONFERENCE));
gtk_menu_shell_append(GTK_MENU_SHELL(calltree_popupmenu), calltree_menu_items);
gtk_widget_show(calltree_menu_items);
- } else if (tab == history_tab) {
- gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tab->view), TRUE);
- g_signal_connect(G_OBJECT(tab->view), "drag_data_received", G_CALLBACK(drag_history_received_cb), NULL);
}
gtk_widget_grab_focus(GTK_WIDGET(tab->view));
@@ -1162,12 +1156,6 @@ gboolean calltree_update_clock(gpointer data UNUSED)
return TRUE;
}
-
-void drag_history_received_cb(GtkWidget *widget, GdkDragContext *context UNUSED, gint x UNUSED, gint y UNUSED, GtkSelectionData *selection_data UNUSED, guint info UNUSED, guint t UNUSED, gpointer data UNUSED)
-{
- g_signal_stop_emission_by_name(G_OBJECT(widget), "drag_data_received");
-}
-
static void cleanup_popup_data(PopupData **data)
{
if (data && *data) {
--
GitLab