X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=1cd7ee803c736a740b373a53b035c7dcef6bd90a;hb=c3580361c52f0246f71d9b727cb9e5bd0d8497bb;hp=a1f48e7b64d016f1cee8c5fb4b13c2be0bcf6af4;hpb=537fdeb3702c011e05d7826a8d556a7beeba2605;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index a1f48e7b64..1cd7ee803c 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include "relocatable.h" @@ -48,7 +49,7 @@ #include "psppire-dict.h" #include "psppire-var-store.h" #include "psppire-data-store.h" -#include "helper.h" +#include "executor.h" #include "message-dialog.h" #include @@ -81,7 +82,6 @@ replace_casereader (struct casereader *s) #define N_(msgid) msgid -const char * output_file_name (void); void @@ -89,7 +89,6 @@ initialize (struct command_line_processor *clp, int argc, char **argv) { PsppireDict *dictionary = 0; - i18n_init (); preregister_widgets (); @@ -294,7 +293,7 @@ parse_non_options (int key, char *arg, struct argp_state *state) if ( local_is_utf8) { - utf8 = strdup (arg); + utf8 = xstrdup (arg); } else { @@ -324,7 +323,7 @@ parse_non_options (int key, char *arg, struct argp_state *state) g_free (utf8); if ( filename == NULL) - filename = strdup (arg); + filename = xstrdup (arg); psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);