Remove Gtk-2.22 bug workaround.

Since we now depend on Gtk+2.24, this workaround is no longer relevant

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 38845ed19f35535efa685e5dc81d828272511370..85b31d0945ecaf430e5a20b8d411b94e3e943375 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -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,7 +88,6 @@ initialize (const char *data_file)
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
-  inject_renamed_icons ();
   create_icon_factory ();
 
   psppire_output_window_setup ();
@@ -150,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 */