Merge one_window branch

Merged revisions 9143,9145-9155,9157-9162,9164-9169,9171-9177 via svnmerge from
svn://88.191.11.156/gajim/branches/one_window

........
  r9145 | nicfit | 2007-12-13 21:49:09 -0700 (Thu, 13 Dec 2007) | 2 lines

  Implemented the original Nikos patch with an HPaned instead of a HBox and only do this mode when one_message_window == 'always'
........
  r9152 | nicfit | 2007-12-15 13:33:56 -0700 (Sat, 15 Dec 2007) | 2 lines

  Added config and GUI for one_message_window_with_roster
........
  r9153 | nicfit | 2007-12-15 13:41:46 -0700 (Sat, 15 Dec 2007) | 2 lines

  Use one_message_window_with_roster and some whitespace cleanup
........
  r9154 | nicfit | 2007-12-15 14:04:49 -0700 (Sat, 15 Dec 2007) | 2 lines

  Scratch the chckbox for with roster mode, use one_message_window opt and combo
........
  r9155 | nicfit | 2007-12-15 17:01:13 -0700 (Sat, 15 Dec 2007) | 2 lines

  MessageWindowMgr knows about ONE_MESSAGE_WINDOW_ALWAYS_WITH_ROSTER and MessageWindow can reparent itself rather then the roster having to do so.
........
  r9157 | nicfit | 2007-12-15 17:47:20 -0700 (Sat, 15 Dec 2007) | 2 lines

  Resizing fixes and make the roster window shrink when last tab is removed
........
  r9158 | nicfit | 2007-12-15 19:15:11 -0700 (Sat, 15 Dec 2007) | 2 lines

  Added "Show roster" (CTRL+R) to view menu when using always_with_roster to quickly hide/show the roster.
........
  r9159 | nicfit | 2007-12-15 19:49:30 -0700 (Sat, 15 Dec 2007) | 2 lines

  Handle window title setting in always_with_roster mode.
........
  r9160 | nicfit | 2007-12-15 20:13:57 -0700 (Sat, 15 Dec 2007) | 2 lines

  Removed FIXME
........
  r9167 | nicfit | 2007-12-17 18:40:59 -0700 (Mon, 17 Dec 2007) | 2 lines

  When roster is hidden, show it when the number of MessageWindow controls == 0
........
  r9168 | nicfit | 2007-12-17 19:07:49 -0700 (Mon, 17 Dec 2007) | 2 lines

  Disable hiding roster when there are no message controls open
........
  r9169 | nicfit | 2007-12-17 20:41:11 -0700 (Mon, 17 Dec 2007) | 2 lines

  Bunch of saved size bugs fixed
........

data/glade/roster_window.glade

@@ -230,6 +230,17 @@
                         <signal name="activate" handler="on_show_transports_menuitem_activate"/>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="show_roster_menuitem">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Show _roster</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" handler="on_show_roster_menuitem_toggled"/>
+                        <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                      </widget>
+                    </child>
                     <child>
                       <widget class="GtkSeparatorMenuItem" id="separator3">
                         <property name="visible">True</property>
@@ -351,6 +362,15 @@
             <property name="fill">False</property>
           </packing>
         </child>
+        <child>
+          <widget class="GtkHPaned" id="roster_hpaned">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <widget class="GtkVBox" id="roster_vbox2">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <widget class="GtkScrolledWindow" id="scrolledwindow">
                     <property name="visible">True</property>
@@ -377,9 +397,6 @@
                       </widget>
                     </child>
                   </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
                 </child>
                 <child>
                   <widget class="GtkComboBox" id="status_combobox">
@@ -388,7 +405,21 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-            <property name="position">2</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
           </packing>
         </child>
       </widget>

src/common/config.py

@@ -45,7 +45,7 @@ opt_int = [ 'integer', 0 ]
 opt_str = [ 'string', 0 ]
 opt_bool = [ 'boolean', 0 ]
 opt_color = [ 'color', '^(#[0-9a-fA-F]{6})|()$' ]
