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

Some cleanups and an attempt to fix the MUC highlight problem.

This commit is contained in:
Stephan Erb 2008-07-21 21:44:40 +00:00
parent 9dd865c063
commit 1b2e12057c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gajim.py
View File

@ -710,7 +710,6 @@ class Interface:
if ji in jid_list: if ji in jid_list:
# Update existing iter # Update existing iter
self.roster.draw_contact(ji, account) self.roster.draw_contact(ji, account)
self.roster.draw_group(_('Transports'), account)
if new_show > 1 and ji in gajim.transport_avatar[account]: if new_show > 1 and ji in gajim.transport_avatar[account]:
# transport just signed in. request avatars # transport just signed in. request avatars
for jid_ in gajim.transport_avatar[account][ji]: for jid_ in gajim.transport_avatar[account][ji]:
@ -2107,7 +2106,8 @@ class Interface:
else: else:
# add contact to roster ("Not In The Roster") if he is not # add contact to roster ("Not In The Roster") if he is not
self.roster.add_to_not_in_the_roster(account, jid) self.roster.add_to_not_in_the_roster(account, jid)
self.roster.draw_contact(jid, account) else:
self.roster.draw_contact(jid, account)
# Select the contact in roster, it's visible because it has events. # Select the contact in roster, it's visible because it has events.
self.roster.select_contact(jid, account) self.roster.select_contact(jid, account)
@ -2124,8 +2124,8 @@ class Interface:
w = self.msg_win_mgr.get_window(jid, account) w = self.msg_win_mgr.get_window(jid, account)
if jid in self.minimized_controls[account]: if jid in self.minimized_controls[account]:
self.roster.on_groupchat_maximized(None, jid, account) self.roster.on_groupchat_maximized(None, jid, account)
return
if not ctrl: else:
ctrl = self.msg_win_mgr.get_gc_control(jid, account) ctrl = self.msg_win_mgr.get_gc_control(jid, account)
elif type_ in ('printed_chat', 'chat', ''): elif type_ in ('printed_chat', 'chat', ''):
@ -3134,7 +3134,6 @@ class Interface:
dialogs.AspellDictError(lang) dialogs.AspellDictError(lang)
if gajim.config.get('soundplayer') == '': if gajim.config.get('soundplayer') == '':
print 'first'
# only on first time Gajim starts # only on first time Gajim starts
commands = ('aplay', 'play', 'esdplay', 'artsplay') commands = ('aplay', 'play', 'esdplay', 'artsplay')
for command in commands: for command in commands:

7
src/roster_window.py
View File

@ -759,7 +759,7 @@ class RosterWindow:
contact = gajim.contacts.get_contact_with_highest_priority(account, jid) contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
if contact.is_groupchat(): if contact.is_groupchat():
if jid in gajim.interface.minimized_controls[account]: if jid in gajim.interface.minimized_controls[account]:
gajim.interface.minimized_controls[account][jid] del gajim.interface.minimized_controls[account][jid]
self.remove_contact(jid, account, force=True, backend=True) self.remove_contact(jid, account, force=True, backend=True)
return True return True
else: else:
@ -2720,15 +2720,14 @@ class RosterWindow:
if not jid in gajim.interface.minimized_controls[account]: if not jid in gajim.interface.minimized_controls[account]:
return return
ctrl = gajim.interface.minimized_controls[account][jid] ctrl = gajim.interface.minimized_controls[account][jid]
mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, mw = gajim.interface.msg_win_mgr.get_window(jid, account)
ctrl.account)
if not mw: if not mw:
mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact,
ctrl.account, ctrl.type_id) ctrl.account, ctrl.type_id)
ctrl.parent_win = mw ctrl.parent_win = mw
mw.new_tab(ctrl) mw.new_tab(ctrl)
mw.set_active_tab(ctrl) mw.set_active_tab(ctrl)
mw.window.window.focus()
self.remove_groupchat(jid, account) self.remove_groupchat(jid, account)
def on_edit_account(self, widget, account): def on_edit_account(self, widget, account):