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

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 840e1e2adc..fca13956b1 100644
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -1,11 +1,9 @@
-/* 
-   PSPPIRE --- A Graphical User Interface for PSPP
-   Copyright (C) 2004,2005  Free Software Foundation
-   Written by John Darrington
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,10 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. 
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #include <stdio.h>
@@ -29,6 +24,7 @@
 #define N_(msgid) msgid
 
 #include <libpspp/message.h>
+#include <libpspp/msg-locator.h>
 #include "message-dialog.h"
 #include "progname.h"
 
@@ -39,70 +35,66 @@
 
 #include "helper.h"
 
-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);
+  message_queue = g_queue_new ();
+  msg_init (ss, enqueue_msg);
 }
 
-
 void
 message_dialog_done (void)
 {
-  msg_done();
-  g_queue_free(message_queue);
+  msg_done ();
+  g_queue_free (message_queue);
 }
 
-static gboolean 
-dequeue_message(gpointer data)
+static gboolean
+dequeue_message (gpointer data)
 {
   struct msg * m ;
 
   /* If a pointer grab is in effect, then the combination of that, and
-     a modal dialog box, will cause an impossible situation. 
+     a modal dialog box, will cause an impossible situation.
      So don't pop it up just yet.
-  */ 
-  if ( gdk_pointer_is_grabbed())
+  */
+  if ( gdk_pointer_is_grabbed ())
     return TRUE;
 
-  m = g_queue_pop_tail(message_queue);
+  m = g_queue_pop_tail (message_queue);
 
-  if ( m ) 
+  if ( m )
     {
-      popup_message(m);
-      msg_destroy(m);
+      popup_message (m);
+      msg_destroy (m);
       return TRUE;
     }
-  
+
   return FALSE;
 }
 
 static void
-enqueue_msg(const struct msg *msg)
+enqueue_msg (const struct msg *msg)
 {
-  struct msg *m = msg_dup(msg);
+  struct msg *m = msg_dup (msg);
 
-  g_queue_push_head(message_queue, m);
+  g_queue_push_head (message_queue, m);
 
-  g_idle_add(dequeue_message, 0);
+  g_idle_add (dequeue_message, 0);
 }
 
 
-void 
-popup_message(const struct msg *m)
+void
+popup_message (const struct msg *m)
 {
-  GtkWindow *parent;
   GtkWidget *dialog;
+  gchar *location = NULL;
 
   gint message_type;
   const char *msg;
@@ -120,8 +112,8 @@ popup_message(const struct msg *m)
       message_type = GTK_MESSAGE_INFO;
       break;
     };
-  
-  switch (m->category) 
+
+  switch (m->category)
     {
     case MSG_SYNTAX:
       msg = _("Script Error");
@@ -136,32 +128,33 @@ 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,
+  dialog = gtk_message_dialog_new ( NULL,
 				  GTK_DIALOG_MODAL,
 				  message_type,
 				  GTK_BUTTONS_CLOSE,
 				  msg);
-  
-  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-                                           "%s", m->text);
-    
-  gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+  if ( m->where.line_number != -1)
+    {
+      location = g_strdup_printf (_("%s (line %d)"),
+				  m->where.file_name ? m->where.file_name : "",
+				  m->where.line_number);
+    }
+  else
+    {
+      location = g_strdup_printf (_("%s"),
+				  m->where.file_name ? m->where.file_name : "");    }
 
-  gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+					    _("%s %s"),
+					    location,
+					    m->text);
+  g_free (location);
 
-  gtk_widget_destroy (dialog);
-}
+  gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
 
-/* 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;
+  gtk_dialog_run (GTK_DIALOG (dialog));
+
+  gtk_widget_destroy (dialog);
 }