wicd

Merge lp://staging/~adamblackburn/wicd/1.6-cancel-edit-settings into lp://staging/wicd/1.6

  1. 1.6-cancel-edit-settings
  2. Merge into experimental
Proposed by Adam Blackburn
Status: Merged
Approved by: Dan O'Reilly
Approved revision: 419
Merged at revision: not available
Proposed branch: lp://staging/~adamblackburn/wicd/1.6-cancel-edit-settings
Merge into: lp://staging/wicd/1.6
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~adamblackburn/wicd/1.6-cancel-edit-settings
Reviewer Review Type Date Requested Status
Dan O'Reilly Approve
Review via email: mp+7717@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Blackburn (adamblackburn) wrote :

Allows for canceling the settings dialog without freezing the interface if the user clicks connect on a network that does not have the encryption information set and then cancels the settings dialog.

Revision history for this message
Dan O'Reilly (oreilldf) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wicd/gui.py'
2--- wicd/gui.py 2009-06-18 06:56:25 +0000
3+++ wicd/gui.py 2009-06-20 12:58:15 +0000
4@@ -642,7 +642,7 @@
5 for entry_info in encryption_info.itervalues():
6 if entry_info[0].entry.get_text() == "" and \
7 entry_info[1] == 'required':
8- error(self, "%s (%s)" % (language['encrypt_info_missing'],
9+ error(self.window, "%s (%s)" % (language['encrypt_info_missing'],
10 entry_info[0].label.get_label())
11 )
12 return False
13@@ -666,24 +666,28 @@
14 """ Initiates the connection process in the daemon. """
15 def handler(*args):
16 self._connect_thread_started = True
17-
18- cancel_button = self.wTree.get_widget("cancel_button")
19- cancel_button.set_sensitive(True)
20- self.network_list.set_sensitive(False)
21- if self.statusID:
22- gobject.idle_add(self.status_bar.remove, 1, self.statusID)
23- gobject.idle_add(self.set_status, language["disconnecting_active"])
24- gobject.idle_add(self.status_area.show_all)
25- self.wait_for_events()
26- self._connect_thread_started = False
27+
28+ def setup_interface_for_connection():
29+ cancel_button = self.wTree.get_widget("cancel_button")
30+ cancel_button.set_sensitive(True)
31+ self.network_list.set_sensitive(False)
32+ if self.statusID:
33+ gobject.idle_add(self.status_bar.remove, 1, self.statusID)
34+ gobject.idle_add(self.set_status, language["disconnecting_active"])
35+ gobject.idle_add(self.status_area.show_all)
36+ self.wait_for_events()
37+ self._connect_thread_started = False
38+
39 if nettype == "wireless":
40 if not self.check_encryption_valid(networkid,
41 networkentry.advanced_dialog):
42 self.edit_advanced(None, nettype, networkid, networkentry)
43 return False
44+ setup_interface_for_connection()
45 wireless.ConnectWireless(networkid, reply_handler=handler,
46 error_handler=handler)
47 elif nettype == "wired":
48+ setup_interface_for_connection()
49 wired.ConnectWired(reply_handler=handler, error_handler=handler)
50
51 gobject.source_remove(self.update_cb)

Subscribers

People subscribed via source and target branches

to status/vote changes: