Changeset 9184

Timestamp:

12/20/07 04:40:27 (11 months ago)

Author:

nicfit

Message:

MessageWindow? reconfig bug fixes for deleted roster

Location:

trunk/src

Files:

• chat_control.py (modified) (1 diff)
• message_window.py (modified) (5 diffs)

trunk/src/chat_control.py

@@ -644 +644 @@
 
         def print_conversation_line(self, text, kind, name, tim,
-                other_tags_for_name = [], other_tags_for_time = [], 
+                other_tags_for_name = [], other_tags_for_time = [],
                 other_tags_for_text = [], count_as_new = True,
                 subject = None, old_kind = None, xhtml = None):

trunk/src/message_window.py

@@ -239 +239 @@
 
                 self.redraw_tab(control)
-                self.notebook.show_all()
+                if self.parent_paned:
+                        self.notebook.show_all()
+                else:
+                        self.window.show_all()
                 # NOTE: we do not call set_control_active(True) since we don't know whether
                 # the tab is the active one.
@@ -438 +441 @@
                                 child = self.parent_paned.get_child2()
                                 self.parent_paned.remove(child)
-                                # FIXME: restore preferred roster size
                         else:
                                 self.window.destroy()
@@ -926 +928 @@
                 for w in self.windows():
                         self.save_state(w, width_adjust)
-                        w.window.hide()
-                        w.window.destroy()
+                        if not w.parent_paned:
+                                w.window.hide()
+                                w.window.destroy()
+
                 gajim.interface.save_config()
 
@@ -994 +998 @@
                 controls = []
                 for w in self.windows():
-                        w.window.hide()
+                        # Note, we are taking care not to hide/delete the roster window when the
+                        # MessageWindow is embedded.
+                        if not w.parent_paned:
+                                w.window.hide()
                         while w.notebook.get_n_pages():
                                 page = w.notebook.get_nth_page(0)
@@ -1003 +1010 @@
                         # Must clear _controls from window to prevent MessageControl.shutdown calls
                         w._controls = {}
-                        w.window.destroy()
+                        if not w.parent_paned:
+                                w.window.destroy()
+                        else:
+                                # Don't close parent window, just remove the child
+                                child = w.parent_paned.get_child2()
+                                w.parent_paned.remove(child)
 
                 self._windows = {}