projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 599d8108ddb7d8b91897eb6f16bf0cf27003ec1b..3555463f88e4d353c84bcd366b223955d4217604 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-16,11
+16,12
@@
#include <config.h>
#include <config.h>
-#include <l
ocale
.h>
+#include <l
ibpspp/i18n
.h>
#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
+#include <xalloc.h>
#include <argp.h>
#include <ui/command-line.h>
#include "relocatable.h"
#include <argp.h>
#include <ui/command-line.h>
#include "relocatable.h"
@@
-48,7
+49,7
@@
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
-#include "
helpe
r.h"
+#include "
executo
r.h"
#include "message-dialog.h"
#include <ui/syntax-gen.h>
#include "message-dialog.h"
#include <ui/syntax-gen.h>
@@
-81,7
+82,6
@@
replace_casereader (struct casereader *s)
#define N_(msgid) msgid
#define N_(msgid) msgid
-const char * output_file_name (void);
void
void
@@
-89,12
+89,8
@@
initialize (struct command_line_processor *clp, int argc, char **argv)
{
PsppireDict *dictionary = 0;
{
PsppireDict *dictionary = 0;
- /* gtk_init messes with the locale.
- So unset the bits we want to control ourselves */
- setlocale (LC_NUMERIC, "C");
-
- bindtextdomain (PACKAGE, locale_dir);
+ i18n_init ();
preregister_widgets ();
preregister_widgets ();
@@
-171,6
+167,7
@@
de_initialize (void)
message_dialog_done ();
settings_done ();
outp_done ();
message_dialog_done ();
settings_done ();
outp_done ();
+ i18n_done ();
}
}
@@
-297,7
+294,7
@@
parse_non_options (int key, char *arg, struct argp_state *state)
if ( local_is_utf8)
{
if ( local_is_utf8)
{
- utf8 = strdup (arg);
+ utf8 =
x
strdup (arg);
}
else
{
}
else
{
@@
-327,7
+324,7
@@
parse_non_options (int key, char *arg, struct argp_state *state)
g_free (utf8);
if ( filename == NULL)
g_free (utf8);
if ( filename == NULL)
- filename = strdup (arg);
+ filename =
x
strdup (arg);
psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);