From 284e296192243f62aa3d144bede7d6c84123cddf Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 11 May 2012 15:13:29 -0400
Subject: [PATCH] Revert "* #10736: calltree: remove some global vars"
This reverts commit 4ad2232c5c9faa18edc0db3bd0ffae77702b87a3.
---
gnome/src/contacts/calltree.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index ededcd83de..e429d924ce 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -55,6 +55,11 @@
static const gchar * const SFL_CREATE_CONFERENCE = "Create conference";
static const gchar * const SFL_TRANSFER_CALL = "Transfer call to";
+static GtkWidget *calltree_sw = NULL;
+static GtkCellRenderer *calltree_rend = NULL;
+static GtkTreeSelection *calltree_sel = NULL;
+
+static GtkWidget *calltree_popupmenu = NULL;
static GtkWidget *calltree_menu_items = NULL;
static CallType calltree_dest_type = A_INVALID;
@@ -65,6 +70,7 @@ static gchar *calltree_source_call_id = NULL;
static gchar *calltree_source_call_id_for_drag = NULL;
static gchar *calltree_dest_path = NULL;
static gchar *calltree_source_path = NULL;
+static gchar *calltree_source_path_for_drag = NULL;
static gint calltree_dest_path_depth = -1;
static gint calltree_source_path_depth = -1;
@@ -442,7 +448,7 @@ calltree_create(calltab_t* tab, int searchbar_type)
gtk_container_set_border_width(GTK_CONTAINER(tab->tree), 0);
- GtkWidget *calltree_sw = gtk_scrolled_window_new(NULL, NULL);
+ calltree_sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(calltree_sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(calltree_sw), GTK_SHADOW_IN);
@@ -509,7 +515,7 @@ calltree_create(calltab_t* tab, int searchbar_type)
gtk_widget_grab_focus(GTK_WIDGET(tab->view));
- GtkCellRenderer *calltree_rend = gtk_cell_renderer_pixbuf_new();
+ calltree_rend = gtk_cell_renderer_pixbuf_new();
GtkTreeViewColumn *calltree_col = gtk_tree_view_column_new_with_attributes("Icon", calltree_rend, "pixbuf", COLUMN_ACCOUNT_PIXBUF, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tab->view), calltree_col);
calltree_rend = gtk_cell_renderer_text_new();
@@ -540,7 +546,7 @@ calltree_create(calltab_t* tab, int searchbar_type)
g_object_unref(G_OBJECT(tab->store));
gtk_container_add(GTK_CONTAINER(calltree_sw), tab->view);
- GtkTreeSelection *calltree_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view));
+ calltree_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view));
g_signal_connect(G_OBJECT(calltree_sel), "changed",
G_CALLBACK(call_selected_cb),
NULL);
--
GitLab