Encapsulated msg_location inside msg_emit

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

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index e5b2756290ab0cc66533eb4d30d02ec535d006da..af1886c98a7f619fdd5706259ebf21d4548dcb48 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -24,6 +24,10 @@
 #include <stdarg.h>
 
 #include <config.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 #include <libpspp/message.h>
 #include "message-dialog.h"
 #include "progname.h"
@@ -37,19 +41,27 @@
 
 extern GladeXML *xml;
 
-#define _(A) A
 
-static void handle_msg(const struct msg *);
-static void enqueue_msg(const struct msg *m);
+
+static void enqueue_msg (const struct msg *m);
 
 
 static GQueue *message_queue;
 
+
+static void 
+msg_location (struct msg_locator *loc)
+{
+  loc->file_name = NULL; 
+  loc->line_number = -1;
+}
+
+
 void
 message_dialog_init (void) 
 {
   message_queue = g_queue_new();
-  msg_init(enqueue_msg);
+  msg_init (enqueue_msg, msg_location);
 }
 
 
@@ -76,7 +88,7 @@ dequeue_message(gpointer data)
 
   if ( m ) 
     {
-      handle_msg(m);
+      popup_message(m);
       msg_destroy(m);
       return TRUE;
     }
@@ -94,8 +106,9 @@ enqueue_msg(const struct msg *msg)
   g_idle_add(dequeue_message, 0);
 }
 
-static void
-handle_msg(const struct msg *m)
+
+void 
+popup_message(const struct msg *m)
 {
   GtkWindow *parent;
   GtkWidget *dialog;
@@ -151,13 +164,3 @@ handle_msg(const struct msg *m)
   gtk_widget_destroy (dialog);
 }
 
-/* FIXME: This is a stub .
- * A temporary workaround until getl.c is rearranged
- */
-void
-msg_location (struct msg_locator *loc)
-{
-       loc->file_name = 0;
-       loc->line_number = -1;
-}
-