Changeset 7940 for branches/gajim_0.11/src/gajim.py

Timestamp:

02/06/07 20:54:30 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/gajim_0.11/src/gajim.py (modified) (9 diffs)

branches/gajim_0.11/src/gajim.py

@@ -88 +88 @@
         sys.exit()
 
+del pritext
+
 path = os.getcwd()
 if '.svn' in os.listdir(path) or '_svn' in os.listdir(path):
@@ -135 +137 @@
 del opts
 del args
+del verbose
 
 import locale
@@ -141 +144 @@
 import common.configpaths
 common.configpaths.init_profile(profile)
+del profile
 gajimpaths = common.configpaths.gajimpaths
 
@@ -259 +263 @@
 f.close()
 del pid_dir
+del f
 
 def on_exit():
@@ -445 +450 @@
                 statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd',
                         'invisible']
+                # Ignore invalid show
+                if array[1] not in statuss:
+                        return
                 old_show = 0
                 new_show = statuss.index(array[1])
@@ -1099 +1107 @@
                 use_gpg_agent = gajim.config.get('use_gpg_agent')
                 if use_gpg_agent:
-                  return
+                        return
                 keyID = gajim.config.get_per('accounts', account, 'keyid')
                 self.roster.forget_gpg_passphrase(keyID)
@@ -1586 +1594 @@
                         gajim.connections[account].change_status('offline','')
 
-        def read_sleepy(self):  
+        def read_sleepy(self):
                 '''Check idle status and change that status if needed'''
                 if not self.sleeper.poll():
@@ -1598 +1606 @@
                         if state == common.sleepy.STATE_AWAKE and \
                                 gajim.sleeper_state[account] in ('autoaway', 'autoxa'):
-                                #we go online
+                                # we go online
                                 self.roster.send_status(account, 'online',
                                         gajim.status_before_autoaway[account])
+                                gajim.status_before_autoaway[account] = ''
                                 gajim.sleeper_state[account] = 'online'
                         elif state == common.sleepy.STATE_AWAY and \
                                 gajim.sleeper_state[account] == 'online' and \
                                 gajim.config.get('autoaway'):
-                                #we save out online status
+                                # we save out online status
                                 gajim.status_before_autoaway[account] = \
                                         gajim.connections[account].status
-                                #we go away (no auto status) [we pass True to auto param]
+                                # we go away (no auto status) [we pass True to auto param]
                                 self.roster.send_status(account, 'away',
                                         gajim.config.get('autoaway_message'), auto=True)
@@ -1616 +1625 @@
                                 gajim.sleeper_state[account] == 'online') and \
                                 gajim.config.get('autoxa'):
-                                #we go extended away [we pass True to auto param]
+                                # we go extended away [we pass True to auto param]
                                 self.roster.send_status(account, 'xa',
                                         gajim.config.get('autoxa_message'), auto=True)