kernelshark: Created trace_get_file_dialog() to ask for filename

Added shortcut trace_get_file_dialog() to simplify the asking for
a file name.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

5 files changed, 56 insertions, 55 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 58aa860..d913ae0 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -141,28 +141,21 @@ load_clicked (gpointer data)
 {
         struct shark_info *info = data;
         struct tracecmd_input *handle;
-        GtkWidget *dialog;
         gchar *filename;
 
-        dialog = gtk_file_chooser_dialog_new("Load File",
-                                             NULL,
-                                             GTK_FILE_CHOOSER_ACTION_OPEN,
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                             NULL);
-        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-                handle = tracecmd_open(filename);
-                if (handle) {
-                        tracecmd_close(info->handle);
-                        info->handle = handle;
-                        trace_graph_load_handle(info->ginfo, handle);
-                        trace_view_reload(info->treeview, handle, info->spin);
-                        update_title(info->window, filename);
-                }
-                g_free(filename);
+        filename = trace_get_file_dialog("Load File");
+        if (!filename)
+                return;
+
+        handle = tracecmd_open(filename);
+        if (handle) {
+                tracecmd_close(info->handle);
+                info->handle = handle;
+                trace_graph_load_handle(info->ginfo, handle);
+                trace_view_reload(info->treeview, handle, info->spin);
+                update_title(info->window, filename);
         }
-        gtk_widget_destroy(dialog);
+        g_free(filename);
 }
 
 /* Callback for the clicked signal of the Exit button */
@@ -763,12 +756,11 @@ void kernel_shark(int argc, char **argv)
 
         /* --- File - Load Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("Load info");
+        sub_item = gtk_menu_item_new_with_label("Load data");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
-        /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
                                   G_CALLBACK (load_clicked),
                                   (gpointer) info);
diff --git a/trace-dialog.c b/trace-dialog.c
index 65d184d..e27245d 100644
--- a/trace-dialog.c
+++ b/trace-dialog.c
@@ -77,3 +77,22 @@ void trace_dialog(GtkWindow *parent, enum trace_dialog_type type,
         gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
 }
+
+gchar *trace_get_file_dialog(const gchar *title)
+{
+        GtkWidget *dialog;
+        gchar *filename = NULL;
+
+        dialog = gtk_file_chooser_dialog_new(title,
+                                             NULL,
+                                             GTK_FILE_CHOOSER_ACTION_OPEN,
+                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                             NULL);
+        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
+                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+        gtk_widget_destroy(dialog);
+
+        return filename;
+}
diff --git a/trace-graph-main.c b/trace-graph-main.c
index b373dd2..303f342 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -29,6 +29,7 @@
 #include "trace-cmd.h"
 #include "trace-graph.h"
 #include "trace-filter.h"
+#include "trace-gui.h"
 
 #define version "0.1.1"
 
@@ -52,26 +53,19 @@ load_clicked (gpointer data)
 {
         struct graph_info *ginfo = data;
         struct tracecmd_input *handle;
-        GtkWidget *dialog;
         gchar *filename;
 
-        dialog = gtk_file_chooser_dialog_new("Load File",
-                                             NULL,
-                                             GTK_FILE_CHOOSER_ACTION_OPEN,
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                             NULL);
-        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-                handle = tracecmd_open(filename);
-                if (handle) {
-                        trace_graph_load_handle(ginfo, handle);
-                        /* Free handle when freeing graph */
-                        tracecmd_close(handle);
-                }
-                g_free(filename);
+        filename = trace_get_file_dialog("Load File");
+        if (!filename)
+                return;
+
+        handle = tracecmd_open(filename);
+        if (handle) {
+                trace_graph_load_handle(ginfo, handle);
+                /* Free handle when freeing graph */
+                tracecmd_close(handle);
         }
-        gtk_widget_destroy(dialog);
+        g_free(filename);
 }
 
 /* Callback for the clicked signal of the Exit button */
diff --git a/trace-gui.h b/trace-gui.h
index 97b8e41..55778bf 100644
--- a/trace-gui.h
+++ b/trace-gui.h
@@ -34,5 +34,7 @@ void trace_show_help(GtkWidget *window, const gchar *link, GError **error);
 void trace_dialog(GtkWindow *parent, enum trace_dialog_type type,
                   gchar *message, ...);
 
+gchar *trace_get_file_dialog(const gchar *title);
+
 
 #endif /* _TRACE_GUI */
diff --git a/trace-view-main.c b/trace-view-main.c
index 52678ce..7f1461b 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -28,6 +28,7 @@
 
 #include "trace-cmd.h"
 #include "trace-view.h"
+#include "trace-gui.h"
 
 #define version "0.1.1"
 
@@ -55,26 +56,19 @@ load_clicked (gpointer data)
 {
         struct trace_tree_info *info = data;
         struct tracecmd_input *handle;
-        GtkWidget *dialog;
         gchar *filename;
 
-        dialog = gtk_file_chooser_dialog_new("Load File",
-                                             NULL,
-                                             GTK_FILE_CHOOSER_ACTION_OPEN,
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                             NULL);
-        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-                handle = tracecmd_open(filename);
-                if (handle) {
-                        trace_view_reload(info->trace_tree, handle, info->spin);
-                        /* Free handle when freeing the trace tree */
-                        tracecmd_close(handle);
-                }
-                g_free(filename);
+        filename = trace_get_file_dialog("Load File");
+        if (!filename)
+                return;
+
+        handle = tracecmd_open(filename);
+        if (handle) {
+                trace_view_reload(info->trace_tree, handle, info->spin);
+                /* Free handle when freeing the trace tree */
+                tracecmd_close(handle);
         }
-        gtk_widget_destroy(dialog);
+        g_free(filename);
 }
 
 /* Callback for the clicked signal of the Exit button */