Remove attempts do destroy windows before quit.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index a18d332ea9fab65a8da045de4e6e0bb912aa5ba2..2096184d39569c613b5a2d2207bc2f978f0249ea 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -28,7 +28,6 @@
 #include "data/dataset.h"
 #include "data/datasheet.h"
 #include "data/file-handle-def.h"
-#include "data/file-name.h"
 #include "data/session.h"
 #include "data/settings.h"
 
@@ -65,17 +64,15 @@
 #include "gl/relocatable.h"
 
 static void create_icon_factory (void);
-static gchar *local_to_filename_encoding (const char *fn);
-
 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 
 bool
-initialize (const char *data_file, int state)
+initialize (const struct init_source *is)
 {
-  switch (state)
+  switch (is->state)
     {
     case 0:
       i18n_init ();
@@ -102,31 +99,53 @@ initialize (const char *data_file, int state)
       bind_textdomain_codeset (PACKAGE, "UTF-8");
       break;
     case 8:
-      create_icon_factory ();
+      if ( ! gtk_parse_args (is->argc, is->argv) )
+       {
+         perror ("Error parsing arguments");
+         exit (1);
+       }
       break;
     case 9:
-      psppire_output_window_setup ();
+      create_icon_factory ();
       break;
     case 10:
-      journal_init ();
+      psppire_output_window_setup ();
       break;
     case 11:
-      textdomain (PACKAGE);
+      journal_init ();
       break;
     case 12:
+      textdomain (PACKAGE);
+      break;
+    case 13:
       /* FIXME: This should be implemented with a GtkInterface */
       psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
       psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
       psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
       psppire_selector_set_default_selection_func (PSPPIRE_TYPE_MEANS_LAYER, insert_source_row_into_layers);
       break;
-    case 13:
+    case 14:
       {
-      if (data_file)
+      if (is->filename_arg != -1)
        {
-         gchar *filename = local_to_filename_encoding (data_file);
-
-         int retval = any_reader_detect (filename, NULL);
+#ifndef G_OS_WIN32
+         const char *file = (*is->argv)[is->filename_arg];
+         const gchar *local_encoding = NULL;
+         g_get_charset (&local_encoding);
+#else
+         char **as = g_win32_get_command_line ();
+         const char *file = as[is->filename_arg];
+         const gchar *local_encoding = "UTF-8";
+#endif   
+
+         struct file_handle *fh = fh_create_file (NULL,
+                                                  file,
+                                                  local_encoding,
+                                                  fh_default_properties ());
+         
+         const char *filename = fh_get_file_name (fh);
+
+         int retval = any_reader_detect (fh, NULL);
 
          /* Check to see if the file is a .sav or a .por file.  If not
             assume that it is a syntax file */
@@ -137,7 +156,8 @@ initialize (const char *data_file, int state)
              create_data_window ();
              open_syntax_window (filename, NULL);
            }
-         g_free (filename);
+
+         fh_unref (fh);
        }
       else
        {
@@ -174,9 +194,6 @@ func (gpointer key, gpointer value, gpointer data)
 void
 psppire_quit (void)
 {
-  PsppireWindowRegister *reg = psppire_window_register_new ();
-  psppire_window_register_foreach (reg, func, NULL);
-
   gtk_main_quit ();
 }
 
@@ -254,6 +271,8 @@ create_icon_factory (void)
 
            if ( gtk_icon_source_get_filename (source))
              gtk_icon_set_add_source (icon_set, source);
+
+           gtk_icon_source_free (source);
          }
       
        gtk_icon_factory_add (factory, ic->icon_name[i], icon_set);
@@ -320,67 +339,8 @@ create_icon_factory (void)
 
   gtk_icon_factory_add_default (factory);
 }
-\f
-/* 
-   Convert a filename from the local encoding into "filename" encoding.
-   The return value will be allocated on the heap.  It is the responsibility
-   of the caller to free it.
- */
-static gchar *
-local_to_filename_encoding (const char *fn)
-{
-  gchar *filename = NULL;
-  gchar *utf8 = NULL;
-  const gchar *local_encoding = NULL;
-  gsize written = -1;
-  const gboolean local_is_utf8 = g_get_charset (&local_encoding);
-
-  /* There seems to be no Glib function to convert from local encoding
-     to filename encoding.  Therefore it has to be done in two steps:
-     the intermediate encoding is UTF8.
-
-     Either step could fail.  However, in many cases the file can still
-     be loaded even if the conversion fails. So in those cases, after showing
-     a warning, we simply copy the locally encoded filename to the destination
-     and hope for the best.
-  */
-
-  if ( local_is_utf8)
-    {
-      utf8 = xstrdup (fn);
-    }
-  else
-    {
-      GError *err = NULL;
-      utf8 = g_locale_to_utf8 (fn, -1, NULL, &written, &err);
-      if ( NULL == utf8)
-        {
-          g_warning ("Cannot convert filename from local encoding `%s' to UTF-8: %s",
-                     local_encoding,
-                     err->message);
-          g_clear_error (&err);
-        }
-    }
 
-  if ( NULL != utf8)
-    {
-      GError *err = NULL;
-      filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err);
-      if ( NULL == filename)
-        {
-          g_warning ("Cannot convert filename from UTF8 to filename encoding: %s",
-                     err->message);
-          g_clear_error (&err);
-        }
-    }
-
-  g_free (utf8);
-
-  if ( filename == NULL)
-    filename = xstrdup (fn);
-
-  return filename;
-}
+\f
 
 static void
 handle_msg (const struct msg *m_, void *lexer_)