[gimp] app: clean up some disabled code

[Michael Natterer <mitch src gnome org>]

commit 0d4e40da7ba9841e0ec9b921f5c5b5417cbc119a
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jun 6 23:45:00 2014 +0200

    app: clean up some disabled code

 app/gui/gui.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/app/gui/gui.c b/app/gui/gui.c
index a72968e..03cbfbe 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -495,13 +495,16 @@ gui_restore_after_callback (Gimp               *gimp,
 
   gimp->message_handler = GIMP_MESSAGE_BOX;
 
-#if 0
   /*  enable this to always have icons everywhere  */
-  g_object_set (G_OBJECT (gtk_settings_get_default ()),
-                "gtk-button-images", TRUE,
-                "gtk-menu-images", TRUE,
-                NULL);
-#endif
+  if (g_getenv ("GIMP_ICONS_LIKE_A_BOSS"))
+    {
+      GdkScreen *screen = gdk_screen_get_default ();
+
+      g_object_set (G_OBJECT (gtk_settings_get_for_screen (screen)),
+                    "gtk-button-images", TRUE,
+                    "gtk-menu-images",   TRUE,
+                    NULL);
+    }
 
   if (gui_config->restore_accels)
     menus_restore (gimp);