FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous commit: use existing callback settings_changed

Browse Source 
Drop cb_show_application_icons_toggled and move the code inside
the existing callback settings_changed.
This commit is contained in:
Mike Massonnet
2010-10-04 20:41:05 +02:00
parent 52b85d4d66
commit 103189819c
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/process-tree-view.c
View File

@@ -61,7 +61,6 @@ static void xtm_process_tree_view_finalize (GObject *object);
static gboolean treeview_clicked (XtmProcessTreeView *treeview, GdkEventButton *event); static gboolean treeview_clicked (XtmProcessTreeView *treeview, GdkEventButton *event);
static gboolean treeview_key_pressed (XtmProcessTreeView *treeview, GdkEventKey *event); static gboolean treeview_key_pressed (XtmProcessTreeView *treeview, GdkEventKey *event);
static void column_task_pack_cells (XtmProcessTreeView *treeview, GtkTreeViewColumn *column); 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 columns_changed (XtmProcessTreeView *treeview);
static void read_columns_positions (XtmProcessTreeView *treeview); static void read_columns_positions (XtmProcessTreeView *treeview);
static void save_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, "columns-changed", G_CALLBACK (columns_changed), NULL);
g_signal_connect (treeview, "button-press-event", G_CALLBACK (treeview_clicked), 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 (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 static void
@@ -270,15 +268,6 @@ column_task_pack_cells (XtmProcessTreeView *treeview, GtkTreeViewColumn *column)
gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, "text", XTM_PTV_COLUMN_COMMAND, "cell-background", XTM_PTV_COLUMN_BACKGROUND, "foreground", XTM_PTV_COLUMN_FOREGROUND, NULL); gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, "text", XTM_PTV_COLUMN_COMMAND, "cell-background", XTM_PTV_COLUMN_BACKGROUND, "foreground", XTM_PTV_COLUMN_FOREGROUND, NULL);
} }
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 static void
columns_changed (XtmProcessTreeView *treeview) columns_changed (XtmProcessTreeView *treeview)
{ {
@@ -650,6 +639,13 @@ settings_changed (GObject *object, GParamSpec *pspec, XtmProcessTreeView *treevi
g_object_get (object, pspec->name, &visible, NULL); 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); 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")) else if (!g_strcmp0 (pspec->name, "show-all-processes"))
{ {
g_object_get (object, pspec->name, &treeview->show_all_processes_cached, NULL); g_object_get (object, pspec->name, &treeview->show_all_processes_cached, NULL);