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

when we double click on a contact (or when we click on the systray icon), present the chat_window. 

idem for gc window
This commit is contained in:
Yann Leboulanger 2005-04-27 19:09:34 +00:00
parent db89a48bf3
commit 184542a4d1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogs.py
View File

@ -531,6 +531,8 @@ class Join_groupchat_window:
self.recently_groupchat = self.recently_groupchat[0:10] self.recently_groupchat = self.recently_groupchat[0:10]
gajim.config.set('recently_groupchat', ' '.join(self.recently_groupchat)) gajim.config.set('recently_groupchat', ' '.join(self.recently_groupchat))
self.plugin.roster.new_room(jid, nickname, self.account) self.plugin.roster.new_room(jid, nickname, self.account)
self.plugin.windows[account]['gc'][jid].active_tab(jid)
self.plugin.windows[account]['gc'][jid].window.present()
gajim.connections[self.account].join_gc(nickname, room, server, password) gajim.connections[self.account].join_gc(nickname, room, server, password)
self.window.destroy() self.window.destroy()

5
src/roster_window.py
View File

@ -894,8 +894,6 @@ class Roster_window:
self.plugin.windows[account]['gc']['tabbed'].new_room(jid, nick) self.plugin.windows[account]['gc']['tabbed'].new_room(jid, nick)
self.plugin.windows[account]['gc'][jid] = \ self.plugin.windows[account]['gc'][jid] = \
self.plugin.windows[account]['gc']['tabbed'] self.plugin.windows[account]['gc']['tabbed']
self.plugin.windows[account]['gc']['tabbed'].window.present()
self.plugin.windows[account]['gc']['tabbed'].active_tab(jid)
else: else:
self.plugin.windows[account]['gc'][jid] = \ self.plugin.windows[account]['gc'][jid] = \
groupchat_window.Groupchat_window(jid, nick, self.plugin, account) groupchat_window.Groupchat_window(jid, nick, self.plugin, account)
@ -1081,12 +1079,11 @@ class Roster_window:
self.tree.expand_row(path, False) self.tree.expand_row(path, False)
else: else:
if self.plugin.windows[account]['chats'].has_key(jid): if self.plugin.windows[account]['chats'].has_key(jid):
if gajim.config.get('usetabbedchat'):
self.plugin.windows[account]['chats'][jid].active_tab(jid) self.plugin.windows[account]['chats'][jid].active_tab(jid)
self.plugin.windows[account]['chats'][jid].window.present()
elif self.contacts[account].has_key(jid): elif self.contacts[account].has_key(jid):
self.new_chat(self.contacts[account][jid][0], account) self.new_chat(self.contacts[account][jid][0], account)
self.plugin.windows[account]['chats'][jid].active_tab(jid) self.plugin.windows[account]['chats'][jid].active_tab(jid)
self.plugin.windows[account]['chats'][jid].window.present()
def on_roster_treeview_row_expanded(self, widget, iter, path): def on_roster_treeview_row_expanded(self, widget, iter, path):
'''When a row is expanded change the icon of the arrow''' '''When a row is expanded change the icon of the arrow'''

1
src/systray.py
View File

@ -207,6 +207,7 @@ class Systray:
else: else:
self.plugin.roster.new_chat( self.plugin.roster.new_chat(
self.plugin.roster.contacts[account][jid][0], account) self.plugin.roster.contacts[account][jid][0], account)
acc['chats'][jid].window.present()
if event.button == 3: # right click if event.button == 3: # right click
self.make_menu(event) self.make_menu(event)