Changeset 10145

Timestamp:

08/07/08 17:51:23 (4 weeks ago)

Author:

asterix

Message:

2 less blocking windows

Location:

trunk/src

Files:

• config.py (modified) (1 diff)
• gajim.py (modified) (1 diff)

trunk/src/config.py

@@ -1385 +1385 @@
                                         status_before)
 
+                        def on_yes(checked):
+                                relog()
+                        def on_no():
+                                if self.resend_presence:
+                                        self.resend()
                         self.dialog = dialogs.YesNoDialog(_('Relogin now?'),
                                 _('If you want all the changes to apply instantly, '
-                                'you must relogin.'))
-                        resp = self.dialog.get_response()
-                        if resp == gtk.RESPONSE_YES:
-                                relog()
-                        elif self.resend_presence:
-                                self.resend()
+                                'you must relogin.'), on_response_yes=on_yes, on_response_no=on_no)
                 elif self.resend_presence:
                         self.resend()

trunk/src/gajim.py

@@ -1856 +1856 @@
 
         def handle_event_zc_name_conflict(self, account, data):
-                dlg = dialogs.InputDialog(_('Username Conflict'),
-                        _('Please type a new username for your local account'),
-                        is_modal = True)
-                dlg.input_entry.set_text(data)
-                response = dlg.get_response()
-                if response == gtk.RESPONSE_OK:
-                        new_name = dlg.input_entry.get_text()
+                def on_ok(new_name):
                         gajim.config.set_per('accounts', account, 'name', new_name)
                         status = gajim.connections[account].status
                         gajim.connections[account].username = new_name
                         gajim.connections[account].change_status(status, '')
-                else:
+                def on_cancel():
                         gajim.connections[account].change_status('offline','')
+
+                dlg = dialogs.InputDialog(_('Username Conflict'),
+                        _('Please type a new username for your local account'), input_str=data,
+                        is_modal=True, ok_handler=on_ok, cancel_handler=on_cancel)
 
         def handle_event_ping_sent(self, account, contact):