r13977 - in /desktop/unstable/gnome-keyring/debian: changelog patches/fix_evolution_crash.patch

[samm-guest at users.alioth.debian.org]

Author: samm-guest
Date: Thu Dec 20 00:10:07 2007
New Revision: 13977

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13977
Log:
* Add fix_evolution_crash.patch (closes: #456967).

Added:
    desktop/unstable/gnome-keyring/debian/patches/fix_evolution_crash.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=13977&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog (original)
+++ desktop/unstable/gnome-keyring/debian/changelog Thu Dec 20 00:10:07 2007
@@ -1,9 +1,13 @@
 gnome-keyring (2.20.2-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Downgrade libgnomekeyring dep on gnome-keyring to a Recommends;
     closes: #455203.
   * Wrap build-deps and deps.
   * Add a ${misc:Depends}.
+
+  [ Sam Morris ]
+  * Add fix_evolution_crash.patch (closes: #456967).
 
  -- Loic Minier <lool at dooz.org>  Mon, 10 Dec 2007 11:55:26 +0100
 

Added: desktop/unstable/gnome-keyring/debian/patches/fix_evolution_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/fix_evolution_crash.patch?rev=13977&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/fix_evolution_crash.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/fix_evolution_crash.patch Thu Dec 20 00:10:07 2007
@@ -1,0 +1,20 @@
+--- gnome-2-20/keyrings/gkr-keyring-item.c	2007/12/19 04:03:51	971
++++ gnome-2-20/keyrings/gkr-keyring-item.c	2007/12/19 04:25:37	972
+@@ -226,12 +226,11 @@
+ 				}
+ 				switch (attribute->type) {
+ 				case GNOME_KEYRING_ATTRIBUTE_TYPE_STRING:
+-					if ((attribute->value.string == NULL || item_attribute->value.string == NULL) && 
+-					    attribute->value.string != item_attribute->value.string) {
+-						return FALSE;
+-					}
+-					if (strcmp (attribute->value.string, item_attribute->value.string) != 0) {
+-						return FALSE;
++					if (attribute->value.string != item_attribute->value.string) {
++						if (attribute->value.string == NULL || item_attribute->value.string == NULL)
++							return FALSE;
++						if (strcmp (attribute->value.string, item_attribute->value.string) != 0)
++							return FALSE;
+ 					}
+ 					break;
+ 				case GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32: