X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=ffdd491ee2d780bdb8ebdbe3e9edc4fa48e44816;hb=d908f52b818f4fdf2ab23797756812ec2986bd2b;hp=9d3dc9bb7a86e9076364440464bc608250731027;hpb=bc02bc027697df3207f827de722c26d8cc87e824;p=pspp-builds.git diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index 9d3dc9bb..ffdd491e 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -97,8 +97,8 @@ enqueue_msg (const struct msg *msg) void popup_message (const struct msg *m) { - GtkWindow *parent; GtkWidget *dialog; + gchar *location = NULL; gint message_type; const char *msg; @@ -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); }