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

Timestamp:

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

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Location:

branches/gajim_0.11/src/common

Files:

• commands.py (modified) (1 diff)
• config.py (modified) (1 diff)
• connection_handlers.py (modified) (2 diffs)
• connection.py (modified) (5 diffs)
• dataforms.py (modified) (1 diff)
• defs.py (modified) (1 diff)
• GnuPG.py (modified) (2 diffs)
• logger.py (modified) (3 diffs)
• optparser.py (modified) (3 diffs)
• passwords.py (modified) (1 diff)
• sleepy.py (modified) (7 diffs)
• xmpp/features_nb.py (modified) (1 diff)

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

@@ -129 +129 @@
                 cmd.addChild('note', {}, 'The status has been changed.')
 
-                self.connection.connection.send(response)
+                # if going offline, we need to push response so it won't go into
+                # queue and disappear
+                self.connection.connection.send(response, presencetype=='offline')
 
                 # send new status

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

@@ -131 +131 @@
                 'latest_disco_addresses': [ opt_str, '' ],
                 'recently_groupchat': [ opt_str, '' ],
-                'before_time': [ opt_str, '[' ],
-                'after_time': [ opt_str, ']' ],
                 'before_nickname': [ opt_str, '' ],
+                'time_stamp': [ opt_str, '[%H:%M] ' ],
                 'after_nickname': [ opt_str, ':' ],
                 'send_os_info': [ opt_bool, True ],

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

@@ -25 +25 @@
 import sys
 
-from time import localtime, strftime, gmtime, timezone
+from time import localtime, strftime, gmtime
 from calendar import timegm
 
@@ -887 +887 @@
                 c = f.read()
                 f.close()
-                card = common.xmpp.Node(node = c)
+                try:
+                        card = common.xmpp.Node(node = c)
+                except:
+                        # We are unable to parse it. Remove it
+                        os.remove(path_to_file)
+                        return None
                 vcard = self.node_to_dict(card)
                 if vcard.has_key('PHOTO'):

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 = ''):

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

@@ -342 +342 @@
                 def fget(self):
                         return self.getAttr('type')
-                def fset(self):
+                def fset(self, type):
                         assert type in ('form', 'submit', 'cancel', 'result')
                         self.setAttr('type', type)

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

@@ -3 +3 @@
 datadir = '../'
 
-version = '0.11'
+version = '0.11.0.1'
 
 import sys, os.path

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

@@ -44 +44 @@
 
         class GnuPG(GnuPGInterface.GnuPG):
-                def __init__(self):
+                def __init__(self, use_agent = False):
                         GnuPGInterface.GnuPG.__init__(self)
+                        self.use_agent = use_agent
                         self._setup_my_options()
 
@@ -54 +55 @@
                         # Nolith's patch - prevent crashs on non fully-trusted keys
                         self.options.extra_args.append('--always-trust')
+                        if self.use_agent:
+                                self.options.extra_args.append('--use-agent')
 
                 def _read_response(self, child_stdout):

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

@@ -426 +426 @@
                 self.cur.execute('''
                         SELECT time, kind, message FROM logs
-                        WHERE (%s) AND kind IN (%d, %d, %d, %d) AND time > %d
+                        WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d
                         ORDER BY time DESC LIMIT %d OFFSET %d
-                        ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV,
-                                constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT,
+                        ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,
+                                constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT,
+                                constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR,
                                 timed_out, restore_how_many_rows, pending_how_many)
                         )
@@ -516 +517 @@
                 result = self.cur.fetchall()
 
-                # Copy all interesant time in a temporary table 
+                # Copy all interesting times in a temporary table 
                 self.cur.execute('CREATE TEMPORARY TABLE blabla(time,INTEGER)') 
                 for line in result: 
@@ -555 +556 @@
                         where_sql = 'jid_id = %s' % jid_id      
                 self.cur.execute('''
-                        SELECT time FROM logs
+                        SELECT MAX(time) FROM logs
                         WHERE (%s) 
                         AND kind NOT IN (%d, %d)
-                        ORDER BY time DESC LIMIT 1
                         ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS))
 

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

@@ -14 +14 @@
 
 import os
-import sys
 import locale
 from common import gajim
@@ -151 +150 @@
                 if old < [0, 10, 1, 8] and new >= [0, 10, 1, 8]:
                         self.update_config_to_01018()
+                if old < [0, 11, 0, 1] and new >= [0, 11, 0, 1]:
+                        self.update_config_to_01101()
 
                 gajim.logger.init_vars()
@@ -368 +369 @@
                                  self.old_values['chat_state_notifications'])
                 gajim.config.set('version', '0.10.1.8')