-opt_one_window_types = ['never', 'always', 'peracct', 'pertype']
+opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype']
 opt_treat_incoming_messages = ['', 'chat', 'normal']
 
 class Config:
@@ -229,7 +229,7 @@ class Config:
 		'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')],
 		'one_message_window': [opt_str, 'always',
 #always, never, peracct, pertype should not be translated
-			_('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect.')],
+			_('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window.')],
 		'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')],
 		'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')],
 		'compact_view': [opt_bool, False, _('Hides the buttons in chat windows.')],

src/config.py

@@ -6,6 +6,7 @@
 ## Copyright (C) 2003-2005 Vincent Hanquez <tab@snarc.org>
 ## Copyright (C) 2006 Stefan Bethge <stefan@lanpartei.de>
 ## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de> 
+## Copyright (C) 2007 Travis Shirk <travis@pobox.com>
 ##
 ## This file is part of Gajim.
 ##

src/message_control.py

@@ -1,6 +1,6 @@
 ##	message_control.py
 ##
-## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
+## Copyright (C) 2006-2007 Travis Shirk <travis@pobox.com>
 ## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de> 
 ##
 ## This file is part of Gajim.
@@ -126,8 +126,8 @@ class MessageControl:
 			if self.session.enable_encryption:
 				was_encrypted = True
 
-			print "starting a new session, dropping the old one!"
+			gajim.connections[self.account].delete_session(self.session.jid,
-			gajim.connections[self.account].delete_session(self.session.jid, self.session.thread_id)
+									self.session.thread_id)
 
 		self.session = session
 

src/message_window.py

@@ -6,10 +6,9 @@
 ##                    Vincent Hanquez <tab@snarc.org>
 ##                    Nikos Kouremenos <kourem@gmail.com>
 ##                    Dimitur Kirov <dkirov@gmail.com>
-##                    Travis Shirk <travis@pobox.com>
 ##                    Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
+## Copyright (C) 2005-2007 Travis Shirk <travis@pobox.com>
-##                    Geobert Quach <geobert@gmail.com>
+## Copyright (C) 2006 Geobert Quach <geobert@gmail.com>
 ## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de> 
 ##
 ## This file is part of Gajim.
@@ -39,7 +38,7 @@ from common import gajim
 
 ####################
 
-class MessageWindow:
+class MessageWindow(object):
 	'''Class for windows which contain message like things; chats,
 	groupchats, etc.'''
 
@@ -54,7 +53,7 @@ class MessageWindow:
 		CLOSE_CTRL_KEY
 	) = range(5)
 
-	def __init__(self, acct, type):
+	def __init__(self, acct, type, parent_window=None, parent_paned=None):
 		# A dictionary of dictionaries where _contacts[account][jid] == A MessageControl
 		self._controls = {}
 		# If None, the window is not tied to any specific account
@@ -68,6 +67,18 @@ class MessageWindow:
 		self.widget_name = 'message_window'
 		self.xml = gtkgui_helpers.get_glade('%s.glade' % self.widget_name)
 		self.window = self.xml.get_widget(self.widget_name)
+		self.notebook = self.xml.get_widget('notebook')
+		self.parent_paned = None
+
+		if parent_window:
+			orig_window = self.window
+			self.window = parent_window
+			self.parent_paned = parent_paned
+			self.notebook.reparent(self.parent_paned)
+			self.parent_paned.pack2(self.notebook, resize=True, shrink=True)
+			orig_window.destroy()
+			del orig_window
+
 		id = self.window.connect('delete-event', self._on_window_delete)
 		self.handlers[id] = self.window
 		id = self.window.connect('destroy', self._on_window_destroy)
@@ -91,7 +102,6 @@ class MessageWindow:
 		self.window.add_events(gtk.gdk.POINTER_MOTION_MASK)
 		self.alignment = self.xml.get_widget('alignment')
 
-		self.notebook = self.xml.get_widget('notebook')
 		id = self.notebook.connect('switch-page',
 			self._on_notebook_switch_page)
 		self.handlers[id] = self.notebook
