Remove duplicate header inclusion.

[pspp] / src / ui / gui / message-dialog.c

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index c9ca4a1c57099cbe0ca8881f70347b4769de529d..cf1fb851c9af322a77b77b8b0d4dcda57c50cb1a 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #include <libpspp/message.h>
 #include "message-dialog.h"
+#include "progname.h"
 
 
 #include <gtk/gtk.h>
@@ -37,62 +38,50 @@ extern GladeXML *xml;
 
 #define _(A) A
 
+static void handle_msg(const struct msg *);
 
-void 
-vmsg(int klass, const char *fmt, va_list args)
+void
+message_dialog_init (void) 
+{
+  msg_init(handle_msg);
+}
+
+static void
+handle_msg(const struct msg *m)
 {
-  gchar *msg = 0;
-  gchar *text = g_strdup_vprintf (fmt, args);
+  GtkWindow *parent;
+  GtkWidget *dialog;
 
-  GtkWindow *parent ;
-  GtkWidget *dialog ;
-                   
   gint message_type;
+  const char *msg;
 
-  switch (klass)
+  switch (m->severity)
     {
-    case SE:
-    case IE:
-    case DE:
-    case ME:
+    case MSG_ERROR:
       message_type = GTK_MESSAGE_ERROR;
       break;
-    case SW:
-    case DW:
-    case MW:
+    case MSG_WARNING:
       message_type = GTK_MESSAGE_WARNING;
       break;
-    case SM:
-    case IS:
-    case MM:
+    case MSG_NOTE:
     default:
       message_type = GTK_MESSAGE_INFO;
       break;
     };
   
-  switch (klass) 
+  switch (m->category) 
     {
-    case SE:
-    case SW:
-    case SM:
-      msg = g_strdup(_("Script Error"));
+    case MSG_SYNTAX:
+      msg = _("Script Error");
       break;
 
-    case IE:
-    case IS:
-      msg = g_strdup(_("Installation Error"));
+    case MSG_DATA:
+      msg = _("Data File Error");
       break;
 
-    case DE:
-    case DW:
-      msg = g_strdup(_("Data File Error"));
-      break;
-
-    case ME:
-    case MW:
-    case MM:
+    case MSG_GENERAL:
     default:
-      msg = g_strdup(_("PSPP Error"));
+      msg = _("PSPP Error");
       break;
     };
   
@@ -104,66 +93,23 @@ vmsg(int klass, const char *fmt, va_list args)
                                  GTK_BUTTONS_CLOSE,
                                  msg);
   
-  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
-
-  g_free(text);
-  g_free(msg);
+  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+                                           "%s", m->text);
     
   gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
 
   gtk_dialog_run(GTK_DIALOG(dialog));
 
   gtk_widget_destroy (dialog);
-
-}
-
-
-void 
-msg(int klass, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  vmsg(klass, fmt, ap);
-  va_end(ap);
-}
-
-
-void
-err_vmsg (const struct error *e, const char *format, va_list args)
-{
-  vmsg(e->class, format, args);
-}
-
-
-void 
-err_assert_fail(const char *expr, const char *file, int line)
-{
-  msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
 }
 
-/* The GUI is always interactive.
-   So this function does nothing */
-void 
-err_cond_fail(void)
-{
-}
-
-
-void
-err_failure(void)
-{
-  msg(ME, _("Terminating NOW due to fatal error"));
-  gtk_main_quit();
-}
-
-
 /* FIXME: This is a stub .
  * A temporary workaround until getl.c is rearranged
  */
 void
-err_location (struct file_locator *f)
+msg_location (struct msg_locator *loc)
 {
-       f->filename = 0;
-       f->line_number = -1;
+       loc->file_name = 0;
+       loc->line_number = -1;
 }