[gimp/gtk3-port: 228/228] foo

[Michael Natterer <mitch src gnome org>]

commit e8ab3dc2e4888b486858e277a2ca4c45ac8330fa
Author: Michael Natterer <mitch gimp org>
Date:   Wed Feb 22 22:50:17 2012 +0100

    foo

 Makefile.am                    |    2 +-
 app/display/gimpdisplayshell.c |   26 ++++++++++++++++----------
 app/widgets/gimpsessioninfo.c  |   12 ++++++------
 plug-ins/Makefile.am           |    8 ++++----
 plug-ins/common/Makefile.am    |    4 ++--
 5 files changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ca96904..c7450fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = \
 	$(GIMP_MODULES)	\
 	$(GIMP_PLUGINS)	\
 	etc		\
-	devel-docs	\
+##	devel-docs	\
 	docs		\
 	build
 
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 07f15c0..2b31d2c 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -181,14 +181,6 @@ G_DEFINE_TYPE_WITH_CODE (GimpDisplayShell, gimp_display_shell,
 static guint display_shell_signals[LAST_SIGNAL] = { 0 };
 
 
-static const gchar display_rc_style[] =
-  "style \"check-button-style\"\n"
-  "{\n"
-  "  GtkToggleButton::child-displacement-x = 0\n"
-  "  GtkToggleButton::child-displacement-y = 0\n"
-  "}\n"
-  "widget \"*\" style \"check-button-style\"";
-
 static void
 gimp_display_shell_class_init (GimpDisplayShellClass *klass)
 {
@@ -270,8 +262,6 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass)
                                    g_param_spec_object ("icon", NULL, NULL,
                                                         GDK_TYPE_PIXBUF,
                                                         GIMP_PARAM_READWRITE));
-
-  gtk_rc_parse_string (display_rc_style);
 }
 
 static void
@@ -283,9 +273,25 @@ gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
 static void
 gimp_display_shell_init (GimpDisplayShell *shell)
 {
+  GtkCssProvider *css;
+  const gchar    *str;
+
   gtk_orientable_set_orientation (GTK_ORIENTABLE (shell),
                                   GTK_ORIENTATION_VERTICAL);
 
+  str =
+    "GimpDisplayShell GtkCheckButton {\n"
+    "    -GtkButton-child-displacement-x: 0;\n"
+    "    -GtkButton-child-displacement-y: 0;\n"
+    "}\n";
+
+  css = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (css, str, -1, NULL);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (shell)),
+                                  GTK_STYLE_PROVIDER (css),
+                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  g_object_unref (css);
+
   shell->options            = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
   shell->fullscreen_options = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
   shell->no_image_options   = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE, NULL);
diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c
index c62e8b9..67e20f6 100644
--- a/app/widgets/gimpsessioninfo.c
+++ b/app/widgets/gimpsessioninfo.c
@@ -499,14 +499,14 @@ gimp_session_info_restore_docks (GimpRestoreDocksData *data)
                 }
             }
         }
-
-      g_object_unref (dialog);
-      g_object_unref (screen);
-      g_object_unref (factory);
-      g_object_unref (info);
-      g_slice_free (GimpRestoreDocksData, data);
     }
 
+  g_object_unref (dialog);
+  g_object_unref (screen);
+  g_object_unref (factory);
+  g_object_unref (info);
+  g_slice_free (GimpRestoreDocksData, data);
+
   gimp_session_info_clear_info (info);
 
   return FALSE;
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 8305398..7d2dedb 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -54,7 +54,7 @@ endif
 
 SUBDIRS = \
 	$(script_fu)		\
-	$(pygimp)		\
+##	$(pygimp)		\
 	color-rotate		\
 	file-bmp		\
 	$(file_compressor)	\
@@ -69,12 +69,12 @@ SUBDIRS = \
 	flame			\
 	fractal-explorer	\
 	gfig			\
-	gimpressionist		\
+##	gimpressionist		\
 	gradient-flare		\
 	help			\
 	$(help_browser)		\
-	ifs-compose		\
-	imagemap		\
+##	ifs-compose		\
+##	imagemap		\
 	lighting		\
 	map-object		\
 	maze			\
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 8d56062..40108a1 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -47,7 +47,7 @@ libexec_PROGRAMS = \
 	alien-map \
 	align-layers \
 	animation-optimize \
-	animation-play \
+##	animation-play \
 	antialias \
 	apply-canvas \
 	blinds \
@@ -74,7 +74,7 @@ libexec_PROGRAMS = \
 	convolution-matrix \
 	crop-zealous \
 	cubism \
-	curve-bend \
+##	curve-bend \
 	decompose \
 	deinterlace \
 	depth-merge \