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

save status in Connection class 

send our show / status when we join a gc
This commit is contained in:
Yann Leboulanger 2005-05-13 18:54:44 +00:00
parent e1020b288f
commit 324e8b25bf
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/connection.py
View File

@ -115,6 +115,7 @@ class Connection:
self.connected = 0 # offline self.connected = 0 # offline
self.connection = None # xmpppy instance self.connection = None # xmpppy instance
self.gpg = None self.gpg = None
self.status = ''
self.myVCardID = [] self.myVCardID = []
self.password = gajim.config.get_per('accounts', name, 'password') self.password = gajim.config.get_per('accounts', name, 'password')
if USE_GPG: if USE_GPG:
@ -592,11 +593,12 @@ class Connection:
roster = self.connection.getRoster().getRaw() roster = self.connection.getRoster().getRaw()
return roster return roster
def change_status(self, status, msg): def change_status(self, show, msg):
if not status in STATUS_LIST: if not show in STATUS_LIST:
return -1 return -1
if not msg: if not msg:
msg = status msg = show
self.status = msg
signed = '' signed = ''
keyID = gajim.config.get_per('accounts', self.name, 'keyid') keyID = gajim.config.get_per('accounts', self.name, 'keyid')
if keyID and USE_GPG: if keyID and USE_GPG:
@ -605,28 +607,28 @@ class Connection:
signed = '' signed = ''
if self.connected < 2: if self.connected < 2:
self.dispatch('BAD_PASSPHRASE', ()) self.dispatch('BAD_PASSPHRASE', ())
if (status != 'offline') and (self.connected == 0): if (show != 'offline') and (self.connected == 0):
self.connection = self.connect() self.connection = self.connect()
if self.connected == 2: if self.connected == 2:
self.connected = STATUS_LIST.index(status) self.connected = STATUS_LIST.index(show)
#send our presence #send our presence
ptype = 'available' ptype = 'available'
if status == 'invisible': if show == 'invisible':
ptype = 'invisible' ptype = 'invisible'
prio = str(gajim.config.get_per('accounts', self.name, 'priority')) prio = str(gajim.config.get_per('accounts', self.name, 'priority'))
p = common.xmpp.Presence(typ = ptype, priority = prio, show =\ p = common.xmpp.Presence(typ = ptype, priority = prio, show =\
status, status=msg) show, status=msg)
if signed: if signed:
p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed) p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
self.connection.send(p) self.connection.send(p)
self.dispatch('STATUS', status) self.dispatch('STATUS', show)
#ask our VCard #ask our VCard
iq = common.xmpp.Iq('get') iq = common.xmpp.Iq('get')
iq.setTag(common.xmpp.NS_VCARD + ' vCard') iq.setTag(common.xmpp.NS_VCARD + ' vCard')
self.connection.send(iq) self.connection.send(iq)
self.myVCardID.append(iq.getID()) self.myVCardID.append(iq.getID())
elif (status == 'offline') and self.connected: elif (show == 'offline') and self.connected:
self.connected = 0 self.connected = 0
if self.connection: if self.connection:
self.connection.send(common.xmpp.Presence(typ = 'unavailable', self.connection.send(common.xmpp.Presence(typ = 'unavailable',
@ -634,17 +636,17 @@ class Connection:
self.connection.disconnect() self.connection.disconnect()
self.dispatch('STATUS', 'offline') self.dispatch('STATUS', 'offline')
self.connection = None self.connection = None
elif status != 'offline' and self.connected: elif show != 'offline' and self.connected:
self.connected = STATUS_LIST.index(status) self.connected = STATUS_LIST.index(show)
ptype = 'available' ptype = 'available'
if status == 'invisible': if show == 'invisible':
ptype = 'invisible' ptype = 'invisible'
prio = str(gajim.config.get_per('accounts', self.name, 'priority')) prio = str(gajim.config.get_per('accounts', self.name, 'priority'))
p = common.xmpp.Presence(typ = ptype, priority = prio, show = status, p = common.xmpp.Presence(typ = ptype, priority = prio, show = show,
status = msg) status = msg)
if signed: p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed) if signed: p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
self.connection.send(p) self.connection.send(p)
self.dispatch('STATUS', status) self.dispatch('STATUS', show)
def send_message(self, jid, msg, keyID): def send_message(self, jid, msg, keyID):
if not self.connection: if not self.connection:
@ -829,7 +831,8 @@ class Connection:
def join_gc(self, nick, room, server, password): def join_gc(self, nick, room, server, password):
if not self.connection: if not self.connection:
return return
p = common.xmpp.Presence(to = '%s@%s/%s' % (room, server, nick)) p = common.xmpp.Presence(to = '%s@%s/%s' % (room, server, nick),
show = STATUS_LIST[self.connected], status = self.status)
p.setTag(common.xmpp.NS_MUC + ' x') p.setTag(common.xmpp.NS_MUC + ' x')
self.connection.send(p) self.connection.send(p)