r42153 - in /desktop/unstable/epiphany-browser/debian: changelog patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Aug 10 08:38:35 2014
New Revision: 42153

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42153
Log:
* debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
  + Added. Fix crash when closing a second epiphany window (from bgo 732784)

Added:
    desktop/unstable/epiphany-browser/debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=42153&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Sun Aug 10 08:38:35 2014
@@ -1,3 +1,10 @@
+epiphany-browser (3.12.1-2) unstable; urgency=medium
+
+  * debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
+    + Added. Fix crash when closing a second epiphany window (from bgo 732784)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 02 Aug 2014 10:34:43 +0200
+
 epiphany-browser (3.12.1-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/epiphany-browser/debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch?rev=42153&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch	(added)
+++ desktop/unstable/epiphany-browser/debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch	[utf-8] Sun Aug 10 08:38:35 2014
@@ -0,0 +1,38 @@
+From 5a96c78695c2536c082e7216f74e2ed18af7de63 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro at igalia.com>
+Date: Mon, 21 Jul 2014 10:31:42 -0500
+Subject: [PATCH] ephy-title-box: Fix crash when closing second window
+
+The web view can be destroyed out from under us, so we need to use a
+weak reference to determine if it is still alive.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=732784
+---
+ src/ephy-title-box.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
+index 3ccf65e..e682f3a 100644
+--- a/src/ephy-title-box.c
++++ b/src/ephy-title-box.c
+@@ -551,15 +551,15 @@ ephy_title_box_set_web_view (EphyTitleBox  *title_box,
+     g_clear_object (&priv->title_binding);
+     g_clear_object (&priv->uri_binding);
+ 
+-    g_object_unref (priv->web_view);
++    g_object_remove_weak_pointer (G_OBJECT (priv->web_view), (gpointer *)&priv->web_view);
+   }
+ 
+-  priv->web_view = NULL;
++  priv->web_view = web_view;
+ 
+   if (web_view == NULL)
+     return;
+ 
+-  priv->web_view = g_object_ref (web_view);
++  g_object_add_weak_pointer (G_OBJECT (web_view), (gpointer *)&priv->web_view);
+ 
+   title = webkit_web_view_get_title (web_view);
+ 
+-- 
+1.9.3

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=42153&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series	[utf-8] Sun Aug 10 08:38:35 2014
@@ -1,3 +1,4 @@
+ephy-title-box-Fix-crash-when-closing-second-windo.patch
 00_epiphany-browser.patch
 07_bookmarks.patch
 12_safetypes.patch