preregister custom widgets so that GtkBuilder can find them

[pspp] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index b87a29f2a48db9d12c692e9a126b66e2f199f2f9..08b930e9fc166a7fd54ba8f54b045ae9d00be2c5 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -27,6 +27,7 @@
 
 #include "psppire-data-window.h"
 #include "psppire.h"
+#include "widgets.h"
 
 #include <libpspp/getl.h>
 #include <unistd.h>
@@ -44,7 +45,6 @@
 #include <language/syntax-string-source.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
@@ -95,7 +95,7 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
   bindtextdomain (PACKAGE, locale_dir);
 
 
-  glade_init ();
+  preregister_widgets ();
 
   gsl_set_error_handler_off ();
   fn_init ();
@@ -257,46 +257,8 @@ parse_non_options (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_ARG:
       {
-       struct string syntax;
-       FILE *fp = fopen (arg, "r");
-       if (NULL == fp)
-         {
-           const int errnum = errno;
-           fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
-                    arg, strerror (errnum));
-           return 0;
-         }
-       if ( sfm_detect (fp))
-         {
-           ds_init_cstr (&syntax, "GET FILE=");
-           goto close;
-         }
-       rewind (fp);
-       if (pfm_detect (fp))
-         {
-           ds_init_cstr (&syntax, "IMPORT FILE=");
-           goto close;
-         }
-
-       fclose (fp);
-       msg (ME, _("%s is neither a system nor portable file"), arg);
-       break;
-
-      close:
-       fclose (fp);
-
-       syntax_gen_string (&syntax, ss_cstr (arg));
-       ds_put_cstr (&syntax, ".");
-
-       getl_append_source (ss,
-                           create_syntax_string_source (ds_cstr (&syntax)),
-                           GETL_BATCH,
-                           ERRMODE_CONTINUE);
-
-       ds_destroy (&syntax);
-
-       psppire_window_set_filename (PSPPIRE_WINDOW (the_data_window), arg);
-
+       psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window),
+                                      arg);
        break;
       }
     default: