Changeset 8610 for branches/gajim_0.11.1/src/common

Timestamp:

08/30/07 00:20:41 (15 months ago)

Author:

roidelapluie

Message:

re-read jids table from DB when another instance of Gajim added a jid in it. Fixes #3349

Files:

• branches/gajim_0.11.1/src/common/logger.py (modified) (1 diff)

branches/gajim_0.11.1/src/common/logger.py

@@ -178 +178 @@
                 else:
                         typ = constants.JID_NORMAL_TYPE
-                self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ))
+                try:
+                        self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid,
+                                typ))
+                except sqlite.IntegrityError, e:
+                        # Jid already in DB, maybe added by another instance. re-read DB
+                        self.get_jids_already_in_db()
+                        return self.get_jid_id(jid, typestr)
                 try:
                         self.con.commit()