projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GNU standards require "file name" instead of "filename" in
[pspp-builds.git]
/
src
/
ui
/
gui
/
message-dialog.c
diff --git
a/src/ui/gui/message-dialog.c
b/src/ui/gui/message-dialog.c
index 624b4147de81160e6a2560190828ea72725ff482..693db49f70f2a9ddd1dcfd281b8d6a8820a0f5bd 100644
(file)
--- a/
src/ui/gui/message-dialog.c
+++ b/
src/ui/gui/message-dialog.c
@@
-24,8
+24,9
@@
#include <stdarg.h>
#include <config.h>
#include <stdarg.h>
#include <config.h>
-#include
"message.h"
+#include
<libpspp/message.h>
#include "message-dialog.h"
#include "message-dialog.h"
+#include "progname.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-44,12
+45,14
@@
vmsg(int klass, const char *fmt, va_list args)
gchar *msg = 0;
gchar *text = g_strdup_vprintf (fmt, args);
gchar *msg = 0;
gchar *text = g_strdup_vprintf (fmt, args);
+ GtkWindow *parent ;
+ GtkWidget *dialog ;
+
gint message_type;
switch (klass)
{
case SE:
gint message_type;
switch (klass)
{
case SE:
- case IE:
case DE:
case ME:
message_type = GTK_MESSAGE_ERROR;
case DE:
case ME:
message_type = GTK_MESSAGE_ERROR;
@@
-60,7
+63,6
@@
vmsg(int klass, const char *fmt, va_list args)
message_type = GTK_MESSAGE_WARNING;
break;
case SM:
message_type = GTK_MESSAGE_WARNING;
break;
case SM:
- case IS:
case MM:
default:
message_type = GTK_MESSAGE_INFO;
case MM:
default:
message_type = GTK_MESSAGE_INFO;
@@
-75,11
+77,6
@@
vmsg(int klass, const char *fmt, va_list args)
msg = g_strdup(_("Script Error"));
break;
msg = g_strdup(_("Script Error"));
break;
- case IE:
- case IS:
- msg = g_strdup(_("Installation Error"));
- break;
-
case DE:
case DW:
msg = g_strdup(_("Data File Error"));
case DE:
case DW:
msg = g_strdup(_("Data File Error"));
@@
-93,14
+90,13
@@
vmsg(int klass, const char *fmt, va_list args)
break;
};
break;
};
- GtkWindow *parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
-
- GtkWidget *dialog = gtk_message_dialog_new(parent,
- GTK_DIALOG_MODAL,
- message_type,
- GTK_BUTTONS_CLOSE,
- msg);
+ parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
+ dialog = gtk_message_dialog_new(parent,
+ GTK_DIALOG_MODAL,
+ message_type,
+ GTK_BUTTONS_CLOSE,
+ msg);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
@@
-139,29
+135,21
@@
err_assert_fail(const char *expr, const char *file, int line)
msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
}
msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
}
-/* The GUI is always interactive.
- So this function does nothing */
-void
-err_cond_fail(void)
-{
-}
-
-
+/* Writes MESSAGE formatted with printf, to stderr, if the
+ verbosity level is at least LEVEL. */
void
void
-
err_failure(void
)
+
verbose_msg (int level, const char *format, ...
)
{
{
- msg(ME, _("Terminating NOW due to fatal error"));
- gtk_main_quit();
+ /* Do nothing for now. */
}
}
-
/* FIXME: This is a stub .
* A temporary workaround until getl.c is rearranged
*/
void
err_location (struct file_locator *f)
{
/* FIXME: This is a stub .
* A temporary workaround until getl.c is rearranged
*/
void
err_location (struct file_locator *f)
{
- f->filename = 0;
+ f->file
_
name = 0;
f->line_number = -1;
}
f->line_number = -1;
}