Changeset 7829 for branches/gajim_0.11/src/common/connection.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/common/connection.py (modified) (5 diffs)

branches/gajim_0.11/src/common/connection.py

@@ -80 +80 @@
                 self.continue_connect_info = None
                 if USE_GPG:
-                        self.gpg = GnuPG.GnuPG()
+                        self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
                         gajim.config.set('usegpg', True)
                 else:
@@ -197 +197 @@
                                                 self.password = self.new_account_info['password']
                                                 if USE_GPG:
-                                                        self.gpg = GnuPG.GnuPG()
+                                                        self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
                                                         gajim.config.set('usegpg', True)
                                                 else:
@@ -489 +489 @@
                 if not self.connection:
                         return
-                common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list)
+                def _on_del_privacy_list_result(result):
+                        if result:
+                                self.dispatch('PRIVACY_LIST_REMOVED', privacy_list)
+                        else:
+                                self.dispatch('ERROR', (_('Error while removing privacy list'),
+                                        _('Privacy list %s has not been removed. It is maybe active in '
+                                        'one of your connected resources. Desactivate it and try '
+                                        'again.') % privacy_list))
+                common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list,
+                        _on_del_privacy_list_result)
         
         def get_privacy_list(self, title):
@@ -1041 +1050 @@
                         t.setTagData('password', password)
                 self.connection.send(p)
+
                 #last date/time in history to avoid duplicate
-                last_log = gajim.logger.get_last_date_that_has_logs(room_jid,
-                        is_room = True)
-                if last_log is None:
-                        last_log = 0
-                self.last_history_line[room_jid]= last_log
+                if not self.last_history_line.has_key(room_jid): 
+                        # Not in memory, get it from DB
+                        last_log = gajim.logger.get_last_date_that_has_logs(room_jid,
+                                is_room = True)
+                        if last_log is None:
+                                last_log = 0
+                        self.last_history_line[room_jid]= last_log
 
         def send_gc_message(self, jid, msg, xhtml = None):
@@ -1091 +1103 @@
                 # disconnect from jabber server
                 self.connection.send(p)
+                # Save the time we quit to avoid duplicate logs AND be faster than 
+                # get that date from DB
+                self.last_history_line[jid] = time.time()
 
         def gc_set_role(self, room_jid, nick, role, reason = ''):