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

Simplify WNCK #ifdefs

Browse Source
This commit is contained in:
rim
2018-05-28 03:33:34 +03:00
committed by Landry Breuil
parent 6f9d95d1f5
commit 8d4f013877
1 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/task-manager.c
View File

@@ -73,13 +73,8 @@ G_DEFINE_TYPE (XtmTaskManager, xtm_task_manager, G_TYPE_OBJECT)
static void xtm_task_manager_finalize (GObject *object); static void xtm_task_manager_finalize (GObject *object);
static void setting_changed (GObject *object, GParamSpec *pspec, XtmTaskManager *manager); static void setting_changed (GObject *object, GParamSpec *pspec, XtmTaskManager *manager);
#ifdef HAVE_WNCK static void model_add_task (XtmTaskManager *manager, Task *task, glong timestamp);
static void model_add_task (GtkTreeModel *model, Task *task, App *app, glong timestamp); static void model_update_tree_iter (XtmTaskManager *manager, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task);
static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task, App *app);
#else
static void model_add_task (GtkTreeModel *model, Task *task, glong timestamp);
static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task);
#endif
static void model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp); static void model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp);
static void model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter); static void model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter);
static gboolean task_list_find_for_pid (GArray *task_list, guint pid, Task **task, guint *idx); static gboolean task_list_find_for_pid (GArray *task_list, guint pid, Task **task, guint *idx);
@@ -167,13 +162,10 @@ _xtm_task_manager_set_model (XtmTaskManager *manager, GtkTreeModel *model)
} }
static void static void
#ifdef HAVE_WNCK model_add_task (XtmTaskManager *manager, Task *task, glong timestamp)
model_add_task (GtkTreeModel *model, Task *task, App *app, glong timestamp)
#else
model_add_task (GtkTreeModel *model, Task *task, glong timestamp)
#endif
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = manager->model;
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@@ -185,11 +177,7 @@ model_add_task (GtkTreeModel *model, Task *task, glong timestamp)
XTM_PTV_COLUMN_FOREGROUND, NULL, XTM_PTV_COLUMN_FOREGROUND, NULL,
XTM_PTV_COLUMN_TIMESTAMP, timestamp, XTM_PTV_COLUMN_TIMESTAMP, timestamp,
-1); -1);
#ifdef HAVE_WNCK model_update_tree_iter (manager, &iter, timestamp, TRUE, task);
model_update_tree_iter (model, &iter, timestamp, TRUE, task, app);
#else
model_update_tree_iter (model, &iter, timestamp, TRUE, task);
#endif
} }
static void static void
@@ -211,18 +199,16 @@ model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter)
} }
static void static void
#ifdef HAVE_WNCK model_update_tree_iter (XtmTaskManager *manager, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task)
model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task, App *app)
#else
model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task)
#endif
{ {
GtkTreeModel *model = manager->model;
gchar *vsz, *rss, cpu[16]; gchar *vsz, *rss, cpu[16];
gchar value[14]; gchar value[14];
glong old_timestamp; glong old_timestamp;
gchar *old_state; gchar *old_state;
gchar *background, *foreground; gchar *background, *foreground;
#ifdef HAVE_WNCK #ifdef HAVE_WNCK
App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, task->pid);
GdkPixbuf *icon; GdkPixbuf *icon;
#endif #endif
@@ -409,9 +395,6 @@ xtm_task_manager_update_model (XtmTaskManager *manager)
GtkTreeIter iter; GtkTreeIter iter;
gboolean valid; gboolean valid;
glong timestamp; glong timestamp;
#ifdef HAVE_WNCK
App *app;
#endif
g_return_if_fail (XTM_IS_TASK_MANAGER (manager)); g_return_if_fail (XTM_IS_TASK_MANAGER (manager));
@@ -461,9 +444,6 @@ xtm_task_manager_update_model (XtmTaskManager *manager)
} }
/* Task alive, check for update. */ /* Task alive, check for update. */
#ifdef HAVE_WNCK
app = xtm_app_manager_get_app_from_pid (manager->app_manager, pid);
#endif
gboolean need_update = FALSE; gboolean need_update = FALSE;
gboolean update_cmd_line = FALSE; gboolean update_cmd_line = FALSE;
@@ -490,11 +470,7 @@ xtm_task_manager_update_model (XtmTaskManager *manager)
if (need_update) if (need_update)
{ {
#ifdef HAVE_WNCK model_update_tree_iter (manager, &cur_iter, timestamp, update_cmd_line, task);
model_update_tree_iter (manager->model, &cur_iter, timestamp, update_cmd_line, task_new, app);
#else
model_update_tree_iter (manager->model, &cur_iter, timestamp, update_cmd_line, task_new);
#endif
} }
} }
@@ -505,12 +481,7 @@ xtm_task_manager_update_model (XtmTaskManager *manager)
if (task_list_find_for_pid (manager->tasks, tasktmp->pid, NULL, NULL)) if (task_list_find_for_pid (manager->tasks, tasktmp->pid, NULL, NULL))
continue; continue;
#ifdef HAVE_WNCK model_add_task (manager, tasktmp, timestamp);
app = xtm_app_manager_get_app_from_pid (manager->app_manager, tasktmp->pid);
model_add_task (manager->model, tasktmp, app, timestamp);
#else
model_add_task (manager->model, tasktmp, timestamp);
#endif
/* XXX: add bininsert() here. */ /* XXX: add bininsert() here. */
g_array_append_val (manager->tasks, *tasktmp); g_array_append_val (manager->tasks, *tasktmp);
g_array_sort (manager->tasks, task_pid_compare_fn); g_array_sort (manager->tasks, task_pid_compare_fn);