@@ -144,6 +154,9 @@ class MessageWindow:
 			n += len(dict)
 		return n
 
+	def resize(self, width, height):
+		gtkgui_helpers.resize_window(self.window, width, height)
+
 	def _on_window_focus(self, widget, event):
 		# window received focus, so if we had urgency REMOVE IT
 		# NOTE: we do not have to read the message (it maybe in a bg tab)
@@ -179,6 +192,8 @@ class MessageWindow:
 		for ctrl in self.controls():
 			ctrl.shutdown()
 		self._controls.clear()
+		# Clean up handlers connected to the parent window, this is important since
+		# self.window may be the RosterWindow
 		for i in self.handlers.keys():
 			if self.handlers[i].handler_is_connected(i):
 				self.handlers[i].disconnect(i)
@@ -211,7 +226,8 @@ class MessageWindow:
 		id = widget.connect('clicked', self._on_close_button_clicked, control)
 		control.handlers[id] = widget
 
-		id = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event, control.widget)
+		id = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event,
+					control.widget)
 		control.handlers[id] = tab_label_box
 		self.notebook.append_page(control.widget, tab_label_box)
 
@@ -341,10 +357,7 @@ class MessageWindow:
 				name += '/' + control.resource
 
 		window_mode = gajim.interface.msg_win_mgr.mode
-
+		if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
-		if self.get_num_controls() == 1:
-			label = name
-		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
 			# Show the plural form since number of tabs > 1
 			if self.type == 'chat':
 				label = _('Chats')
@@ -352,9 +365,16 @@ class MessageWindow:
 				label = _('Group Chats')
 			else:
 				label = _('Private Chats')
+		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+			label = None
+		elif self.get_num_controls() == 1:
+			label = name
 		else:
 			label = _('Messages')
-		title = _('%s - Gajim') % label
+
+		title = 'Gajim'
+		if label:
+			title = _('%s - %s') % (label, title)
 
 		if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT:
 			title = title + ": " + control.account
@@ -413,6 +433,12 @@ class MessageWindow:
 			gajim.interface.msg_win_mgr._on_window_destroy(self.window)
 			# dnd clean up
 			self.notebook.drag_dest_unset()
+			if self.parent_paned:
+				# Don't close parent window, just remove the child
+				child = self.parent_paned.get_child2()
+				self.parent_paned.remove(child)
+				# FIXME: restore preferred roster size
+			else:
 				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
@@ -598,8 +624,8 @@ class MessageWindow:
 	def _on_notebook_key_press(self, widget, event):
 		control = self.get_active_control()
 		# Ctrl+PageUP / DOWN has to be handled by notebook
-		if event.state & gtk.gdk.CONTROL_MASK and event.keyval in (
+		if (event.state & gtk.gdk.CONTROL_MASK and
-		gtk.keysyms.Page_Down, gtk.keysyms.Page_Up):
+				event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)):
 			return False
 		if isinstance(control, ChatControlBase):
 			# we forwarded it to message textview
@@ -679,36 +705,53 @@ class MessageWindow:
 		tab_label.disconnect(tab_label.dnd_handler)
 
 ################################################################################
-class MessageWindowMgr:
+class MessageWindowMgr(gobject.GObject):
 	'''A manager and factory for MessageWindow objects'''
+	__gsignals__ = {
+		'window-delete': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+	}
 
 	# These constants map to common.config.opt_one_window_types indices
 	(
 	ONE_MSG_WINDOW_NEVER,
 	ONE_MSG_WINDOW_ALWAYS,
+	ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER,
 	ONE_MSG_WINDOW_PERACCT,
-	ONE_MSG_WINDOW_PERTYPE
+	ONE_MSG_WINDOW_PERTYPE,
-	) = range(4)
+	) = range(5)
-	# A key constant for the main window for all messages
+	# A key constant for the main window in ONE_MSG_WINDOW_ALWAYS mode
 	MAIN_WIN = 'main'
+	# A key constant for the main window in ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER mode
+	ROSTER_MAIN_WIN = 'roster'
 
