[Xfce4-commits] <xfce4-taskmanager:master> Fix previous commit: use existing callback settings_changed

[Mike Massonnet]

Updating branch refs/heads/master
         to 103189819cee117e0cbd086ee9b28b49618be06f (commit)
       from 52b85d4d664ef3946fff9bbbfa1afba1ec912310 (commit)

commit 103189819cee117e0cbd086ee9b28b49618be06f
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Oct 4 20:41:05 2010 +0200

    Fix previous commit: use existing callback settings_changed
    
    Drop cb_show_application_icons_toggled and move the code inside
    the existing callback settings_changed.

 src/process-tree-view.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/process-tree-view.c b/src/process-tree-view.c
index 3f50c06..2fb917a 100644
--- a/src/process-tree-view.c
+++ b/src/process-tree-view.c
@@ -61,7 +61,6 @@ static void		xtm_process_tree_view_finalize			(GObject *object);
 static gboolean		treeview_clicked				(XtmProcessTreeView *treeview, GdkEventButton *event);
 static gboolean		treeview_key_pressed				(XtmProcessTreeView *treeview, GdkEventKey *event);
 static void		column_task_pack_cells				(XtmProcessTreeView *treeview, GtkTreeViewColumn *column);
-static void		cb_show_application_icons_toggled		(XtmProcessTreeView *treeview);
 static void		columns_changed					(XtmProcessTreeView *treeview);
 static void		read_columns_positions				(XtmProcessTreeView *treeview);
 static void		save_columns_positions				(XtmProcessTreeView *treeview);
@@ -216,7 +215,6 @@ xtm_process_tree_view_init (XtmProcessTreeView *treeview)
 	g_signal_connect (treeview, "columns-changed", G_CALLBACK (columns_changed), NULL);
 	g_signal_connect (treeview, "button-press-event", G_CALLBACK (treeview_clicked), NULL);
 	g_signal_connect (treeview, "key-press-event", G_CALLBACK (treeview_key_pressed), NULL);
-	g_signal_connect_swapped (treeview->settings, "notify::show-application-icons", G_CALLBACK (cb_show_application_icons_toggled), treeview);
 }
 
 static void
@@ -271,15 +269,6 @@ column_task_pack_cells (XtmProcessTreeView *treeview, GtkTreeViewColumn *column)
 }
 
 static void
-cb_show_application_icons_toggled (XtmProcessTreeView *treeview)
-{
-	GtkTreeViewColumn *column;
-	column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), treeview->columns_positions[COLUMN_COMMAND]);
-	gtk_tree_view_column_clear (column);
-	column_task_pack_cells (treeview, column);
-}
-
-static void
 columns_changed (XtmProcessTreeView *treeview)
 {
 	GList *columns, *l;
@@ -650,6 +639,13 @@ settings_changed (GObject *object, GParamSpec *pspec, XtmProcessTreeView *treevi
 		g_object_get (object, pspec->name, &visible, NULL);
 		gtk_tree_view_column_set_visible (gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), treeview->columns_positions[column_id]), visible);
 	}
+	else if (!g_strcmp0 (pspec->name, "show-application-icons"))
+	{
+		GtkTreeViewColumn *column;
+		column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), treeview->columns_positions[COLUMN_COMMAND]);
+		gtk_tree_view_column_clear (column);
+		column_task_pack_cells (treeview, column);
+	}
 	else if (!g_strcmp0 (pspec->name, "show-all-processes"))
 	{
 		g_object_get (object, pspec->name, &treeview->show_all_processes_cached, NULL);