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

'send_message' and 'start-chat' is executed only for

Browse source 
connected accounts
This commit is contained in:
Dimitur Kirov 2005-07-20 14:12:49 +00:00
parent e9d80f65fe
commit fbcb964008
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/remote_control.py
View file

@ -129,15 +129,19 @@ class SignalObject(DbusPrototype):
return None # or raise error
if not keyID:
keyID = ''
if account:
self.plugin.connections[account].send_message(jid, message, keyID)
connected_account = None
if account and \
gajim.connections[account].connected > 1: # account is online
connected_account = gajim.connections[account]
else:
for account in gajim.contacts.keys():
if gajim.contacts[account].has_key(jid):
if gajim.contacts[account].has_key(jid) and \
gajim.connections[account].connected > 1: # account is online
connected_account = gajim.connections[account]
break
if account:
res = gajim.connections[account].send_message(jid, message, keyID)
return True
if connected_account:
res = connected_account.send_message(jid, message, keyID)
return True
return False
def open_chat(self, *args):
@ -153,19 +157,22 @@ class SignalObject(DbusPrototype):
accounts = [account]
else:
accounts = gajim.connections.keys()
connected_account = None
for account in accounts:
if self.plugin.windows[account]['chats'].has_key(jid):
self.plugin.windows[account]['chats'][jid].set_active_tab(jid)
if self.plugin.windows[account]['chats'].has_key(jid) and \
gajim.connections[account].connected > 1: # account is online
connected_account = account
break
elif gajim.contacts[account].has_key(jid):
break
self.plugin.roster.new_chat_from_jid(account, jid)
# preserve the 'steal focus preservation'
win = self.plugin.windows[account]['chats'][jid].window
if win.get_property('visible'):
win.window.focus()
elif gajim.connections[account].connected > 1: # account is online
connected_account = account
if gajim.contacts[account].has_key(jid):
break
if connected_account:
self.plugin.roster.new_chat_from_jid(connected_account, jid)
# preserve the 'steal focus preservation'
win = self.plugin.windows[connected_account]['chats'][jid].window
if win.get_property('visible'):
win.window.focus()
def change_status(self, *args, **keywords):
''' change_status(status, message, account). account is optional -