r48819 - in /desktop/unstable/gtk+3.0/debian: changelog patches/revert-scrolledwindow-Remove-child-before-destroying.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun May 22 07:02:00 2016
New Revision: 48819

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48819
Log:
Cherry-pick patch from upstream Git which reverts a commit that was
causing crashes in the filechooser in some applications.

Added:
    desktop/unstable/gtk+3.0/debian/patches/revert-scrolledwindow-Remove-child-before-destroying.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=48819&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Sun May 22 07:02:00 2016
@@ -9,6 +9,8 @@
     and drop the Debian specific -3.0 suffix. To simplify the transition make
     libgtk-3-bin depend on gtk-update-icon-cache. Once all theme packages have
     been updated, this dependency can be dropped.
+  * Cherry-pick patch from upstream Git which reverts a commit that was
+    causing crashes in the filechooser in some applications.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 22 May 2016 08:52:19 +0200
 

Added: desktop/unstable/gtk+3.0/debian/patches/revert-scrolledwindow-Remove-child-before-destroying.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/revert-scrolledwindow-Remove-child-before-destroying.patch?rev=48819&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/revert-scrolledwindow-Remove-child-before-destroying.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/revert-scrolledwindow-Remove-child-before-destroying.patch	[utf-8] Sun May 22 07:02:00 2016
@@ -0,0 +1,33 @@
+From ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 20 May 2016 09:16:35 -0400
+Subject: [PATCH] Revert "scrolledwindow: Remove child before destroying self"
+
+This reverts commit dcb4b48b29559ca632bb020a3b8eb2b9188b02e7.
+
+This was causing crashes in the filechooser in some applications.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766694
+---
+ gtk/gtkscrolledwindow.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index 0918d72..1b52082 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -2672,11 +2672,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
+ {
+   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
+-  GtkWidget *child;
+-
+-  child = gtk_bin_get_child (GTK_BIN (widget));
+-  if (child)
+-    gtk_container_remove (GTK_CONTAINER (widget), child);
+ 
+   remove_indicator (scrolled_window, &priv->hindicator);
+   remove_indicator (scrolled_window, &priv->vindicator);
+-- 
+2.8.1
+

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=48819&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Sun May 22 07:02:00 2016
@@ -8,3 +8,4 @@
 071_fix-installation-of-HTML-images.patch
 no-accessibility-dump.patch
 reftest-known-fail.patch
+revert-scrolledwindow-Remove-child-before-destroying.patch