Philipp Hörist pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/dialogs.py
    ... ... @@ -230,7 +230,7 @@ class PassphraseDialog:
    230 230
         Class for Passphrase dialog
    
    231 231
         """
    
    232 232
         def __init__(self, titletext, labeltext, checkbuttontext=None,
    
    233
    -    ok_handler=None, cancel_handler=None):
    
    233
    +    ok_handler=None, cancel_handler=None, transient_for=None):
    
    234 234
             self.xml = gtkgui_helpers.get_gtk_builder('passphrase_dialog.ui')
    
    235 235
             self.window = self.xml.get_object('passphrase_dialog')
    
    236 236
             self.passphrase_entry = self.xml.get_object('passphrase_entry')
    
    ... ... @@ -248,7 +248,9 @@ class PassphraseDialog:
    248 248
             cancelbutton.connect('clicked', self.on_cancelbutton_clicked)
    
    249 249
     
    
    250 250
             self.xml.connect_signals(self)
    
    251
    -        self.window.set_transient_for(app.interface.roster.window)
    
    251
    +        if transient_for is None:
    
    252
    +            transient_for = app.app.get_active_window()
    
    253
    +        self.window.set_transient_for(transient_for)
    
    252 254
             self.window.show_all()
    
    253 255
     
    
    254 256
             self.check = bool(checkbuttontext)
    
    ... ... @@ -1856,15 +1858,13 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog):
    1856 1858
         """
    
    1857 1859
     
    
    1858 1860
         def __init__(self, pritext, sectext='', radiotext1='', radiotext2='',
    
    1859
    -    on_response_ok=None, on_response_cancel=None, is_modal=True):
    
    1861
    +    on_response_ok=None, on_response_cancel=None, is_modal=True, transient_for=None):
    
    1860 1862
             self.user_response_ok = on_response_ok
    
    1861 1863
             self.user_response_cancel = on_response_cancel
    
    1862 1864
     
    
    1863
    -        if hasattr(app.interface, 'roster') and app.interface.roster:
    
    1864
    -            parent = app.interface.roster.window
    
    1865
    -        else:
    
    1866
    -            parent = None
    
    1867
    -        HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION,
    
    1865
    +        if transient_for is None:
    
    1866
    +            transient_for = app.app.get_active_window()
    
    1867
    +        HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION,
    
    1868 1868
                     Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok,
    
    1869 1869
                     self.on_response_cancel)
    
    1870 1870