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

remove duplicated STATUS_LIST variable

This commit is contained in:
Yann Leboulanger 2009-01-10 16:45:52 +00:00
parent c8dc8cd758
commit 15ab37043e
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/connection.py
View File

@ -223,7 +223,7 @@ class Connection(ConnectionHandlers):
if gajim.account_is_connected(self.name): if gajim.account_is_connected(self.name):
# we cannot change our status to offline or connecting # we cannot change our status to offline or connecting
# after we auth to server # after we auth to server
self.old_show = STATUS_LIST[self.connected] self.old_show = gajim.SHOW_LIST[self.connected]
self.connected = 0 self.connected = 0
if not self.on_purpose: if not self.on_purpose:
self.dispatch('STATUS', 'offline') self.dispatch('STATUS', 'offline')
@ -927,7 +927,7 @@ class Connection(ConnectionHandlers):
# active the privacy rule # active the privacy rule
self.privacy_rules_supported = True self.privacy_rules_supported = True
self.activate_privacy_rule('invisible') self.activate_privacy_rule('invisible')
self.connected = STATUS_LIST.index('invisible') self.connected = gajim.SHOW_LIST.index('invisible')
self.status = msg self.status = msg
priority = unicode(gajim.get_priority(self.name, 'invisible')) priority = unicode(gajim.get_priority(self.name, 'invisible'))
p = common.xmpp.Presence(priority = priority) p = common.xmpp.Presence(priority = priority)
@ -1009,7 +1009,7 @@ class Connection(ConnectionHandlers):
self.connection.send(iq) self.connection.send(iq)
def send_custom_status(self, show, msg, jid): def send_custom_status(self, show, msg, jid):
if not show in STATUS_LIST: if not show in gajim.SHOW_LIST:
return -1 return -1
if not self.connection: if not self.connection:
return return
@ -1034,7 +1034,7 @@ class Connection(ConnectionHandlers):
self.connection.send(p) self.connection.send(p)
def change_status(self, show, msg, auto = False): def change_status(self, show, msg, auto = False):
if not show in STATUS_LIST: if not show in gajim.SHOW_LIST:
return -1 return -1
sshow = helpers.get_xmpp_show(show) sshow = helpers.get_xmpp_show(show)
if not msg: if not msg:
@ -1092,8 +1092,8 @@ class Connection(ConnectionHandlers):
signed = self.get_signed_presence(msg) signed = self.get_signed_presence(msg)
self.send_invisible_presence(msg, signed) self.send_invisible_presence(msg, signed)
return return
was_invisible = self.connected == STATUS_LIST.index('invisible') was_invisible = self.connected == gajim.SHOW_LIST.index('invisible')
self.connected = STATUS_LIST.index(show) self.connected = gajim.SHOW_LIST.index(show)
if was_invisible and self.privacy_rules_supported: if was_invisible and self.privacy_rules_supported:
iq = self.build_privacy_rule('visible', 'allow') iq = self.build_privacy_rule('visible', 'allow')
self.connection.send(iq) self.connection.send(iq)
@ -1117,7 +1117,7 @@ class Connection(ConnectionHandlers):
self.dispatch('STATUS', 'offline') self.dispatch('STATUS', 'offline')
def get_status(self): def get_status(self):
return STATUS_LIST[self.connected] return gajim.SHOW_LIST[self.connected]
def send_motd(self, jid, subject = '', msg = '', xhtml = None): def send_motd(self, jid, subject = '', msg = '', xhtml = None):
@ -1561,7 +1561,7 @@ class Connection(ConnectionHandlers):
def send_agent_status(self, agent, ptype): def send_agent_status(self, agent, ptype):
if not self.connection: if not self.connection:
return return
show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(to = agent, typ = ptype, show = show) p = common.xmpp.Presence(to = agent, typ = ptype, show = show)
p = self.add_sha(p, ptype != 'unavailable') p = self.add_sha(p, ptype != 'unavailable')
self.connection.send(p) self.connection.send(p)
@ -1584,7 +1584,7 @@ class Connection(ConnectionHandlers):
# FIXME: This room JID needs to be normalized; see #1364 # FIXME: This room JID needs to be normalized; see #1364
if not self.connection: if not self.connection:
return return
show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
if show == 'invisible': if show == 'invisible':
# Never join a room when invisible # Never join a room when invisible
return return

14
src/common/connection_handlers.py
View File

@ -59,8 +59,6 @@ if dbus_support.supported:
import logging import logging
log = logging.getLogger('gajim.c.connection_handlers') log = logging.getLogger('gajim.c.connection_handlers')
STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
'invisible', 'error']
# kind of events we can wait for an answer # kind of events we can wait for an answer
VCARD_PUBLISHED = 'vcard_published' VCARD_PUBLISHED = 'vcard_published'
VCARD_ARRIVED = 'vcard_arrived' VCARD_ARRIVED = 'vcard_arrived'
@ -1084,12 +1082,12 @@ class ConnectionVcard:
self.save_vcard_to_hd(our_jid, vcard_iq) self.save_vcard_to_hd(our_jid, vcard_iq)
# Send new presence if sha changed and we are not invisible # Send new presence if sha changed and we are not invisible
if self.vcard_sha != new_sha and STATUS_LIST[self.connected] != \ if self.vcard_sha != new_sha and gajim.SHOW_LIST[self.connected] !=\
'invisible': 'invisible':
if not self.connection or self.connected < 2: if not self.connection or self.connected < 2:
return return
self.vcard_sha = new_sha self.vcard_sha = new_sha
sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(typ = None, priority = self.priority, p = common.xmpp.Presence(typ = None, priority = self.priority,
show = sshow, status = self.status) show = sshow, status = self.status)
p = self.add_sha(p) p = self.add_sha(p)
@ -1256,11 +1254,11 @@ class ConnectionVcard:
if self.vcard_sha == avatar_sha: if self.vcard_sha == avatar_sha:
return return
self.vcard_sha = avatar_sha self.vcard_sha = avatar_sha
if STATUS_LIST[self.connected] == 'invisible': if gajim.SHOW_LIST[self.connected] == 'invisible':
return return
if not self.connection: if not self.connection:
return return
sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(typ = None, priority = self.priority, p = common.xmpp.Presence(typ = None, priority = self.priority,
show = sshow, status = self.status) show = sshow, status = self.status)
p = self.add_sha(p) p = self.add_sha(p)
@ -2042,7 +2040,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
status = prs.getStatus() or '' status = prs.getStatus() or ''
show = prs.getShow() show = prs.getShow()
if not show in STATUS_LIST: if not show in gajim.SHOW_LIST:
show = '' # We ignore unknown show show = '' # We ignore unknown show
if not ptype and not show: if not ptype and not show:
show = 'online' show = 'online'
@ -2399,7 +2397,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
_('You will be connected to %s without OpenPGP.') % self.name)) _('You will be connected to %s without OpenPGP.') % self.name))
self.USE_GPG = False self.USE_GPG = False
signed = '' signed = ''
self.connected = STATUS_LIST.index(show) self.connected = gajim.SHOW_LIST.index(show)
sshow = helpers.get_xmpp_show(show) sshow = helpers.get_xmpp_show(show)
# send our presence # send our presence
if show == 'invisible': if show == 'invisible':