X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=a3f6a2aff67d9ebebafd0261c2d08ffb8968b96d;hb=refs%2Fbuilds%2F20140208030509%2Fpspp;hp=512239e92a4eb1a8fa038691ef2d23c841b9b0c0;hpb=09fb24b69da41e809b41d7def006069b9255dd71;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 512239e92a..a3f6a2aff6 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
@@ -65,7 +65,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,12 +88,11 @@ initialize (const char *data_file)
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
-  inject_renamed_icons ();
   create_icon_factory ();
 
   psppire_output_window_setup ();
 
-  journal_enable ();
+  journal_init ();
   textdomain (PACKAGE);
 
   psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
@@ -105,11 +103,13 @@ initialize (const char *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 +148,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 */
@@ -270,14 +228,17 @@ create_icon_factory (void)
        ones in all other respects.
     */
     const struct iconmap map[] = {
-      {GTK_STOCK_NEW,   "file-new-document"},
-      {GTK_STOCK_QUIT,  "file-quit"},
-      {GTK_STOCK_SAVE,  "file-save-document"},
-      {GTK_STOCK_CUT,   "edit-cut"},
-      {GTK_STOCK_COPY,  "edit-copy"},
-      {GTK_STOCK_PASTE, "edit-paste"},
-      {GTK_STOCK_ABOUT, "help-about"},
-      {GTK_STOCK_PRINT, "file-print-document"}
+      {GTK_STOCK_NEW,    "file-new-document"},
+      {GTK_STOCK_QUIT,   "file-quit"},
+      {GTK_STOCK_SAVE,   "file-save-document"},
+      {GTK_STOCK_CUT,    "edit-cut"},
+      {GTK_STOCK_COPY,   "edit-copy"},
+      {GTK_STOCK_PASTE,  "edit-paste"},
+      {GTK_STOCK_UNDO,   "edit-undo"},
+      {GTK_STOCK_REDO,   "edit-redo"},
+      {GTK_STOCK_DELETE, "edit-delete"},
+      {GTK_STOCK_ABOUT,  "help-about"},
+      {GTK_STOCK_PRINT,  "file-print-document"}
     };
 
     GtkStockItem customised[sizeof (map) / sizeof (map[0])];