Changeset 9168

Timestamp:

12/18/07 03:07:49 (10 months ago)

Author:

nicfit

Message:

Disable hiding roster when there are no message controls open

Location:

branches/one_window/src

Files:

• message_window.py (modified) (1 diff)
• roster_window.py (modified) (3 diffs)

branches/one_window/src/message_window.py

@@ -773 +773 @@
                 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

branches/one_window/src/roster_window.py

@@ -4674 +4674 @@
                 # 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:
@@ -4680 +4680 @@
 
         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):
@@ -5235 +5239 @@
                 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')