+
+        def update_config_to_01101(self):
+                '''fill time_stamp from before_time and after_time'''
+                if self.old_values.has_key('before_time'):
+                        gajim.config.set('time_stamp', '%s%%H:%%M%s ' % (
+                                self.old_values['before_time'], self.old_values['after_time']))
+                gajim.config.set('version', '0.11.0.1')

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

@@ -14 +14 @@
 
 __all__ = ['get_password', 'save_password']
-
-import gobject
 
 from common import gajim

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

@@ -2 +2 @@
 ##
 ## Contributors for this file:
-##      - Yann Le Boulanger <asterix@lagaule.org>
-##      - Nikos Kouremenos <kourem@gmail.com>
+##        - Yann Le Boulanger <asterix@lagaule.org>
+##        - Nikos Kouremenos <kourem@gmail.com>
 ##
 ## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org>
-##                         Vincent Hanquez <tab@snarc.org>
+##                                               Vincent Hanquez <tab@snarc.org>
 ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org>
-##                    Nikos Kouremenos <kourem@gmail.com>
+##                                      Nikos Kouremenos <kourem@gmail.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -27 +27 @@
 STATE_XA   = 'extended away'
 STATE_AWAY   = 'away'
-STATE_AWAKE    = 'awake'
+STATE_AWAKE     = 'awake'
 
 SUPPORTED = True
 try:
-        if os.name == 'nt':
-                import ctypes
+                if os.name == 'nt':
+                        import ctypes
 
-                GetTickCount = ctypes.windll.kernel32.GetTickCount
-                GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo
+                        GetTickCount = ctypes.windll.kernel32.GetTickCount
+                        GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo
 
-                class LASTINPUTINFO(ctypes.Structure):
-                        _fields_ = [('cbSize', ctypes.c_uint),
-                            ('dwTime', ctypes.c_uint)]
+                        class LASTINPUTINFO(ctypes.Structure):
+                                _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)]
 
-                lastInputInfo = LASTINPUTINFO()
-                lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo)
+                        lastInputInfo = LASTINPUTINFO()
+                        lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo)
 
-        else: # unix
-                import idle
+                else: # unix
+                        import idle
 except:
         gajim.log.debug('Unable to load idle module')
@@ -51 +50 @@
 
 class SleepyWindows:
-        def __init__(self, away_interval = 60, xa_interval = 120):
+        def __init__(self, away_interval = 60, xa_interval = 120):
                 self.away_interval = away_interval
                 self.xa_interval = xa_interval
                 self.state = STATE_AWAKE # assume we are awake
 
-        def getIdleSec(self):
-                GetLastInputInfo(ctypes.byref(lastInputInfo))
-                idleDelta = float(GetTickCount() - lastInputInfo.dwTime) / 1000
-                return idleDelta
+        def getIdleSec(self):
+                GetLastInputInfo(ctypes.byref(lastInputInfo))
+                idleDelta = float(GetTickCount() - lastInputInfo.dwTime) / 1000
+                return idleDelta
 
         def poll(self):
                 '''checks to see if we should change state'''
+                if not SUPPORTED:
+                        return False
+
                 idleTime = self.getIdleSec()
-                
+
                 # xa is stronger than away so check for xa first
                 if idleTime > self.xa_interval:
@@ -81 +83 @@
 
 class SleepyUnix:
-
         def __init__(self, away_interval = 60, xa_interval = 120):
                 self.away_interval = away_interval
@@ -92 +93 @@
                         self.state = STATE_UNKNOWN
 
-        def getIdleSec(self):
-                return idle.getIdleSec()
+        def getIdleSec(self):
+                return idle.getIdleSec()
 
         def poll(self):
@@ -101 +102 @@
 
                 idleTime = self.getIdleSec()
-                
+
                 # xa is stronger than away so check for xa first
                 if idleTime > self.xa_interval:
@@ -118 +119 @@
 
 if os.name == 'nt':
-        Sleepy = SleepyWindows
+        Sleepy = SleepyWindows
 else:
-        Sleepy = SleepyUnix
+        Sleepy = SleepyUnix

branches/gajim_0.11/src/common/xmpp/features_nb.py

@@ -250 +250 @@
         _on_default_response(disp, iq, None)
 
-def delPrivacyList(disp,listname):
+def delPrivacyList(disp,listname,cb=None):
         """ Deletes privacy list 'listname'. Returns true on success."""
         iq = Iq('set',NS_PRIVACY,payload=[Node('list',{'name':listname})])
-        _on_default_response(disp, iq, None)
+        _on_default_response(disp, iq, cb)