Author: nicfit Date: 2007-12-18 03:07:49 +0100 (Tue, 18 Dec 2007) New Revision: 9168

Modified: branches/one_window/src/message_window.py branches/one_window/src/roster_window.py Log: Disable hiding roster when there are no message controls open

Modified: branches/one_window/src/message_window.py =================================================================== --- branches/one_window/src/message_window.py 2007-12-18 01:40:59 UTC (rev 9167) +++ branches/one_window/src/message_window.py 2007-12-18 02:07:49 UTC (rev 9168) @@ -772,7 +772,7 @@ def has_window(self, jid, acct): return self.get_window(jid, acct) != None

- def one_window_opened(self, contact, acct, type): + def one_window_opened(self, contact=None, acct=None, type=None): try: return self._windows[self._mode_to_key(contact, acct, type)] != None except KeyError:

Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-18 01:40:59 UTC (rev 9167) +++ branches/one_window/src/roster_window.py 2007-12-18 02:07:49 UTC (rev 9168) @@ -4673,13 +4673,17 @@ def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. if (gajim.config.get('one_message_window') == 'always_with_roster' and - gajim.interface.msg_win_mgr.one_window_opened(None, None, None)): + gajim.interface.msg_win_mgr.one_window_opened()): self.xml.get_widget('show_roster_menuitem').show() else: self.xml.get_widget('show_roster_menuitem').hide()

def on_show_roster_menuitem_toggled(self, widget): - self.show_roster(widget.get_active()) + # when num controls is 0 this menuitem is hidden, but still need to + # disable keybinding + if (gajim.config.get('one_message_window') == 'always_with_roster' and + gajim.interface.msg_win_mgr.one_window_opened()): + self.show_roster(widget.get_active())

def show_roster(self, active): if active: @@ -5234,7 +5238,7 @@

if gajim.config.get('one_message_window') == 'always_with_roster': # always_with_roster mode defers to the MessageWindow - if not gajim.interface.msg_win_mgr.one_window_opened(None, None, None): + if not gajim.interface.msg_win_mgr.one_window_opened(): # No MessageWindow to defer to self.window.set_title('Gajim') return