X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=ffdd491ee2d780bdb8ebdbe3e9edc4fa48e44816;hb=9491a8bd354152d3a228e1bf041c7ad6228750d7;hp=f550e8fce853c1abd2ea6e297e2974c9a5764c26;hpb=a486e7cbf4f95d19bb208796e4c92a040cf48f65;p=pspp-builds.git

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index f550e8fc..ffdd491e 100644
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -1,4 +1,4 @@
-/* 
+/*
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004,2005  Free Software Foundation
 
@@ -15,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.
 */
 
 
@@ -46,59 +46,59 @@ 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;
+  gchar *location = NULL;
 
   gint message_type;
   const char *msg;
@@ -116,8 +116,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");
@@ -138,16 +138,26 @@ popup_message(const struct msg *m)
 				  message_type,
 				  GTK_BUTTONS_CLOSE,
 				  msg);
+  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_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-                                           _("%s (line %d) %s"),
-					   m->where.file_name,
-					   m->where.line_number,
-					   m->text);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+					    _("%s %s"),
+					    location,
+					    m->text);
+  g_free (location);
 
-  gtk_window_set_keep_above (GTK_WINDOW(dialog), TRUE);
+  gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
 
-  gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_dialog_run (GTK_DIALOG (dialog));
 
   gtk_widget_destroy (dialog);
 }