-	def __init__(self):
+	def __init__(self, parent_window, parent_paned):
 		''' A dictionary of windows; the key depends on the config:
 		ONE_MSG_WINDOW_NEVER: The key is the contact JID
 		ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
+		ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN
 		ONE_MSG_WINDOW_PERACCT: The key is the account name
 		ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
+		gobject.GObject.__init__(self)
 		self._windows = {}
+
 		# Map the mode to a int constant for frequent compares
 		mode = gajim.config.get('one_message_window')
 		self.mode = common.config.opt_one_window_types.index(mode)
 
+		self.parent_win = parent_window
+		self.parent_paned = parent_paned
+
 	def change_account_name(self, old_name, new_name):
 		for win in self.windows():
 			win.change_account_name(old_name, new_name)
 
 	def _new_window(self, acct, type):
-		win = MessageWindow(acct, type)
+		parent_win = None
+		parent_paned = None
+		if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+			parent_win = self.parent_win
+			parent_paned = self.parent_paned
+		win = MessageWindow(acct, type, parent_win, parent_paned)
 		# we track the lifetime of this window
 		win.window.connect('delete-event', self._on_window_delete)
 		win.window.connect('destroy', self._on_window_destroy)
@@ -729,7 +772,7 @@ class MessageWindowMgr:
 	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:
@@ -740,9 +783,13 @@ class MessageWindowMgr:
 		if not gajim.config.get('saveposition'):
 			return
 
-		if self.mode == self.ONE_MSG_WINDOW_ALWAYS:
+		if self.mode in (self.ONE_MSG_WINDOW_ALWAYS,
+				self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER):
 			size = (gajim.config.get('msgwin-width'),
 				gajim.config.get('msgwin-height'))
+			if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+				parent_size = win.window.get_size()
+				size = (parent_size[0] + size[0], size[1])
 		elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
 			size = (gajim.config.get_per('accounts', acct, 'msgwin-width'),
 				gajim.config.get_per('accounts', acct, 'msgwin-height'))
@@ -754,13 +801,13 @@ class MessageWindowMgr:
 			size = (gajim.config.get(opt_width), gajim.config.get(opt_height))
 		else:
 			return
-
+		win.resize(size[0], size[1])
-		gtkgui_helpers.resize_window(win.window, size[0], size[1])
 
 	def _position_window(self, win, acct, type):
 		'''Moves window according to config settings'''
-		if not gajim.config.get('saveposition') or\
+		if (not gajim.config.get('saveposition') or
-		self.mode == self.ONE_MSG_WINDOW_NEVER:
+		self.mode in [self.ONE_MSG_WINDOW_NEVER,
+				self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]):
 			return
 
 		if self.mode == self.ONE_MSG_WINDOW_ALWAYS:
@@ -782,21 +829,22 @@ class MessageWindowMgr:
 			key = acct + contact.jid
 			if resource:
 				key += '/' + resource
-		elif self.mode == self.ONE_MSG_WINDOW_ALWAYS:
-			key = self.MAIN_WIN
-		elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
-			key = acct
-		elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
-			key = type
 			return key
+		elif self.mode == self.ONE_MSG_WINDOW_ALWAYS:
+			return self.MAIN_WIN
+		elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+			return self.ROSTER_MAIN_WIN
+		elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
+			return acct
+		elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
+			return type
 
 	def create_window(self, contact, acct, type, resource = None):
-		key = None
 		win_acct = None
 		win_type = None
-		win_role = 'messages'
+		win_role = None  # X11 window role
 
-		key = self._mode_to_key(contact, acct, type, resource)
+		win_key = self._mode_to_key(contact, acct, type, resource)
 		if self.mode == self.ONE_MSG_WINDOW_PERACCT:
 			win_acct = acct
 			win_role = acct
@@ -806,13 +854,16 @@ class MessageWindowMgr:
 		elif self.mode == self.ONE_MSG_WINDOW_NEVER:
 			win_type = type
 			win_role = contact.jid
+		elif self.mode == self.ONE_MSG_WINDOW_ALWAYS:
+			win_role = 'messages'
 
 		win = None
 		try:
-			win = self._windows[key]
+			win = self._windows[win_key]
 		except KeyError:
 			win = self._new_window(win_acct, win_type)
 
+		if win_role:
 			win.window.set_role(win_role)
 
 		# Position and size window based on saved state and window mode
@@ -820,7 +871,7 @@ class MessageWindowMgr:
 			self._position_window(win, acct, type)
 			self._resize_window(win, acct, type)
 
-		self._windows[key] = win
+		self._windows[win_key] = win
 		return win
 
 	def change_key(self, old_jid, new_jid, acct):
@@ -842,6 +893,7 @@ class MessageWindowMgr:
 	def _on_window_destroy(self, win):
 		for k in self._windows.keys():
 			if self._windows[k].window == win:
+				self.emit('window-delete', self._windows[k])
 				del self._windows[k]
 				return
 
@@ -870,14 +922,14 @@ class MessageWindowMgr:
 			for c in w.controls():
 				yield c
 
-	def shutdown(self):
+	def shutdown(self, width_adjust=0):
 		for w in self.windows():
-			self.save_state(w)
+			self.save_state(w, width_adjust)
 			w.window.hide()
 			w.window.destroy()
 		gajim.interface.save_config()
 
-	def save_state(self, msg_win):
+	def save_state(self, msg_win, width_adjust=0):
 		if not gajim.config.get('saveposition'):
 			return
 
@@ -907,6 +959,9 @@ class MessageWindowMgr:
 			type = msg_win.type
 			size_width_key = type + '-msgwin-width'
 			size_height_key = type + '-msgwin-height'
+		elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+			# Ignore any hpaned width
+			width = msg_win.notebook.allocation.width
 
 		if acct:
 			gajim.config.set_per('accounts', acct, size_width_key, width)
@@ -917,6 +972,7 @@ class MessageWindowMgr:
 				gajim.config.set_per('accounts', acct, pos_y_key, y)
 
 		else:
+			width += width_adjust
 			gajim.config.set(size_width_key, width)
 			gajim.config.set(size_height_key, height)
 
@@ -944,8 +1000,7 @@ class MessageWindowMgr:
 				w.notebook.remove_page(0)
 				page.unparent()
 				controls.append(ctrl)
-			# Must clear _controls from window to prevent
+			# Must clear _controls from window to prevent MessageControl.shutdown calls
-			# MessageControl.shutdown calls
 			w._controls = {}
 			w.window.destroy()
 

src/remote_control.py

@@ -6,6 +6,7 @@
 ## Copyright (C) 2005-2006 Andrew Sayman <lorien420@myrealbox.com>
 ## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
 ## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
+## Copyright (C) 2007 Travis Shirk <travis@pobox.com> 
 ##
 ## This file is part of Gajim.
 ##

src/roster_window.py

@@ -3,6 +3,7 @@
 ##
 ## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
 ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
+##                         Travis Shirk <travis@pobox.com> 
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
 ## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
 ## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
@@ -1378,8 +1379,7 @@ class RosterWindow:
 				if contact.resource != '':
 					name += '/' + contact.resource
 				jid_with_resource = contact.jid + '/' + contact.resource
-				if gajim.interface.msg_win_mgr.has_window(jid_with_resource,
+				if gajim.interface.msg_win_mgr.has_window(jid_with_resource, account):
-				account):
 					win = gajim.interface.msg_win_mgr.get_window(jid_with_resource,
 						account)
 					ctrl = win.get_control(jid_with_resource, account)
@@ -2661,7 +2661,7 @@ class RosterWindow:
 		ctrl = gajim.interface.minimized_controls[account][jid]
 		mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, ctrl.account)
 		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.parent_win = mw
 		mw.new_tab(ctrl)
@@ -4252,6 +4252,7 @@ class RosterWindow:
 	def quit_gtkgui_interface(self):
 		'''When we quit the gtk interface :
 		tell that to the core and exit gtk'''
+		msgwin_width_adjust = 0
 		if gajim.config.get('saveposition'):
 			# in case show_roster_on_start is False and roster is never shown
 			# window.window is None
@@ -4260,12 +4261,21 @@ class RosterWindow:
 				gajim.config.set('roster_x-position', x)
 				gajim.config.set('roster_y-position', y)
 				width, height = self.window.get_size()
+				# For the width use the size of the vbox containing the tree and
+				# status combo, this will cancel out any hpaned width 
+				width = self.xml.get_widget('roster_vbox2').allocation.width
 				gajim.config.set('roster_width', width)
 				gajim.config.set('roster_height', height)
+				if not self.xml.get_widget('roster_vbox2').get_property('visible'):
+					# The roster vbox is hidden, so the message window is larger
+					# then we want to save (i.e. the window will grow every startup)
+					# so adjust.
+					msgwin_width_adjust = -1 * width
+
 
 		gajim.config.set('show_roster_on_startup',
 			self.window.get_property('visible'))
-		gajim.interface.msg_win_mgr.shutdown()
+		gajim.interface.msg_win_mgr.shutdown(msgwin_width_adjust)
 
 		gajim.config.set('collapsed_rows', '\t'.join(self.collapsed_rows))
 		gajim.interface.save_config()
@@ -4667,6 +4677,25 @@ class RosterWindow:
 		gajim.config.set('showoffline', not gajim.config.get('showoffline'))
 		self.draw_roster()
 
+	def on_view_menu_activate(self, widget):
+		# Hide the show roster menu if we are not in the right windowing mode.
+		if self.hpaned.get_child2() is not None:
+			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):
+		# when num controls is 0 this menuitem is hidden, but still need to
+		# disable keybinding
+		if self.hpaned.get_child2() is not None:
+			self.show_roster_vbox(widget.get_active())
+
+	def show_roster_vbox(self, active):
+		if active:
+			self.xml.get_widget('roster_vbox2').show()
+		else:
+			self.xml.get_widget('roster_vbox2').hide()
+
 	def set_renderer_color(self, renderer, style, set_background = True):
 		'''set style for treeview cell, using PRELIGHT system color'''
 		if set_background:
@@ -5209,8 +5238,17 @@ class RosterWindow:
 
 	def show_title(self):
 		change_title_allowed = gajim.config.get('change_roster_title')
+		if not change_title_allowed:
+			return
+
+		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():
+				# No MessageWindow to defer to
+				self.window.set_title('Gajim')
+			return
+
 		nb_unread = 0
-		if change_title_allowed:
 		start = ''
 		for account in gajim.connections:
 			# Count events in roster title only if we don't auto open them
@@ -5322,11 +5360,20 @@ class RosterWindow:
 		#self.xml.get_widget('menubar').hide()
 		return
 
+	def _on_message_window_delete(self, win_mgr, msg_win):
+		if gajim.config.get('one_message_window') == 'always_with_roster':
+			self.show_roster_vbox(True)
+			gtkgui_helpers.resize_window(self.window,
+				gajim.config.get('roster_width'),
+				gajim.config.get('roster_height'))
+
 	def __init__(self):
 		self.xml = gtkgui_helpers.get_glade('roster_window.glade')
 		self.window = self.xml.get_widget('roster_window')
+		self.hpaned = self.xml.get_widget('roster_hpaned')
 		self._music_track_changed_signal = None
-		gajim.interface.msg_win_mgr = MessageWindowMgr()
+		gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned)
+		gajim.interface.msg_win_mgr.connect('window-delete', self._on_message_window_delete)
 		self.advanced_menus = [] # We keep them to destroy them
 		if gajim.config.get('roster_window_skip_taskbar'):
 			self.window.set_property('skip-taskbar-hint', True)
@@ -5460,6 +5507,8 @@ class RosterWindow:
 		self.xml.get_widget('show_transports_menuitem').set_active(
 			show_transports_group)
 
+		self.xml.get_widget('show_roster_menuitem').set_active(True)
+
 		# columns
 
 		# this col has 3 cells:
@@ -5549,3 +5598,4 @@ class RosterWindow:
 
 		if sys.platform == 'darwin':
 			self.setup_for_osx()
+