[commit-gajim] r9309 - trunk/src - Commits

6 Feb 2008

Author: asterix
Date: 2008-02-06 10:45:15 +0100 (Wed, 06 Feb 2008)
New Revision: 9309
Modified:
   trunk/src/message_window.py
Log:
always show tabs in one_window mode so that we can close latest tab in GUI. fixes #3720
Modified: trunk/src/message_window.py
===================================================================

--- trunk/src/message_window.py	2008-02-06 05:24:07 UTC (rev 9308)
+++ trunk/src/message_window.py	2008-02-06 09:45:15 UTC (rev 9309)
@@ -123,7 +123,9 @@
    	else:
    		nb_pos = gtk.POS_TOP
    	self.notebook.set_tab_pos(nb_pos)
-		if gajim.config.get('tabs_always_visible'):
+		window_mode = gajim.interface.msg_win_mgr.mode
+		if gajim.config.get('tabs_always_visible') or \
+		window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
    		self.notebook.set_show_tabs(True)
    		self.alignment.set_property('top-padding', 2)
    	else:
@@ -444,7 +446,9 @@
    			self.window.destroy()
    		return # don't show_title, we are dead
    	elif self.get_num_controls() == 1: # we are going from two tabs to one
-			show_tabs_if_one_tab = gajim.config.get('tabs_always_visible')
+			window_mode = gajim.interface.msg_win_mgr.mode
+			show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') or \
+				window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER
    		self.notebook.set_show_tabs(show_tabs_if_one_tab)
    		if not show_tabs_if_one_tab:
    			self.alignment.set_property('top-padding', 0)

    