r1360 - in /unstable/gtkhtml3.14/debian: changelog patches/01_fix-editing-crash.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Sep 25 08:17:16 2009
New Revision: 1360

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1360
Log:
* debian/patches/
  - 01_fix-editing-crash added.

Added:
    unstable/gtkhtml3.14/debian/patches/01_fix-editing-crash.patch
Modified:
    unstable/gtkhtml3.14/debian/changelog

Modified: unstable/gtkhtml3.14/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/changelog?rev=1360&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/changelog (original)
+++ unstable/gtkhtml3.14/debian/changelog Fri Sep 25 08:17:16 2009
@@ -2,8 +2,10 @@
 
   * debian/control:
     - move editor-common in the libs section.                   closes: #548279
-
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 25 Sep 2009 09:29:39 +0200
+  * debian/patches/
+    - 01_fix-editing-crash added.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 25 Sep 2009 10:16:10 +0200
 
 gtkhtml3.14 (3.28.0-2) unstable; urgency=low
 

Added: unstable/gtkhtml3.14/debian/patches/01_fix-editing-crash.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/patches/01_fix-editing-crash.patch?rev=1360&op=file
==============================================================================
--- unstable/gtkhtml3.14/debian/patches/01_fix-editing-crash.patch (added)
+++ unstable/gtkhtml3.14/debian/patches/01_fix-editing-crash.patch Fri Sep 25 08:17:16 2009
@@ -1,0 +1,21 @@
+commit a427666371f9ef1c53eb85606b8727b434c90f7d
+Author: Matthew Barnes <mbarnes at redhat.com>
+Date:   Mon Sep 21 10:37:33 2009 -0400
+
+    Fix an editing crash.
+    
+    Apparently G_VALUE_HOLDS() doesn't like NULL GValues.
+
+diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
+index aca15f9..58ae08f 100644
+--- a/components/editor/gtkhtml-editor.c
++++ b/components/editor/gtkhtml-editor.c
+@@ -384,7 +384,7 @@ editor_method_event (GtkHTML *html,
+ 	guint signal_id;
+ 
+ 	/* GtkHTML event arguments are either NULL or a single string. */
+-	if (G_VALUE_HOLDS (args, G_TYPE_STRING))
++	if (args != NULL && G_VALUE_HOLDS (args, G_TYPE_STRING))
+ 		string = g_value_get_string (args);
+ 
+ 	switch (event) {