copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MessageWindow reconfig bug fixes for deleted roster

This commit is contained in:
Travis Shirk 2007-12-20 03:40:27 +00:00
parent 1a7b1672a7
commit 4bedeec964
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -643,7 +643,7 @@ class ChatControlBase(MessageControl):
self.orig_msg = None self.orig_msg = None
def print_conversation_line(self, text, kind, name, tim, 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, other_tags_for_text = [], count_as_new = True,
subject = None, old_kind = None, xhtml = None): subject = None, old_kind = None, xhtml = None):
'''prints 'chat' type messages''' '''prints 'chat' type messages'''

24
src/message_window.py
View File

@ -238,7 +238,10 @@ class MessageWindow(object):
self.setup_tab_dnd(control.widget) self.setup_tab_dnd(control.widget)
self.redraw_tab(control) 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 # NOTE: we do not call set_control_active(True) since we don't know whether
# the tab is the active one. # the tab is the active one.
self.show_title() self.show_title()
@ -437,7 +440,6 @@ class MessageWindow(object):
# Don't close parent window, just remove the child # Don't close parent window, just remove the child
child = self.parent_paned.get_child2() child = self.parent_paned.get_child2()
self.parent_paned.remove(child) self.parent_paned.remove(child)
# FIXME: restore preferred roster size
else: else:
self.window.destroy() self.window.destroy()
return # don't show_title, we are dead return # don't show_title, we are dead
@ -925,8 +927,10 @@ class MessageWindowMgr(gobject.GObject):
def shutdown(self, width_adjust=0): def shutdown(self, width_adjust=0):
for w in self.windows(): for w in self.windows():
self.save_state(w, width_adjust) self.save_state(w, width_adjust)
w.window.hide() if not w.parent_paned:
w.window.destroy() w.window.hide()
w.window.destroy()
gajim.interface.save_config() gajim.interface.save_config()
def save_state(self, msg_win, width_adjust=0): def save_state(self, msg_win, width_adjust=0):
@ -993,7 +997,10 @@ class MessageWindowMgr(gobject.GObject):
controls = [] controls = []
for w in self.windows(): 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(): while w.notebook.get_n_pages():
page = w.notebook.get_nth_page(0) page = w.notebook.get_nth_page(0)
ctrl = w._widget_to_control(page) ctrl = w._widget_to_control(page)
@ -1002,7 +1009,12 @@ class MessageWindowMgr(gobject.GObject):
controls.append(ctrl) controls.append(ctrl)
# Must clear _controls from window to prevent MessageControl.shutdown calls # Must clear _controls from window to prevent MessageControl.shutdown calls
w._controls = {} 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 = {} self._windows = {}