X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=8b910ce242a093d74fa4451c4f50c372b1688ce7;hb=8935214a9803aeddf7048a40a491721cfca8a86f;hp=840e1e2adc0c71107b62101d8b129e1c3a881c1c;hpb=b3cd77d4190ad01f3297eb82ffb5053c536a427a;p=pspp-builds.git

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 840e1e2a..8b910ce2 100644
--- 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
@@ -29,6 +28,7 @@
 #define N_(msgid) msgid
 
 #include <libpspp/message.h>
+#include <libpspp/msg-locator.h>
 #include "message-dialog.h"
 #include "progname.h"
 
@@ -43,19 +43,19 @@ extern GladeXML *xml;
 
 
 
-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)
 {
@@ -136,7 +136,7 @@ popup_message(const struct msg *m)
       msg = _("PSPP Error");
       break;
     };
-  
+
   parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
 
   dialog = gtk_message_dialog_new(parent,
@@ -144,10 +144,13 @@ popup_message(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));
@@ -155,13 +158,3 @@ popup_message(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;
-}
-