X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=227d3528de221ddc6a30f487d50722797e78c400;hb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;hp=6e5664f5cfda8474918f010f9170543a192200b6;hpb=65e61cc92b48297625bc71cf31b8a19e301eb6c1;p=pspp-builds.git

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 6e5664f5..227d3528 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
@@ -16,7 +15,7 @@
    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. 
+   02110-1301, USA.
 */
 
 
@@ -40,10 +39,6 @@
 
 #include "helper.h"
 
-extern GladeXML *xml;
-
-
-
 static void enqueue_msg (const struct msg *m);
 
 
@@ -51,58 +46,57 @@ static GQueue *message_queue;
 
 
 void
-message_dialog_init (struct source_stream *ss) 
+message_dialog_init (struct source_stream *ss)
 {
-  message_queue = g_queue_new();
+  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;
 
   gint message_type;
@@ -121,8 +115,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");
@@ -137,21 +131,22 @@ 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);
 
-  gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                           _("%s (line %d) %s"),
+					   m->where.file_name,
+					   m->where.line_number,
+					   m->text);
+
+  gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
 
   gtk_widget_destroy (dialog);
 }