[gimp/gtk3-port: 137/137] hacks on top, to be redone

[Michael Natterer <mitch src gnome org>]

commit cd11cfc976c4034f4561a78a3a18468fedcf5e39
Author: Michael Natterer <mitch gimp org>
Date:   Mon Nov 22 11:17:51 2010 +0100

    hacks on top, to be redone

 app/display/gimpstatusbar.c |    2 ++
 app/widgets/gimpdockbook.c  |    6 +++++-
 app/widgets/gimptoolbox.c   |   19 +++++++++++++++++++
 plug-ins/Makefile.am        |   12 ++++++------
 plug-ins/common/Makefile.am |   12 ++++++------
 5 files changed, 38 insertions(+), 13 deletions(-)
---
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 59f9a69..f64df2d 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -232,8 +232,10 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
                           statusbar);
 
   statusbar->progressbar = g_object_new (GTK_TYPE_PROGRESS_BAR,
+#if 0
                                          "text-xalign", 0.0,
                                          "text-yalign", 0.5,
+#endif
                                          "ellipsize",   PANGO_ELLIPSIZE_END,
                                          NULL);
   gtk_box_pack_start (GTK_BOX (hbox), statusbar->progressbar, TRUE, TRUE, 0);
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index 8f1c397..494697c 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -366,9 +366,11 @@ gimp_dockbook_style_set (GtkWidget *widget,
                         "tab-border", &tab_border,
                         NULL);
 
+#if 0
   g_object_set (widget,
                 "tab-border", tab_border,
                 NULL);
+#endif
 
   gimp_dockbook_recreate_tab_widgets (GIMP_DOCKBOOK (widget),
                                       FALSE /*only_auto*/);
@@ -780,7 +782,7 @@ gimp_dockbook_update_automatic_tab_style (GimpDockbook *dockbook)
   GimpTabStyle  tab_style           = 0;
   int           i                   = 0;
   gint          available_space     = 0;
-  guint         tab_hborder         = 0;
+  guint         tab_hborder         = 2;
   gint          xthickness          = 0;
   gint          tab_curvature       = 0;
   gint          focus_width         = 0;
@@ -790,9 +792,11 @@ gimp_dockbook_update_automatic_tab_style (GimpDockbook *dockbook)
   gint          action_widget_size  = 0;
 
   xthickness = gtk_widget_get_style (widget)->xthickness;
+#if 0
   g_object_get (widget,
                 "tab-hborder", &tab_hborder,
                 NULL);
+#endif
   gtk_widget_style_get (widget,
                         "tab-curvature",    &tab_curvature,
                         "focus-line-width", &focus_width,
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index 62c0f46..8768b96 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -284,6 +284,7 @@ gimp_toolbox_constructed (GObject *object)
                       FALSE, FALSE, 0);
   gtk_widget_show (toolbox->p->tool_palette);
 
+#if 0
   toolbox->p->area_wbox = gtk_hwrap_box_new (FALSE);
   gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->p->area_wbox), GTK_JUSTIFY_TOP);
   gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (toolbox->p->area_wbox),
@@ -294,6 +295,7 @@ gimp_toolbox_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->area_wbox,
                       FALSE, FALSE, 0);
   gtk_widget_show (toolbox->p->area_wbox);
