X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=ffdd491ee2d780bdb8ebdbe3e9edc4fa48e44816;hb=cda91450a687e3f520ec4614dcc2d09f6f7c82bb;hp=9afbee5bd433486dd82bb729570de612e153739c;hpb=e10bd21c92f8d6a82ed06bec7af9ee40bf5eb727;p=pspp

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 9afbee5bd4..ffdd491ee2 100644
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -98,6 +98,7 @@ void
 popup_message (const struct msg *m)
 {
   GtkWidget *dialog;
+  gchar *location = NULL;
 
   gint message_type;
   const char *msg;
@@ -137,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);
 }