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

31
src/remote_control.py
View file

@ -129,14 +129,18 @@ class SignalObject(DbusPrototype):
return None # or raise error return None # or raise error
if not keyID: if not keyID:
keyID = '' keyID = ''
if account: connected_account = None
self.plugin.connections[account].send_message(jid, message, keyID) if account and \
gajim.connections[account].connected > 1: # account is online
connected_account = gajim.connections[account]
else: else:
for account in gajim.contacts.keys(): 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 break
if account: if connected_account:
res = gajim.connections[account].send_message(jid, message, keyID) res = connected_account.send_message(jid, message, keyID)
return True return True
return False return False
@ -153,17 +157,20 @@ class SignalObject(DbusPrototype):
accounts = [account] accounts = [account]
else: else:
accounts = gajim.connections.keys() accounts = gajim.connections.keys()
connected_account = None
for account in accounts: for account in accounts:
if self.plugin.windows[account]['chats'].has_key(jid): if self.plugin.windows[account]['chats'].has_key(jid) and \
self.plugin.windows[account]['chats'][jid].set_active_tab(jid) gajim.connections[account].connected > 1: # account is online
connected_account = account
break break
elif gajim.contacts[account].has_key(jid): elif gajim.connections[account].connected > 1: # account is online
connected_account = account
if gajim.contacts[account].has_key(jid):
break break
self.plugin.roster.new_chat_from_jid(account, jid) if connected_account:
self.plugin.roster.new_chat_from_jid(connected_account, jid)
# preserve the 'steal focus preservation' # preserve the 'steal focus preservation'
win = self.plugin.windows[account]['chats'][jid].window win = self.plugin.windows[connected_account]['chats'][jid].window
if win.get_property('visible'): if win.get_property('visible'):
win.window.focus() win.window.focus()