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



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

    foo

 Makefile.am                                |    2 +-
 app/display/gimpdisplayshell-tool-events.c |    1 +
 app/display/gimpdisplayshell.c             |   26 ++++++++++++++++----------
 plug-ins/Makefile.am                       |    6 +++---
 plug-ins/common/Makefile.am                |    4 ++--
 5 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 57c08a8..3ccfcec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS = \
        $(GIMP_MODULES)         \
        $(GIMP_PLUGINS)         \
        etc                     \
-       devel-docs              \
+##     devel-docs              \
        docs                    \
        build
 
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 29f3e59..6a9620b 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -2057,6 +2057,7 @@ gimp_display_shell_compress_motion (GdkEvent  *initial_event,
 
       if (!event)
         {
+          break;
           /* Do nothing */
         }
       else if ((gtk_get_event_widget (event) == widget)               &&
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index abec7cc..bdedafb 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -187,14 +187,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)
 {
@@ -300,8 +292,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
@@ -315,6 +305,22 @@ gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
 static void
 gimp_display_shell_init (GimpDisplayShell *shell)
 {
+  GtkCssProvider *css;
+  const gchar    *str;
+
+  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/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 8b45df8..b0a00c6 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -30,7 +30,7 @@ endif
 
 SUBDIRS = \
        $(script_fu)            \
-       $(pygimp)               \
+##     $(pygimp)               \
        file-bmp                \
        $(file_darktable)       \
        $(file_exr)             \
@@ -47,11 +47,11 @@ SUBDIRS = \
        flame                   \
        fractal-explorer        \
        gfig                    \
-       gimpressionist          \
+##     gimpressionist          \
        gradient-flare          \
        help                    \
        $(help_browser)         \
-       ifs-compose             \
+##     ifs-compose             \
        imagemap                \
        lighting                \
        map-object              \
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index ef81323..cbeb6d1 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -51,7 +51,7 @@ AM_CPPFLAGS = \
 libexec_PROGRAMS = \
        align-layers \
        animation-optimize \
-       animation-play \
+##     animation-play \
        blinds \
        blur \
        border-average \
@@ -66,7 +66,7 @@ libexec_PROGRAMS = \
        contrast-normalize \
        contrast-retinex \
        crop-zealous \
-       curve-bend \
+##     curve-bend \
        decompose \
        depth-merge \
        despeckle \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]