copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverted [6216] because of #1889

This commit is contained in:
Dimitur Kirov 2006-04-24 18:58:58 +00:00
parent 7ae0998c9b
commit 42118e7423
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection_handlers.py
View File

@ -23,7 +23,6 @@ import base64
import sha import sha
import socket import socket
import sys import sys
import locale
from calendar import timegm from calendar import timegm
@ -1233,9 +1232,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
mtype = msg.getType() mtype = msg.getType()
subject = msg.getSubject() # if not there, it's None subject = msg.getSubject() # if not there, it's None
tim = msg.getTimestamp() tim = msg.getTimestamp()
locale.setlocale(locale.LC_TIME, 'C')
tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') tim = time.strptime(tim, '%Y%m%dT%H:%M:%S')
locale.setlocale(locale.LC_TIME, '')
tim = time.localtime(timegm(tim)) tim = time.localtime(timegm(tim))
frm = helpers.get_full_jid_from_iq(msg) frm = helpers.get_full_jid_from_iq(msg)
jid = helpers.get_jid_from_iq(msg) jid = helpers.get_jid_from_iq(msg)
@ -1364,9 +1361,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
if x.getNamespace() == common.xmpp.NS_DELAY: if x.getNamespace() == common.xmpp.NS_DELAY:
# JEP-0091 # JEP-0091
tim = prs.getTimestamp() tim = prs.getTimestamp()
locale.setlocale(locale.LC_TIME, 'C')
tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') tim = time.strptime(tim, '%Y%m%dT%H:%M:%S')
locale.setlocale(locale.LC_TIME, '')
timestamp = time.localtime(timegm(tim)) timestamp = time.localtime(timegm(tim))
if x.getNamespace() == 'http://delx.cjb.net/protocol/roster-subsync': if x.getNamespace() == 'http://delx.cjb.net/protocol/roster-subsync':
# see http://trac.gajim.org/ticket/326 # see http://trac.gajim.org/ticket/326