r36930 - in /desktop/experimental/gtk+3.0/debian: changelog patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Mon Mar 11 20:42:33 2013
New Revision: 36930

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36930
Log:
* d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
  + Added. Fix segv when popping down non-existing bubblees (From upstream
    git, bgo #695304)

Added:
    desktop/experimental/gtk+3.0/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.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=36930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Mon Mar 11 20:42:33 2013
@@ -1,3 +1,11 @@
+gtk+3.0 (3.7.12-2) UNRELEASED; urgency=low
+
+  * d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
+    + Added. Fix segv when popping down non-existing bubblees (From upstream
+      git, bgo #695304)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 11 Mar 2013 21:15:28 +0100
+
 gtk+3.0 (3.7.12-1) experimental; urgency=low
 
   [ Sjoerd Simons ]

Added: desktop/experimental/gtk+3.0/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch?rev=36930&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch (added)
+++ desktop/experimental/gtk+3.0/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch [utf-8] Mon Mar 11 20:42:33 2013
@@ -1,0 +1,29 @@
+From ca2368dba958d6fecf2fce417307bb9cbbe6eb6b Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna at src.gnome.org>
+Date: Wed, 6 Mar 2013 17:04:23 +0100
+Subject: [PATCH] GtkTextView: don't popdown a bubble if we don't have one
+
+This causes a segfault.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=695304
+---
+ gtk/gtktextview.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
+index 1a0b560..2de8a1e 100644
+--- a/gtk/gtktextview.c
++++ b/gtk/gtktextview.c
+@@ -9101,7 +9101,8 @@ text_window_scroll        (GtkTextWindow *win,
+ 
+   if (dx != 0 || dy != 0)
+     {
+-      _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
++      if (priv->selection_bubble)
++        _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
+       gdk_window_scroll (win->bin_window, dx, dy);
+     }
+ }
+-- 
+1.7.10.4
+

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=36930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Mon Mar 11 20:42:33 2013
@@ -10,3 +10,4 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
+090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch