r10836 - in /desktop/unstable/seahorse/debian: changelog patches/00list patches/9_fix_ephy_crash.dpatch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon May  7 14:09:12 2007
New Revision: 10836

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10836
Log:
* debian/patches/9_fix_ephy_crash.dpatch:
  + Fix epiphany extension crash (Closes: #422616). Patch taken from the
    Gnome 2.18 branch of seahorse, thanks to Sam Morris for pointing at it.

Added:
    desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch   (with props)
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/patches/00list

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=10836&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Mon May  7 14:09:12 2007
@@ -1,3 +1,11 @@
+seahorse (1.0.1-5) unstable; urgency=low
+
+  * debian/patches/9_fix_ephy_crash.dpatch:
+    + Fix epiphany extension crash (Closes: #422616). Patch taken from the
+      Gnome 2.18 branch of seahorse, thanks to Sam Morris for pointing at it.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon,  7 May 2007 16:07:00 +0200
+
 seahorse (1.0.1-4) unstable; urgency=low
 
   [ Sebastian Dröge ]

Modified: desktop/unstable/seahorse/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/00list?rev=10836&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (original)
+++ desktop/unstable/seahorse/debian/patches/00list Mon May  7 14:09:12 2007
@@ -2,4 +2,5 @@
 2_mlock.dpatch
 3_setuid.dpatch
 8_force_ssh.dpatch
+9_fix_ephy_crash.dpatch
 10_relibtoolize.dpatch

Added: desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch?rev=10836&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch Mon May  7 14:09:12 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 9_fix_ephy_crash.dpatch by  <sam at robots.org.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad seahorse-1.0.1~/plugins/epiphany/seahorse-extension.c seahorse-1.0.1/plugins/epiphany/seahorse-extension.c
+--- seahorse-1.0.1~/plugins/epiphany/seahorse-extension.c	2006-11-09 18:15:25.000000000 +0000
++++ seahorse-1.0.1/plugins/epiphany/seahorse-extension.c	2007-05-07 12:30:53.000000000 +0100
+@@ -476,12 +476,13 @@
+     is_input = mozilla_is_input (embed);
+ 
+     if (is_input == FALSE)
+-        return FALSE;
+-        
+-	text = mozilla_get_text (embed);
++        text = NULL;
++    else
++        text = mozilla_get_text (embed);
+ 	
+ 	if (text != NULL)
+-        texttype = detect_text_type (text, -1, NULL, NULL);   
++        texttype = detect_text_type (text, -1, NULL, NULL);
++      
+ 
+ 	action = gtk_action_group_get_action (data->action_group, ENCRYPT_ACTION);
+ 	g_return_val_if_fail (action != NULL, FALSE);	

Propchange: desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch
------------------------------------------------------------------------------
    svn:executable = *