gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-30 18:32:28 +01:00
Code Issues Projects Releases Wiki Activity

merged lp:~adamblackburn/wicd/1.6-cancel-edit-settings to allow canceling the edit settings dialog that appears when attempting to connect to an encrypted network without entering the encryption details

Browse Source
This commit is contained in:
Adam Blackburn
2009-06-20 19:20:42 -05:00
parent 086ba48486 340f84613a
commit 162b344238
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wicd/gui.py
View File

@@ -642,7 +642,7 @@ class appGui(object):
for entry_info in encryption_info.itervalues(): for entry_info in encryption_info.itervalues():
if entry_info[0].entry.get_text() == "" and \ if entry_info[0].entry.get_text() == "" and \
entry_info[1] == 'required': entry_info[1] == 'required':
error(self, "%s (%s)" % (language['encrypt_info_missing'], error(self.window, "%s (%s)" % (language['encrypt_info_missing'],
entry_info[0].label.get_label()) entry_info[0].label.get_label())
) )
return False return False
@@ -667,23 +667,27 @@ class appGui(object):
def handler(*args): def handler(*args):
self._connect_thread_started = True self._connect_thread_started = True
cancel_button = self.wTree.get_widget("cancel_button") def setup_interface_for_connection():
cancel_button.set_sensitive(True) cancel_button = self.wTree.get_widget("cancel_button")
self.network_list.set_sensitive(False) cancel_button.set_sensitive(True)
if self.statusID: self.network_list.set_sensitive(False)
gobject.idle_add(self.status_bar.remove, 1, self.statusID) if self.statusID:
gobject.idle_add(self.set_status, language["disconnecting_active"]) gobject.idle_add(self.status_bar.remove, 1, self.statusID)
gobject.idle_add(self.status_area.show_all) gobject.idle_add(self.set_status, language["disconnecting_active"])
self.wait_for_events() gobject.idle_add(self.status_area.show_all)
self._connect_thread_started = False self.wait_for_events()
self._connect_thread_started = False
if nettype == "wireless": if nettype == "wireless":
if not self.check_encryption_valid(networkid, if not self.check_encryption_valid(networkid,
networkentry.advanced_dialog): networkentry.advanced_dialog):
self.edit_advanced(None, nettype, networkid, networkentry) self.edit_advanced(None, nettype, networkid, networkentry)
return False return False
setup_interface_for_connection()
wireless.ConnectWireless(networkid, reply_handler=handler, wireless.ConnectWireless(networkid, reply_handler=handler,
error_handler=handler) error_handler=handler)
elif nettype == "wired": elif nettype == "wired":
setup_interface_for_connection()
wired.ConnectWired(reply_handler=handler, error_handler=handler) wired.ConnectWired(reply_handler=handler, error_handler=handler)
gobject.source_remove(self.update_cb) gobject.source_remove(self.update_cb)