Changeset 10090

Timestamp:

07/31/08 08:14:48 (4 months ago)

Author:

asterix

Message:

use PassphraseDialog? only asynchronously. see #4147

Location:

trunk/src

Files:

• config.py (modified) (2 diffs)
• dialogs.py (modified) (3 diffs)
• gajim.py (modified) (1 diff)
• roster_window.py (modified) (4 diffs)

trunk/src/config.py

@@ -2554 +2554 @@
                         if self.remove_and_unregister_radiobutton.get_active():
                                 if not gajim.connections[self.account].password:
-                                        passphrase = ''
+                                        def on_ok(passphrase, checked):
+                                                if passphrase == -1:
+                                                        # We don't remove account cause we canceled pw window
+                                                        return
+                                                gajim.connections[self.account].password = passphrase
+                                                gajim.connections[self.account].unregister_account(
+                                                        self._on_remove_success)
+
                                         w = dialogs.PassphraseDialog(
                                                 _('Password Required'),
                                                 _('Enter your password for account %s') % self.account,
-                                                _('Save password'))
-                                        passphrase, save = w.run()
-                                        if passphrase == -1:
-                                                # We don't remove account cause we canceled pw window
-                                                return
-                                        gajim.connections[self.account].password = passphrase
+                                                _('Save password'), ok_handler=on_ok)
+                                        return
                                 gajim.connections[self.account].unregister_account(
                                         self._on_remove_success)
@@ -2573 +2576 @@
                                 _('Account "%s" is connected to the server') % self.account,
                                 _('If you remove it, the connection will be lost.'),
-                                on_response_ok = remove)
+                                on_response_ok=remove)
                 else:
                         remove()

trunk/src/dialogs.py

@@ -200 +200 @@
 class PassphraseDialog:
         '''Class for Passphrase dialog'''
-        def run(self):
-                '''Wait for OK button to be pressed and return passphrase/password'''
-                rep = self.window.run()
-                if rep == gtk.RESPONSE_OK:
-                        passphrase = self.passphrase_entry.get_text().decode('utf-8')
-                else:
-                        passphrase = -1
-
-                if self.check:
-                        save_passphrase_checkbutton = self.xml.\
-                                get_widget('save_passphrase_checkbutton')
-                        checked = save_passphrase_checkbutton.get_active()
-                else:
-                        checked = False
-
-                self.window.destroy()
-                return passphrase, checked
-
-        def __init__(self, titletext, labeltext, checkbuttontext=None, is_modal=True,
-        ok_handler = None, cancel_handler = None):
+        def __init__(self, titletext, labeltext, checkbuttontext=None,
+        ok_handler=None, cancel_handler=None):
                 self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade')
                 self.window = self.xml.get_widget('passphrase_dialog')
@@ -230 +212 @@
 
                 self.cancel_handler = cancel_handler
-                self.is_modal = is_modal
-                if not is_modal and ok_handler is not None:
-                        self.ok_handler = ok_handler
-                        okbutton = self.xml.get_widget('ok_button')
-                        okbutton.connect('clicked', self.on_okbutton_clicked)
-                        cancelbutton = self.xml.get_widget('cancel_button')
-                        cancelbutton.connect('clicked', self.on_cancelbutton_clicked)
+                self.ok_handler = ok_handler
+                okbutton = self.xml.get_widget('ok_button')
+                okbutton.connect('clicked', self.on_okbutton_clicked)
+                cancelbutton = self.xml.get_widget('cancel_button')
+                cancelbutton.connect('clicked', self.on_cancelbutton_clicked)
 
                 self.xml.signal_autoconnect(self)
@@ -249 +229 @@
 
         def on_okbutton_clicked(self, widget):
+                if not self.ok_handler:
+                        return
+
                 passph = self.passphrase_entry.get_text().decode('utf-8')
 

trunk/src/gajim.py

@@ -1441 +1441 @@
                                 dialogs.PassphraseDialog(_('Wrong Passphrase'),
                                         _('Please retype your GPG passphrase or press Cancel.'),
-                                        is_modal=False, ok_handler=(_ok, count), cancel_handler=_cancel)
-
-                dialogs.PassphraseDialog(title, second,
-                        is_modal=False, ok_handler=(_ok, 0), cancel_handler=_cancel)
-
+                                        ok_handler=(_ok, count), cancel_handler=_cancel)
+
+                dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 0),
+                cancel_handler=_cancel)
 
         def handle_event_roster_info(self, account, array):

trunk/src/roster_window.py

@@ -1933 +1933 @@
                         gajim.interface.systray.change_status('connecting')
 
-        def send_status(self, account, status, txt, auto = False, to = None):
+        def send_status(self, account, status, txt, auto=False, to=None):
                 child_iterA = self._get_account_iter(account, self.model)
                 if status != 'offline':
@@ -1951 +1951 @@
                                                         correctly started (environment variable probably not \
                                                         correctly set)')
-                                        w = dialogs.PassphraseDialog(_('Password Required'), text,
-                                                _('Save password'))
-                                        passphrase, save = w.run()
-                                        if passphrase == -1:
+                                        def on_ok(passphrase, save):
+                                                gajim.connections[account].password = passphrase
+                                                if save:
+                                                        gajim.config.set_per('accounts', account, 'savepass', True)
+                                                        passwords.save_password(account, passphrase)
+                                                keyid = gajim.config.get_per('accounts', account, 'keyid')
+                                                if keyid and not gajim.connections[account].gpg:
+                                                        dialog = dialogs.WarningDialog(_('GPG is not usable'),
+                                                                _('You will be connected to %s without OpenPGP.') % \
+                                                                account)
+                                                self.send_status_continue(account, status, txt, auto, to)
+
+                                        def on_cancel():
                                                 if child_iterA:
                                                         self.model[child_iterA][0] = \
@@ -1961 +1970 @@
                                                         gajim.interface.systray.change_status('offline')
                                                 self.update_status_combobox()
-                                                return
-                                        gajim.connections[account].password = passphrase
-                                        if save:
-                                                gajim.config.set_per('accounts', account, 'savepass', True)
-                                                passwords.save_password(account, passphrase)
+
+                                        w = dialogs.PassphraseDialog(_('Password Required'), text,
+                                                _('Save password'), ok_handler=on_ok,
+                                                cancel_handler=on_cancel)
+                                        return
 
                                 keyid = gajim.config.get_per('accounts', account, 'keyid')
@@ -1972 +1981 @@
                                                 _('You will be connected to %s without OpenPGP.') % account)
 
+                self.send_status_continue(account, status, txt, auto, to)
+
+        def send_status_continue(self, account, status, txt, auto, to):
                 if gajim.account_is_connected(account):
                         if status == 'online' and gajim.interface.sleeper.getState() != \