changeset bba1663fafb6 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bba1663fafb6 description: don't allow to do ctrl+r when roster is hidden. See #7315

diffstat:

data/gui/roster_window.ui | 1 + src/message_window.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r 3450c48ddb75 -r bba1663fafb6 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Wed Jan 29 22:10:48 2014 +0100 +++ b/data/gui/roster_window.ui Wed Feb 05 12:46:48 2014 +0100 @@ -319,6 +319,7 @@ <child> <object class="GtkCheckMenuItem" id="show_roster_menuitem"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</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> diff -r 3450c48ddb75 -r bba1663fafb6 src/message_window.py --- a/src/message_window.py Wed Jan 29 22:10:48 2014 +0100 +++ b/src/message_window.py Wed Feb 05 12:46:48 2014 +0100 @@ -86,6 +86,8 @@ self.parent_paned = parent_paned self.notebook.reparent(self.parent_paned) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(True) orig_window.destroy() del orig_window

@@ -615,6 +617,8 @@ # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1261,6 +1265,8 @@ # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height'))