projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate quoting style in printed strings.
[pspp]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 1c04e93b72244a8e5001c921d57dc1acf9cda60f..61042efe546cdedaf59470764312c6fa5e817361 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-40,9
+40,9
@@
#include "libpspp/version.h"
#include "output/driver.h"
#include "output/journal.h"
#include "libpspp/version.h"
#include "output/driver.h"
#include "output/journal.h"
+#include "output/message-item.h"
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
-#include "ui/gui/message-dialog.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
@@
-56,6
+56,7
@@
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
+#include "gl/configmake.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
@@
-70,6
+71,7
@@
struct dataset * the_dataset = NULL;
static GtkWidget *the_data_window;
static GtkWidget *the_data_window;
+static void handle_msg (const struct msg *);
static void load_data_file (const char *);
static void
static void load_data_file (const char *);
static void
@@
-94,13
+96,13
@@
initialize (struct source_stream *ss, const char *data_file)
preregister_widgets ();
gsl_set_error_handler_off ();
preregister_widgets ();
gsl_set_error_handler_off ();
- settings_init (
&viewer_width, &viewer_length
);
+ settings_init ();
fh_init ();
the_dataset = create_dataset ();
fh_init ();
the_dataset = create_dataset ();
- message_dialog_init (the_source_stream);
the_source_stream = ss;
the_source_stream = ss;
+ msg_init (ss, handle_msg);
dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
@@
-140,7
+142,6
@@
void
de_initialize (void)
{
destroy_source_stream (the_source_stream);
de_initialize (void)
{
destroy_source_stream (the_source_stream);
- message_dialog_done ();
settings_done ();
output_close ();
i18n_done ();
settings_done ();
output_close ();
i18n_done ();
@@
-267,7
+268,7
@@
load_data_file (const char *arg)
utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
if ( NULL == utf8)
{
utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
if ( NULL == utf8)
{
- g_warning ("Cannot convert filename from local encoding
\"%s\"
to UTF-8: %s",
+ g_warning ("Cannot convert filename from local encoding
`%s'
to UTF-8: %s",
local_encoding,
err->message);
g_clear_error (&err);
local_encoding,
err->message);
g_clear_error (&err);
@@
-295,3
+296,9
@@
load_data_file (const char *arg)
g_free (filename);
}
g_free (filename);
}
+
+static void
+handle_msg (const struct msg *m)
+{
+ message_item_submit (message_item_create (m));
+}