changeset 2d2309e64faf in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2d2309e64faf description: fix E2E / GPG information dialog and another information dialog transient_for property. Fixes #7185
diffstat:
src/chat_control.py | 4 ++-- src/dialogs.py | 5 +++-- src/message_window.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-)
diffs (57 lines):
diff -r 6048f6d82da2 -r 2d2309e64faf src/chat_control.py --- a/src/chat_control.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/chat_control.py Mon Sep 09 17:36:21 2013 +0200 @@ -2310,9 +2310,9 @@
def _on_authentication_button_clicked(self, widget): if self.gpg_is_active: - dialogs.GPGInfoWindow(self) + dialogs.GPGInfoWindow(self, self.parent_win.window) elif self.session and self.session.enable_encryption: - dialogs.ESessionInfoWindow(self.session) + dialogs.ESessionInfoWindow(self.session, self.parent_win.window)
def send_message(self, message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): diff -r 6048f6d82da2 -r 2d2309e64faf src/dialogs.py --- a/src/dialogs.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/dialogs.py Mon Sep 09 17:36:21 2013 +0200 @@ -5100,7 +5100,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, session): + def __init__(self, session, transient_for=None): self.session = session
self.xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') @@ -5111,7 +5111,7 @@ self.button_label = self.xml.get_object('button_label') self.window = self.xml.get_object('esession_info_window') self.update_info() - + self.window.set_transient_for(transient_for)
self.window.show_all()
@@ -5222,6 +5222,7 @@ path = gtkgui_helpers.get_icon_path(image, 32) security_image.set_from_file(path)
+ self.window.set_transient_for(transient_for) xml.connect_signals(self) self.window.show_all()
diff -r 6048f6d82da2 -r 2d2309e64faf src/message_window.py --- a/src/message_window.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/message_window.py Mon Sep 09 17:36:21 2013 +0200 @@ -219,7 +219,8 @@ dialogs.YesNoDialog( _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1) + checktext=_('_Do not ask me again'), on_response_yes=on_yes1, + transient_for=self.window) return True
def on_yes(ctrl):