r33677 - in /desktop/experimental/gtk+3.0/debian: changelog patches/070_revert-widget-set-up-signals-after-initializing.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Mar 28 13:26:53 2012
New Revision: 33677

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33677
Log:
debian/patches/070_revert-widget-set-up-signals-after-initializing.patch:
Revert upstream commit which breaks the window decorations in
gnome-shell resp. mutter 3.2.

Added:
    desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/series

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=33677&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Wed Mar 28 13:26:53 2012
@@ -18,8 +18,11 @@
     gtk-3-examples. Add the necessary Breaks/Replaces.
   * debian/libgtk-3-bin.install.in: Install the man pages from the install
     directory, not the source directory.
-
- -- Michael Biebl <biebl at debian.org>  Wed, 28 Mar 2012 15:19:03 +0200
+  * debian/patches/070_revert-widget-set-up-signals-after-initializing.patch:
+    Revert upstream commit which breaks the window decorations in
+    gnome-shell resp. mutter 3.2.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 28 Mar 2012 15:20:34 +0200
 
 gtk+3.0 (3.3.16-1) experimental; urgency=low
 

Added: desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch?rev=33677&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch (added)
+++ desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch [utf-8] Wed Mar 28 13:26:53 2012
@@ -1,0 +1,41 @@
+From 502d6cb9bc75370ed0692849c65c89d52e818a96 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Wed, 28 Mar 2012 06:10:17 +0200
+Subject: [PATCH] Revert "widget: Set up signals after initializing style
+ context"
+
+This reverts commit 5d579811843f81db9866ac81afc5297f776cfb3b.
+
+This change breaks the window decorations in gnome-shell resp. mutter 3.2.
+It can be dropped again, once GNOME 3.4 is in unstable.
+---
+ gtk/gtkwidget.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index a82f050..c4c85c9 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -14119,6 +14119,9 @@ gtk_widget_get_style_context (GtkWidget *widget)
+                                     "direction", gtk_widget_get_direction (widget),
+                                     NULL);
+ 
++      g_signal_connect (widget->priv->context, "changed",
++                        G_CALLBACK (style_context_changed), widget);
++
+       screen = gtk_widget_get_screen (widget);
+ 
+       if (screen)
+@@ -14128,9 +14131,6 @@ gtk_widget_get_style_context (GtkWidget *widget)
+       if (priv->parent)
+         gtk_style_context_set_parent (priv->context,
+                                       gtk_widget_get_style_context (priv->parent));
+-
+-      g_signal_connect (widget->priv->context, "changed",
+-                        G_CALLBACK (style_context_changed), widget);
+     }
+ 
+   return widget->priv->context;
+-- 
+1.7.9.1
+

Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=33677&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Wed Mar 28 13:26:53 2012
@@ -8,3 +8,4 @@
 044_tracker_fts.patch
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
+070_revert-widget-set-up-signals-after-initializing.patch