From f3e117055de5d84b090da3ec771d8ca3ce49c289 Mon Sep 17 00:00:00 2001 From: rim Date: Mon, 28 May 2018 02:26:41 +0300 Subject: [PATCH] compact WNCK code --- src/task-manager.c | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/src/task-manager.c b/src/task-manager.c index df9bbc8..a8c3e66 100644 --- a/src/task-manager.c +++ b/src/task-manager.c @@ -70,13 +70,8 @@ G_DEFINE_TYPE (XtmTaskManager, xtm_task_manager, G_TYPE_OBJECT) static void xtm_task_manager_finalize (GObject *object); static void setting_changed (GObject *object, GParamSpec *pspec, XtmTaskManager *manager); -#ifdef HAVE_WNCK -static void model_add_task (GtkTreeModel *model, Task *task, App *app, glong timestamp); -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_add_task (XtmTaskManager *manager, Task *task, glong timestamp); +static void model_update_tree_iter (XtmTaskManager *manager, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task); 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 gboolean task_list_find_for_pid (GArray *task_list, gint pid, Task **task, guint *idx); @@ -160,13 +155,10 @@ _xtm_task_manager_set_model (XtmTaskManager *manager, GtkTreeModel *model) } static void -#ifdef HAVE_WNCK -model_add_task (GtkTreeModel *model, Task *task, App *app, glong timestamp) -#else -model_add_task (GtkTreeModel *model, Task *task, glong timestamp) -#endif +model_add_task (XtmTaskManager *manager, Task *task, glong timestamp) { GtkTreeIter iter; + GtkTreeModel *model = manager->model; gchar *uid_name = get_uid_name (task->uid); gtk_list_store_append (GTK_LIST_STORE (model), &iter); @@ -178,11 +170,7 @@ model_add_task (GtkTreeModel *model, Task *task, glong timestamp) XTM_PTV_COLUMN_TIMESTAMP, timestamp, -1); g_free(uid_name); -#ifdef HAVE_WNCK - model_update_tree_iter (model, &iter, timestamp, TRUE, task, app); -#else - model_update_tree_iter (model, &iter, timestamp, TRUE, task); -#endif + model_update_tree_iter (manager, &iter, timestamp, TRUE, task); } static void @@ -204,18 +192,16 @@ model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter) } static void -#ifdef HAVE_WNCK -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 +model_update_tree_iter (XtmTaskManager *manager, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task) { + GtkTreeModel *model = manager->model; gchar *vsz, *rss, cpu[16]; gchar value[14]; glong old_timestamp; gchar *old_state; gchar *background, *foreground; #ifdef HAVE_WNCK + App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, task->pid); GdkPixbuf *icon; #endif @@ -409,10 +395,10 @@ xtm_task_manager_update_model (XtmTaskManager *manager) Task *task, *task_new; GtkTreeIter cur_iter = iter; - gtk_tree_model_get (manager->model, &iter, XTM_PTV_COLUMN_CPU_STR, &cpu_str, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, XTM_PTV_COLUMN_PID, &pid, -1); + valid = gtk_tree_model_iter_next (manager->model, &iter); + gtk_tree_model_get (manager->model, &cur_iter, XTM_PTV_COLUMN_CPU_STR, &cpu_str, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, XTM_PTV_COLUMN_PID, &pid, -1); found = (g_strcmp0 (cpu_str, "-") == 0); g_free (cpu_str); - valid = gtk_tree_model_iter_next (manager->model, &iter); if (found && (timestamp - old_timestamp) > TIMESTAMP_DELTA) { G_DEBUG_FMT ("Remove old task %d", pid); @@ -437,9 +423,6 @@ xtm_task_manager_update_model (XtmTaskManager *manager) } /* Task alive, check for update. */ -#ifdef HAVE_WNCK - App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, pid); -#endif gboolean need_update = FALSE; gboolean update_cmd_line = FALSE; @@ -466,11 +449,7 @@ xtm_task_manager_update_model (XtmTaskManager *manager) if (need_update) { -#ifdef HAVE_WNCK - 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 + model_update_tree_iter (manager, &cur_iter, timestamp, update_cmd_line, task); } } @@ -481,12 +460,7 @@ xtm_task_manager_update_model (XtmTaskManager *manager) if (task_list_find_for_pid (manager->tasks, tasktmp->pid, NULL, NULL)) continue; -#ifdef HAVE_WNCK - App *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 + model_add_task (manager, tasktmp, timestamp); /* XXX: add bininsert() here. */ g_array_append_val (manager->tasks, *tasktmp); g_array_sort (manager->tasks, task_pid_compare_fn); -- libgit2 0.27.0