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

[Michael Natterer <mitch src gnome org>]

commit 639bcbb14c63a9d4247ba596e3c35efccb5d8107
Author: Michael Natterer <mitch gimp org>
Date:   Sat Dec 18 23:36:09 2010 +0100

    foo

 app/display/gimpdisplayshell-callbacks.c |    2 +-
 app/display/gimpstatusbar.c              |    2 ++
 app/tools/gimppainttool.c                |    4 ++++
 app/widgets/gimpdevices.c                |   13 +++++++++++++
 app/widgets/gimpdockbook.c               |    7 ++++++-
 plug-ins/Makefile.am                     |   12 ++++++------
 plug-ins/common/Makefile.am              |   12 ++++++------
 7 files changed, 38 insertions(+), 14 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index b0857f7..2125668 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -370,7 +370,7 @@ gimp_display_shell_canvas_size_allocate (GtkWidget        *widget,
 static gboolean
 gimp_display_shell_is_double_buffered (GimpDisplayShell *shell)
 {
-  return TRUE; /* FIXME: repair this after cairo tool drawing is done */
+  return FALSE; /* FIXME: repair this after cairo tool drawing is done */
 
   /*  always double-buffer if there are overlay children or a
    *  transform preview, or they will flicker badly. Also double
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 0183846..e3aed3f 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/tools/gimppainttool.c b/app/tools/gimppainttool.c
index e846594..ad237e6 100644
--- a/app/tools/gimppainttool.c
+++ b/app/tools/gimppainttool.c
@@ -483,6 +483,8 @@ gimp_paint_tool_modifier_key (GimpTool        *tool,
               if (gimp_draw_tool_is_active (draw_tool))
                 gimp_draw_tool_stop (draw_tool);
 
+              g_printerr ("%s: enabling color tool\n", G_STRFUNC);
+
               gimp_color_tool_enable (GIMP_COLOR_TOOL (tool),
                                       GIMP_COLOR_OPTIONS (info->tool_options));
 
@@ -509,6 +511,8 @@ gimp_paint_tool_modifier_key (GimpTool        *tool,
         {
           if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
             {
+              g_printerr ("%s: disabling color tool\n", G_STRFUNC);
+
               gimp_tool_pop_status (tool, display);
               gimp_color_tool_disable (GIMP_COLOR_TOOL (tool));
             }
diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c
index 1ef9f6c..37ddf2f 100644
--- a/app/widgets/gimpdevices.c
+++ b/app/widgets/gimpdevices.c
@@ -91,6 +91,19 @@ static void   gimp_devices_select_device  (GimpDeviceManager *manager,
 
 /*  public functions  */
 
+/* TEMP HACK to make it build */
+
+void
+gtk_widget_set_extension_events (void)
+{
+}
+
+gint
+gtk_widget_get_extension_events (GtkWidget *w)
+{
+  return 0;
+}
+
 void
 gimp_devices_init (Gimp                   *gimp,
                    GimpDeviceChangeNotify  change_notify)
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index 8f1c397..737e6ae 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -22,6 +22,7 @@
 
 #include <string.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -366,9 +367,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 +783,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 +793,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/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 \