Merge remote branch 'savannah/master'

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 5963803f45b9898ddd0d75e238afbe9c141f81b9..453bc3a80a7b8ae6e6bf35cb96e7548defd27947 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -60,8 +60,7 @@
 #include "gl/xalloc.h"
 #include "gl/relocatable.h"
 
-GtkRecentManager *the_recent_mgr;
-
+static void inject_renamed_icons (void);
 static void create_icon_factory (void);
 static void load_data_file (PsppireDataWindow *, const char *);
 
@@ -86,6 +85,7 @@ initialize (const char *data_file)
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
+  inject_renamed_icons ();
   create_icon_factory ();
 
   psppire_output_window_setup ();
@@ -93,9 +93,6 @@ initialize (const char *data_file)
   journal_enable ();
   textdomain (PACKAGE);
 
-
-  the_recent_mgr = gtk_recent_manager_get_default ();
-
   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);
@@ -103,7 +100,6 @@ initialize (const char *data_file)
   data_window = psppire_default_data_window ();
   if (data_file != NULL)
     load_data_file (data_window, data_file);
-  execute_const_syntax_string (data_window, "");
 }
 
 
@@ -133,6 +129,46 @@ 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_info
 {