r13364 - in /desktop/unstable/epiphany-browser/debian: changelog patches/18_ephy-session_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov  2 09:02:57 2007
New Revision: 13364

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13364
Log:
* 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash 
  when loading a session. Closes: #449003.

Added:
    desktop/unstable/epiphany-browser/debian/patches/18_ephy-session_crash.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=13364&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Fri Nov  2 09:02:57 2007
@@ -1,3 +1,10 @@
+epiphany-browser (2.20.1-2) UNRELEASED; urgency=low
+
+  * 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash 
+    when loading a session. Closes: #449003.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 02 Nov 2007 10:02:39 +0100
+
 epiphany-browser (2.20.1-1) unstable; urgency=low
 
   [ Nelson A. de Oliveira ]

Added: desktop/unstable/epiphany-browser/debian/patches/18_ephy-session_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/18_ephy-session_crash.patch?rev=13364&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/18_ephy-session_crash.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/18_ephy-session_crash.patch Fri Nov  2 09:02:57 2007
@@ -1,0 +1,40 @@
+Index: epiphany-2.20.1/src/ephy-session.c
+===================================================================
+--- epiphany-2.20.1.orig/src/ephy-session.c	2007-11-02 10:02:02.052876888 +0100
++++ epiphany-2.20.1/src/ephy-session.c	2007-11-02 10:02:24.402150500 +0100
+@@ -1466,8 +1466,6 @@ ephy_session_load (EphySession *session,
+ 		if (xmlStrEqual (child->name, (const xmlChar *) "window"))
+ 		{
+ 		    	xmlChar *tmp;
+-		    	gboolean success;
+-		    	int active_tab;
+ 		    
+ 			window = ephy_window_new ();
+ 			widget = GTK_WIDGET (window);
+@@ -1480,13 +1478,19 @@ ephy_session_load (EphySession *session,
+ 
+ 			/* Set focus to something sane */
+ 			tmp = xmlGetProp (child, (xmlChar *) "active-tab");
+-			success = int_from_string ((char *) tmp, &active_tab);
+-			xmlFree (tmp);
+-		    	if (success)
+-		    	{
+-				GtkWidget *notebook;
+-				notebook = ephy_window_get_notebook (window);
+-				gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), active_tab);
++			if (tmp != NULL)
++			{
++				gboolean success;
++				int active_tab;
++
++				success = int_from_string ((char *) tmp, &active_tab);
++				xmlFree (tmp);
++				if (success)
++				{
++					GtkWidget *notebook;
++					notebook = ephy_window_get_notebook (window);
++					gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), active_tab);
++				}
+ 			}
+ 
+ 			gtk_widget_grab_focus (GTK_WIDGET (ephy_window_get_active_tab (window)));

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=13364&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Fri Nov  2 09:02:57 2007
@@ -15,4 +15,5 @@
 15_webkit-gtk-api.patch
 16_webkit-missing-methods.patch
 17_webkit-signal-emission.patch
+18_ephy-session_crash.patch
 99_autoreconf.patch