Added the ability to run syntax from the syntax editor.

[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..8b910ce242a093d74fa4451c4f50c372b1688ce7 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -1,7 +1,6 @@
 /* 
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004,2005  Free Software Foundation
-   Written by John Darrington
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,7 +23,12 @@
 #include <stdarg.h>
 
 #include <config.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 #include <libpspp/message.h>
+#include <libpspp/msg-locator.h>
 #include "message-dialog.h"
 #include "progname.h"
 
@@ -37,22 +41,21 @@
 
 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;
 
+
 void
-message_dialog_init (void) 
+message_dialog_init (struct source_stream *ss) 
 {
   message_queue = g_queue_new();
-  msg_init(enqueue_msg);
+  msg_init (ss, enqueue_msg);
 }
 
-
 void
 message_dialog_done (void)
 {
@@ -76,7 +79,7 @@ dequeue_message(gpointer data)
 
   if ( m ) 
     {
-      handle_msg(m);
+      popup_message(m);
       msg_destroy(m);
       return TRUE;
     }
@@ -94,8 +97,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;
@@ -132,7 +136,7 @@ handle_msg(const struct msg *m)
       msg = _("PSPP Error");
       break;
     };
-  
+
   parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
 
   dialog = gtk_message_dialog_new(parent,
@@ -140,10 +144,13 @@ handle_msg(const struct msg *m)
                                  message_type,
                                  GTK_BUTTONS_CLOSE,
                                  msg);
-  
+
   gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-                                           "%s", m->text);
-    
+                                           _("%s (line %d) %s"),
+                                          m->where.file_name,
+                                          m->where.line_number,
+                                          m->text);
+
   gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
 
   gtk_dialog_run(GTK_DIALOG(dialog));
@@ -151,13 +158,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;
-}
-