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

Timestamp:

08/29/07 22:42:28 (15 months ago)

Author:

roidelapluie

Message:

Prevent a TB when a jid is in mem but not in DB (is has been removed while gajim was running). Fix #3073.

Files:

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

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

@@ -170 +170 @@
                 if jid in self.jids_already_in: # we already have jids in DB
                         self.cur.execute('SELECT jid_id FROM jids WHERE jid=?', [jid])
-                        jid_id = self.cur.fetchone()[0]
-                else: # oh! a new jid :), we add it now
-                        if typestr == 'ROOM':
-                                typ = constants.JID_ROOM_TYPE
-                        else:
-                                typ = constants.JID_NORMAL_TYPE
-                        self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ))
-                        try:
-                                self.con.commit()
-                        except sqlite.OperationalError, e:
-                                print >> sys.stderr, str(e)
-                        jid_id = self.cur.lastrowid
-                        self.jids_already_in.append(jid)
+                        row = self.cur.fetchone()
+                        if row:
+                                return row[0]
+                # oh! a new jid :), we add it now
+                if typestr == 'ROOM':
+                        typ = constants.JID_ROOM_TYPE
+                else:
+                        typ = constants.JID_NORMAL_TYPE
+                self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ))
+                try:
+                        self.con.commit()
+                except sqlite.OperationalError, e:
+                        print >> sys.stderr, str(e)
+                jid_id = self.cur.lastrowid
+                self.jids_already_in.append(jid)
                 return jid_id