1 files changed, 28 insertions, 63 deletions

diff --git a/trace-filter.c b/trace-filter.c
index 2c6022d..009d92d 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -760,13 +760,6 @@ void trace_adv_filter_dialog(struct tracecmd_input *handle,
 
 /* --- task list dialog --- */
 
-struct task_helper {
-        trace_task_cb_func              func;
-        GtkTreeView                     *view;
-        gboolean                        start;
-        gpointer                        data;
-};
-
 enum {
         TASK_COL_SELECT,
         TASK_COL_PID,
@@ -813,35 +806,6 @@ static void get_tasks(GtkTreeView *treeview,
         *non_selected = non_pids;
 }
 
-/* Callback for the clicked signal of the task filter button */
-static void
-task_dialog_response (gpointer data, gint response_id)
-{
-        struct dialog_helper *helper = data;
-        struct task_helper *event_helper = helper->data;
-        gint *selected;
-        gint *non_select;
-
-        switch (response_id) {
-        case GTK_RESPONSE_ACCEPT:
-                get_tasks(event_helper->view, &selected, &non_select);
-                event_helper->func(TRUE, selected, non_select, event_helper->data);
-                free(selected);
-                free(non_select);
-                break;
-        case GTK_RESPONSE_REJECT:
-                event_helper->func(FALSE, NULL, NULL, event_helper->data);
-                break;
-        default:
-                break;
-        };
-
-        gtk_widget_destroy(GTK_WIDGET(helper->dialog));
-
-        g_free(event_helper);
-        g_free(helper);
-}
-
 static GtkTreeModel *
 create_task_model(struct tracecmd_input *handle,
                   gint *tasks,
@@ -923,14 +887,14 @@ create_task_model(struct tracecmd_input *handle,
 
 static void task_cursor_changed(gpointer data, GtkTreeView *treeview)
 {
-        struct task_helper *event_helper = data;
+        gboolean *start = data;
         GtkTreeModel *model;
         GtkTreePath *path;
         GtkTreeIter iter;
         gboolean active;
 
-        if (!event_helper->start) {
-                event_helper->start = TRUE;
+        if (!*start) {
+                *start = TRUE;
                 return;
         }
 
@@ -962,7 +926,7 @@ static void task_cursor_changed(gpointer data, GtkTreeView *treeview)
 static GtkWidget *
 create_task_view(struct tracecmd_input *handle,
                  gint *tasks, gint *selected,
-                 struct task_helper *event_helper)
+                 gboolean *start)
 {
         GtkTreeViewColumn *col;
         GtkCellRenderer *renderer;
@@ -1024,7 +988,7 @@ create_task_view(struct tracecmd_input *handle,
 
         g_signal_connect_swapped (view, "cursor-changed",
                                   G_CALLBACK (task_cursor_changed),
-                                  (gpointer) event_helper);
+                                  (gpointer)start);
 
         return view;
 }
@@ -1043,14 +1007,12 @@ void trace_task_dialog(struct tracecmd_input *handle,
                        trace_task_cb_func func,
                        gpointer data)
 {
-        struct dialog_helper *helper;
-        struct task_helper *event_helper;
         GtkWidget *dialog;
         GtkWidget *scrollwin;
         GtkWidget *view;
-
-        helper = g_malloc(sizeof(*helper));
-        g_assert(helper);
+        gboolean start = FALSE;
+        gint *non_select;
+        int result;
 
         /* --- Make dialog window --- */
 
@@ -1063,27 +1025,11 @@ void trace_task_dialog(struct tracecmd_input *handle,
                                              GTK_RESPONSE_REJECT,
                                              NULL);
 
-        event_helper = g_new0(typeof(*event_helper), 1);
-        g_assert(event_helper);
-
-        helper->dialog = dialog;
-        helper->data = event_helper;
-
-        event_helper->func = func;
-        event_helper->data = data;
-        event_helper->start = FALSE;
-
-        /* We can attach the Quit menu item to our exit function */
-        g_signal_connect_swapped (dialog, "response",
-                                  G_CALLBACK (task_dialog_response),
-                                  (gpointer) helper);
-
         scrollwin = gtk_scrolled_window_new(NULL, NULL);
         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
-        view = create_task_view(handle, tasks, selected, event_helper);
-        event_helper->view = GTK_TREE_VIEW(view);
+        view = create_task_view(handle, tasks, selected, &start);
         gtk_container_add(GTK_CONTAINER(scrollwin), view);
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrollwin, TRUE, TRUE, 0);
 
@@ -1091,6 +1037,25 @@ void trace_task_dialog(struct tracecmd_input *handle,
                                     DIALOG_WIDTH, DIALOG_HEIGHT);
 
         gtk_widget_show_all(dialog);
+
+        selected = NULL;
+
+        result = gtk_dialog_run(GTK_DIALOG(dialog));
+        switch (result) {
+        case GTK_RESPONSE_ACCEPT:
+                get_tasks(GTK_TREE_VIEW(view), &selected, &non_select);
+                func(TRUE, selected, non_select, data);
+                free(selected);
+                free(non_select);
+                break;
+        case GTK_RESPONSE_REJECT:
+                func(FALSE, NULL, NULL, data);
+                break;
+        default:
+                break;
+        };
+
+        gtk_widget_destroy(dialog);
 }
 
 enum {