When an account is not active, it is not touched by optionmenu changes, but can be specifically changed.
This commit is contained in:
parent
8dab95f07a
commit
e8a436725a
|
@ -656,7 +656,6 @@ class GajimCore:
|
||||||
#TODO: tell the changes to other plugins
|
#TODO: tell the changes to other plugins
|
||||||
#('STATUS', account, (status, msg))
|
#('STATUS', account, (status, msg))
|
||||||
elif ev[0] == 'STATUS':
|
elif ev[0] == 'STATUS':
|
||||||
activ = 1
|
|
||||||
msg = ev[2][1]
|
msg = ev[2][1]
|
||||||
if not msg:
|
if not msg:
|
||||||
msg = ev[2][0]
|
msg = ev[2][0]
|
||||||
|
@ -670,10 +669,7 @@ class GajimCore:
|
||||||
signed = ''
|
signed = ''
|
||||||
if self.connected[ev[1]] == 0:
|
if self.connected[ev[1]] == 0:
|
||||||
self.hub.sendPlugin('BAD_PASSPHRASE', ev[1], ())
|
self.hub.sendPlugin('BAD_PASSPHRASE', ev[1], ())
|
||||||
if self.cfgParser.tab[ev[1]].has_key('active'):
|
if (ev[2][0] != 'offline') and (self.connected[ev[1]] == 0):
|
||||||
activ = self.cfgParser.tab[ev[1]]['active']
|
|
||||||
if (ev[2][0] != 'offline') and (self.connected[ev[1]] == 0) and \
|
|
||||||
activ:
|
|
||||||
con = self.connect(ev[1])
|
con = self.connect(ev[1])
|
||||||
if self.connected[ev[1]]:
|
if self.connected[ev[1]]:
|
||||||
statuss = ['offline', 'online', 'away', 'xa', 'dnd', \
|
statuss = ['offline', 'online', 'away', 'xa', 'dnd', \
|
||||||
|
|
|
@ -1345,9 +1345,6 @@ class roster_Window:
|
||||||
del self.contacts[account][u.jid]
|
del self.contacts[account][u.jid]
|
||||||
|
|
||||||
def send_status(self, account, status, txt):
|
def send_status(self, account, status, txt):
|
||||||
if self.plugin.accounts[account].has_key('active'):
|
|
||||||
if not self.plugin.accounts[account]['active']:
|
|
||||||
return
|
|
||||||
if status != 'offline':
|
if status != 'offline':
|
||||||
keyid = None
|
keyid = None
|
||||||
save_gpg_pass = 0
|
save_gpg_pass = 0
|
||||||
|
@ -1400,6 +1397,9 @@ class roster_Window:
|
||||||
warning_Window(_("You must setup an account before connecting to jabber network."))
|
warning_Window(_("You must setup an account before connecting to jabber network."))
|
||||||
return
|
return
|
||||||
for acct in accounts:
|
for acct in accounts:
|
||||||
|
if self.plugin.accounts[acct].has_key('active'):
|
||||||
|
if not self.plugin.accounts[acct]['active']:
|
||||||
|
continue
|
||||||
self.send_status(acct, status, txt)
|
self.send_status(acct, status, txt)
|
||||||
|
|
||||||
def set_optionmenu(self):
|
def set_optionmenu(self):
|
||||||
|
|
Loading…
Reference in New Issue