Changeset 7888 for branches/gajim_0.11/src/common/connection_handlers.py

Timestamp:

01/23/07 21:32:43 (22 months ago)

Author:

asterix

Message:

merge fixes from trunk

Files:

• branches/gajim_0.11/src/common/connection_handlers.py (modified) (2 diffs)

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

@@ -1325 +1325 @@
                 qp = iq_obj.setTag('time')
                 qp.setTagData('utc', strftime("%Y-%m-%dT%TZ", gmtime()))
-                qp.setTagData('tzo', "%+03d:00"% (time.timezone/(60*60)))
+                qp.setTagData('tzo', "%+03d:00"% (-time.timezone/(60*60)))
                 self.connection.send(iq_obj)
                 raise common.xmpp.NodeProcessed
@@ -1387 +1387 @@
                 jid = helpers.get_jid_from_iq(msg)
                 no_log_for = gajim.config.get_per('accounts', self.name,
-                        'no_log_for').split()
+                        'no_log_for')
+                if not no_log_for:
+                        no_log_for = ''
+                no_log_for = no_log_for.split()
                 encrypted = False
                 chatstate = None