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

Merge branch 'issue-8548-master' into 'master'

Browse source 
Fix issue #8548 on master: Do not close chat window on ESC key when roster filtering is active

Closes #8548

See merge request !74
This commit is contained in:
Philipp Hörist 2017-03-25 17:23:51 +01:00
commit fbb19c5c50
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/roster_window.py
View file

@ -3805,7 +3805,7 @@ class RosterWindow:
if event.keyval == Gdk.KEY_Escape: if event.keyval == Gdk.KEY_Escape:
if self.rfilter_enabled: if self.rfilter_enabled:
self.disable_rfilter() self.disable_rfilter()
return return True
if gajim.interface.msg_win_mgr.mode == \ if gajim.interface.msg_win_mgr.mode == \
MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \ MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \
gajim.interface.msg_win_mgr.one_window_opened(): gajim.interface.msg_win_mgr.one_window_opened():