From 84982aaf304e40c245200af8a3853d3d2036c853 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 30 Jul 2010 15:16:09 +0200
Subject: [PATCH] prevent duplicate bookmarks

---
 src/common/connection_handlers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 68e6220e1..513d01b0b 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1128,7 +1128,8 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
                 log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid'))
                 continue
 
-            if bm not in self.bookmarks:
+            bm_jids = [b['jid'] for b in self.bookmarks]
+            if bm['jid'] not in bm_jids:
                 self.bookmarks.append(bm)
                 if storage_type == 'xml':
                     # We got a bookmark that was not in pubsub