+#endif
 
   /* We need to know when the current device changes, so we can update
    * the correct tool - to do this we connect to motion events.
@@ -326,9 +328,14 @@ gimp_toolbox_constructed (GObject *object)
 
   toolbox->p->color_area = toolbox_create_color_area (toolbox,
                                                       toolbox->p->context);
+#if 0
   gtk_wrap_box_pack_wrapped (GTK_WRAP_BOX (toolbox->p->area_wbox),
                              toolbox->p->color_area,
                              TRUE, TRUE, FALSE, TRUE, TRUE);
+#else
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->color_area,
+                      FALSE, FALSE, 0);
+#endif
   if (config->toolbox_color_area)
     gtk_widget_show (toolbox->p->color_area);
 
@@ -337,8 +344,13 @@ gimp_toolbox_constructed (GObject *object)
                            toolbox->p->color_area, 0);
 
   toolbox->p->foo_area = toolbox_create_foo_area (toolbox, toolbox->p->context);
+#if 0
   gtk_wrap_box_pack (GTK_WRAP_BOX (toolbox->p->area_wbox), toolbox->p->foo_area,
                      TRUE, TRUE, FALSE, TRUE);
+#else
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->foo_area,
+                      FALSE, FALSE, 0);
+#endif
   if (config->toolbox_foo_area)
     gtk_widget_show (toolbox->p->foo_area);
 
@@ -348,8 +360,13 @@ gimp_toolbox_constructed (GObject *object)
 
   toolbox->p->image_area = toolbox_create_image_area (toolbox,
                                                       toolbox->p->context);
+#if 0
   gtk_wrap_box_pack (GTK_WRAP_BOX (toolbox->p->area_wbox), toolbox->p->image_area,
                      TRUE, TRUE, FALSE, TRUE);
+#else
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->image_area,
+                      FALSE, FALSE, 0);
+#endif
   if (config->toolbox_image_area)
     gtk_widget_show (toolbox->p->image_area);
 
@@ -498,8 +515,10 @@ gimp_toolbox_size_allocate (GtkWidget     *widget,
       toolbox->p->area_rows    = area_rows;
       toolbox->p->area_columns = area_columns;
 
+#if 0
       gtk_widget_set_size_request (toolbox->p->area_wbox, -1,
                                    area_rows * height);
+#endif
     }
 }
 
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 9f256ca..eedf3a5 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-faxg3		\
@@ -68,15 +68,15 @@ SUBDIRS = \
 	$(file_xjt)		\
 	flame			\
 	fractal-explorer	\
-	gfig			\
-	gimpressionist		\
+##	gfig			\
+##	gimpressionist		\
 	gradient-flare		\
 	help			\
 	$(help_browser)		\
-	ifs-compose		\
-	imagemap		\
+##	ifs-compose		\
+##	imagemap		\
 	lighting		\
-	map-object		\
+##	map-object		\
 	maze			\
 	$(metadata)		\
 	pagecurl		\
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index bb8d0d2..975c5a3 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -46,7 +46,7 @@ libexec_PROGRAMS = \
 	alien-map \
 	align-layers \
 	animation-optimize \
-	animation-play \
+##	animation-play \
 	antialias \
 	apply-canvas \
 	blinds \
@@ -75,7 +75,7 @@ libexec_PROGRAMS = \
 	crop-auto \
 	crop-zealous \
 	cubism \
-	curve-bend \
+##	curve-bend \
 	decompose \
 	deinterlace \
 	depth-merge \
@@ -99,7 +99,7 @@ libexec_PROGRAMS = \
 	file-gbr \
 	file-gif-load \
 	file-gif-save \
-	file-gih \
+##	file-gih \
 	file-glob \
 	file-header \
 	file-html-table \
@@ -112,7 +112,7 @@ libexec_PROGRAMS = \
 	file-pix \
 	$(FILE_PNG) \
 	file-pnm \
-	file-ps \
+##	file-ps \
 	$(FILE_PSP) \
 	file-raw \
 	file-sunras \
@@ -126,7 +126,7 @@ libexec_PROGRAMS = \
 	$(FILE_XPM) \
 	file-xwd \
 	film \
-	filter-pack \
+##	filter-pack \
 	fractal-trace \
 	gradient-map \
 	grid \
@@ -162,7 +162,7 @@ libexec_PROGRAMS = \
 	ripple \
 	rotate \
 	sample-colorize \
-	$(SCREENSHOT) \
+##	$(SCREENSHOT) \
 	semi-flatten \
 	sharpen \
 	shift \