From e0fba86b8d1727b71ab3ca0059d028b7f4c82777 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 11 May 2012 15:15:14 -0400
Subject: [PATCH] * #10736: calltree: remove some global vars
---
gnome/src/contacts/calltree.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index e429d924ce..743aefdf51 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -55,10 +55,6 @@
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;
@@ -448,7 +444,8 @@ calltree_create(calltab_t* tab, int searchbar_type)
gtk_container_set_border_width(GTK_CONTAINER(tab->tree), 0);
- calltree_sw = gtk_scrolled_window_new(NULL, NULL);
+ GtkWidget *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);
@@ -515,7 +512,7 @@ calltree_create(calltab_t* tab, int searchbar_type)
gtk_widget_grab_focus(GTK_WIDGET(tab->view));
- calltree_rend = gtk_cell_renderer_pixbuf_new();
+ GtkCellRenderer *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();
@@ -546,7 +543,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);
- calltree_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view));
+ GtkTreeSelection *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