r18485 - in /desktop/experimental/epiphany-browser/debian: changelog patches/10_smart_bookmarks.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Feb 20 12:35:50 2009
New Revision: 18485

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18485
Log:
10_smart_bookmarks.patch: fix crash introduced by the patch because 
the text is not checked for NULLity. Closes: #516286.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=18485&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Fri Feb 20 12:35:50 2009
@@ -1,6 +1,8 @@
 epiphany-browser (2.24.3-2) UNRELEASED; urgency=low
 
   * Fix .pc file by hand so that extensions build correctly.
+  * 10_smart_bookmarks.patch: fix crash introduced by the patch because 
+    the text is not checked for NULLity. Closes: #516286.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 17 Feb 2009 18:29:06 +0100
 

Modified: desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch?rev=18485&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch Fri Feb 20 12:35:50 2009
@@ -2,8 +2,8 @@
 
 Index: epiphany-2.24.3/src/bookmarks/ephy-bookmark-action.c
 ===================================================================
---- epiphany-2.24.3.orig/src/bookmarks/ephy-bookmark-action.c	2009-02-15 01:06:01.269399087 +0100
-+++ epiphany-2.24.3/src/bookmarks/ephy-bookmark-action.c	2009-02-15 01:24:31.201409230 +0100
+--- epiphany-2.24.3.orig/src/bookmarks/ephy-bookmark-action.c	2008-08-04 15:21:51.000000000 +0200
++++ epiphany-2.24.3/src/bookmarks/ephy-bookmark-action.c	2009-02-20 13:34:30.388138066 +0100
 @@ -72,6 +72,7 @@ typedef struct
  	GObject *weak_ptr;
  	GtkWidget *entry;
@@ -12,7 +12,7 @@
  } ClipboardCtx;
  
  G_DEFINE_TYPE (EphyBookmarkAction, ephy_bookmark_action, EPHY_TYPE_LINK_ACTION)
-@@ -81,7 +82,7 @@ clipboard_text_received_cb (GtkClipboard
+@@ -81,12 +82,12 @@ clipboard_text_received_cb (GtkClipboard
  			    const char *text,
  			    ClipboardCtx *ctx)
  {
@@ -21,6 +21,12 @@
  	{
  		/* This is to avoid middle-clicking on a non-empty smart bookmark
  		 * triggering another search.
+ 		 */
+-		if (strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
++		if (text != NULL && strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
+ 		{
+ 			gtk_entry_set_text (GTK_ENTRY (ctx->entry), text);
+ 		}
 @@ -94,6 +95,11 @@ clipboard_text_received_cb (GtkClipboard
  
  	if (ctx->weak_ptr != NULL)