kernelshark: Add warning dialogs

When a warning happens, show it with a dialog instead of printing
to the console.

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

5 files changed, 56 insertions, 0 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index a9e5137..ee47ff5 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -788,6 +788,8 @@ void kernel_shark(int argc, char **argv)
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         info->window = window;
 
+        trace_dialog_register_window(window);
+
         if (input_file)
                 update_title(window, input_file);
 
diff --git a/trace-dialog.c b/trace-dialog.c
index 4ed5b7b..c220a52 100644
--- a/trace-dialog.c
+++ b/trace-dialog.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <errno.h>
 #include <ctype.h>
 
 #include "trace-compat.h"
@@ -35,6 +36,8 @@ static GtkWidget *statusbar;
 static GtkWidget *statuspix;
 static GString *statusstr;
 
+static GtkWidget *parent_window;
+
 void pr_stat(char *fmt, ...)
 {
         GString *str;
@@ -62,6 +65,51 @@ void pr_stat(char *fmt, ...)
         g_string_free(str, TRUE);
 }
 
+/**
+ * trace_dialog_register_window - register window for warning dialogs
+ * @window: parent window to use for other dialogs
+ *
+ * The warning messages do not have a way to pass the window to
+ * the function, since these functions are also used by the command
+ * line interface. This allows an application to give the warning
+ * messages a window to use.
+ */
+void trace_dialog_register_window(GtkWidget *window)
+{
+        parent_window = window;
+}
+
+void warning(char *fmt, ...)
+{
+        GString *str;
+        va_list ap;
+
+        if (!parent_window) {
+                va_start(ap, fmt);
+                __vwarning(fmt, ap);
+                va_end(ap);
+                return;
+        }
+
+        str = g_string_new("");
+
+        va_start(ap, fmt);
+        g_string_vprintf(str, fmt, ap);
+        va_end(ap);
+
+        g_string_append(str, "\n");
+
+        if (errno)
+                g_string_prepend(str, strerror(errno));
+
+        errno = 0;
+
+        trace_dialog(GTK_WINDOW(parent_window), TRACE_GUI_WARNING,
+                     str->str);
+
+        g_string_free(str, TRUE);
+}
+
 static void
 status_display_clicked (gpointer data)
 {
diff --git a/trace-graph-main.c b/trace-graph-main.c
index 286e417..2ba9447 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -262,6 +262,8 @@ void trace_graph(int argc, char **argv)
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
+        trace_dialog_register_window(window);
+
         /* --- Top Level Vbox --- */
 
         vbox = gtk_vbox_new(FALSE, 0);
diff --git a/trace-gui.h b/trace-gui.h
index 59784c6..a2d261f 100644
--- a/trace-gui.h
+++ b/trace-gui.h
@@ -31,6 +31,8 @@ enum trace_dialog_type {
 
 GtkWidget *trace_status_bar_new(void);
 
+void trace_dialog_register_window(GtkWidget *window);
+
 void trace_show_help(GtkWidget *window, const gchar *link, GError **error);
 
 void trace_dialog(GtkWindow *parent, enum trace_dialog_type type,
diff --git a/trace-view-main.c b/trace-view-main.c
index bc7e4ee..8fa9aa6 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -479,6 +479,8 @@ void trace_view(int argc, char **argv)
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
+        trace_dialog_register_window(window);
+
         /* --- Top Level Vbox --- */
 
         vbox = gtk_vbox_new(FALSE, 0);