r34225 - in /desktop/experimental/gtk+3.0/debian: changelog patches/015_default-fallback-icon-theme.patch patches/070_revert-widget-set-up-signals-after-initializing.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Apr 15 22:37:18 2012
New Revision: 34225

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34225
Log:
Refresh patches.

Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
    desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=34225&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sun Apr 15 22:37:18 2012
@@ -7,8 +7,9 @@
   * New upstream release.
   * Update dependencies according to configure.ac.
   * Drop explicit Build-Depends on gir1.2-glib-2.0 and gir1.2-freedesktop.
-
- -- Michael Biebl <biebl at debian.org>  Mon, 16 Apr 2012 00:35:51 +0200
+  * Refresh patches.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 16 Apr 2012 00:36:57 +0200
 
 gtk+3.0 (3.4.0-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/015_default-fallback-icon-theme.patch?rev=34225&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] Sun Apr 15 22:37:18 2012
@@ -1,8 +1,8 @@
-Index: gtk+-3.3.20/gtk/gtksettings.c
+Index: gtk+-3.4.1/gtk/gtksettings.c
 ===================================================================
---- gtk+-3.3.20.orig/gtk/gtksettings.c	2012-03-21 00:38:01.090485562 +0100
-+++ gtk+-3.3.20/gtk/gtksettings.c	2012-03-21 00:38:04.810485429 +0100
-@@ -443,7 +443,7 @@
+--- gtk+-3.4.1.orig/gtk/gtksettings.c	2012-04-04 03:06:04.000000000 +0200
++++ gtk+-3.4.1/gtk/gtksettings.c	2012-04-15 20:55:20.822307902 +0200
+@@ -429,7 +429,7 @@
                                               g_param_spec_string ("gtk-fallback-icon-theme",
                                                                    P_("Fallback Icon Theme Name"),
                                                                    P_("Name of a icon theme to fall back to"),

Modified: 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=34225&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch [utf-8] Sun Apr 15 22:37:18 2012
@@ -12,21 +12,21 @@
  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);
+Index: gtk+-3.4.1/gtk/gtkwidget.c
+===================================================================
+--- gtk+-3.4.1.orig/gtk/gtkwidget.c	2012-04-13 02:31:42.000000000 +0200
++++ gtk+-3.4.1/gtk/gtkwidget.c	2012-04-15 20:55:33.278308259 +0200
+@@ -14119,6 +14119,9 @@
+ 
+       gtk_style_context_set_direction (priv->context, gtk_widget_get_direction (widget));
  
 +      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)
+         gtk_style_context_set_screen (priv->context, screen);
+@@ -14127,9 +14130,6 @@
        if (priv->parent)
          gtk_style_context_set_parent (priv->context,
                                        gtk_widget_get_style_context (priv->parent));
@@ -36,6 +36,3 @@
      }
  
    return widget->priv->context;
--- 
-1.7.9.1
-