gnome-keyring r1314 - in trunk: . daemon/keyrings

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Sep 10 04:00:02 2008
New Revision: 1314
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1314&view=rev

Log:
	* daemon/keyrings/gkr-keyring-item.c: Fix bugs when cloning a
	keyring item to be part of another keyring. This fixes issues 
	with items in PK indexes overwriting each other.

Modified:
   trunk/ChangeLog
   trunk/daemon/keyrings/gkr-keyring-item.c

Modified: trunk/daemon/keyrings/gkr-keyring-item.c
==============================================================================
--- trunk/daemon/keyrings/gkr-keyring-item.c	(original)
+++ trunk/daemon/keyrings/gkr-keyring-item.c	Wed Sep 10 04:00:02 2008
@@ -204,7 +204,7 @@
 	g_return_val_if_fail (GKR_IS_KEYRING_ITEM (item), NULL);
 		
 	nitem->keyring = new_keyring;
-	nitem->id = item->id;
+	nitem->id = gkr_keyring_get_new_id (new_keyring);
 	nitem->locked = item->locked;
 
 	nitem->type = item->type;
@@ -220,7 +220,7 @@
 	/* Make sure we get disconnected when keyring goes away */
 	g_object_add_weak_pointer (G_OBJECT (item->keyring), (gpointer*)&(item->keyring));
 		
-	return item;
+	return nitem;
 }
 
 void