X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=93f3f99f7b4ca40941549ce248950472fc05fcbf;hb=c473f9ca75fc61a68e9e7e3bd7cb5f36dd0f7cf5;hp=7013fcfc1ad7affdc57afaf8ca68549486297cc2;hpb=d918d8dceaafb3c5e8018fdb2aff875e84f8c865;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 7013fcfc1a..93f3f99f7b 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013  Free Software Foundation
+   Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@
 #include "ui/gui/psppire-syntax-window.h"
 #include "ui/gui/psppire-selector.h"
 #include "ui/gui/psppire-var-view.h"
+#include "ui/gui/psppire-means-layer.h"
 #include "ui/gui/psppire-window-register.h"
 #include "ui/gui/widgets.h"
 #include "ui/source-init-opts.h"
@@ -65,7 +66,6 @@
 #include "gl/xalloc.h"
 #include "gl/relocatable.h"
 
-static void inject_renamed_icons (void);
 static void create_icon_factory (void);
 static gchar *local_to_filename_encoding (const char *fn);
 
@@ -89,7 +89,6 @@ initialize (const char *data_file)
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
-  inject_renamed_icons ();
   create_icon_factory ();
 
   psppire_output_window_setup ();
@@ -97,19 +96,23 @@ initialize (const char *data_file)
   journal_init ();
   textdomain (PACKAGE);
 
+  /* 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);
 
   if (data_file)
     {
       gchar *filename = local_to_filename_encoding (data_file);
 
+      enum detect_result res = any_reader_may_open (filename);
+
       /* Check to see if the file is a .sav or a .por file.  If not
          assume that it is a syntax file */
-      if ( any_reader_may_open (filename))
-        open_data_window (NULL, filename, NULL);
-      else
+      if (res == ANY_YES)
+	open_data_window (NULL, filename, NULL, NULL);
+      else if (res == ANY_NO)
         {
           create_data_window ();
           open_syntax_window (filename, NULL);
@@ -148,48 +151,6 @@ psppire_quit (void)
   gtk_main_quit ();
 }
 
-static void
-inject_renamed_icon (const char *icon, const char *substitute)
-{
-  GtkIconTheme *theme = gtk_icon_theme_get_default ();
-  if (!gtk_icon_theme_has_icon (theme, icon)
-      && gtk_icon_theme_has_icon (theme, substitute))
-    {
-      gint *sizes = gtk_icon_theme_get_icon_sizes (theme, substitute);
-      gint *p;
-
-      for (p = sizes; *p != 0; p++)
-        {
-          gint size = *p;
-          GdkPixbuf *pb;
-
-          pb = gtk_icon_theme_load_icon (theme, substitute, size, 0, NULL);
-          if (pb != NULL)
-            {
-              GdkPixbuf *copy = gdk_pixbuf_copy (pb);
-              if (copy != NULL)
-                gtk_icon_theme_add_builtin_icon (icon, size, copy);
-            }
-        }
-    }
-}
-
-/* Avoid a bug in GTK+ 2.22 that can cause a segfault at startup time.  Earlier
-   and later versions of GTK+ do not have the bug.  Bug #31511.
-
-   Based on this patch against Inkscape:
-   https://launchpadlibrarian.net/60175914/copy_renamed_icons.patch */
-static void
-inject_renamed_icons (void)
-{
-  if (gtk_major_version == 2 && gtk_minor_version == 22)
-    {
-      inject_renamed_icon ("gtk-file", "document-x-generic");
-      inject_renamed_icon ("gtk-directory", "folder");
-    }
-}
-
-
 struct icon_size
 {
   int resolution;  /* The dimension of the images which will be used */