gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 21:08:06 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug where wpa_supplicant driver wasn't being set properly in the preferences window.

Browse Source
This commit is contained in:
imdano
2008-03-18 10:21:32 +00:00
parent eb5e9f49cc
commit 9f9ac65687
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gui.py
View File

@@ -1283,28 +1283,31 @@ class appGui:
self.set_label("pref_driver_label", language['wpa_supplicant_driver'] + self.set_label("pref_driver_label", language['wpa_supplicant_driver'] +
':') ':')
# Hack to get the combo box we need, which you can't do with glade. # Hack to get the combo box we need, which you can't do with glade.
wpadrivercombo = gtk.combo_box_new_text()
if self.first_dialog_load:
self.first_dialog_load = False
wpa_hbox = self.wTree.get_widget("hbox_wpa") wpa_hbox = self.wTree.get_widget("hbox_wpa")
if not self.first_dialog_load:
wpa_hbox.remove(self.wpadrivercombo)
else:
self.first_dialog_load = False
self.wpadrivercombo = gtk.combo_box_new_text()
wpadrivercombo = self.wpadrivercombo # Just to make my life easier
wpa_hbox.pack_end(wpadrivercombo) wpa_hbox.pack_end(wpadrivercombo)
wpadrivers = ["hostap", "hermes", "madwifi", "atmel", "wext", wpadrivers = ["hostap", "hermes", "madwifi", "atmel", "wext",
"ndiswrapper", "broadcom", "ipw", "ralink legacy"] "ndiswrapper", "broadcom", "ipw", "ralink legacy"]
i = 0
found = False found = False
for x in wpadrivers: for i, x in enumerate(wpadrivers):
if x == daemon.GetWPADriver() and not found: if x == daemon.GetWPADriver() and not found:
found = True found = True
elif not found: user_driver_index = i
i += 1
wpadrivercombo.append_text(x) wpadrivercombo.append_text(x)
# Set the active choice here. Doing it before all the items are # Set the active choice here. Doing it before all the items are
# added the combobox causes the choice to be reset. # added the combobox causes the choice to be reset.
wpadrivercombo.set_active(i) if found:
if not found: wpadrivercombo.set_active(user_driver_index)
else:
# Use wext as default, since normally it is the correct driver. # Use wext as default, since normally it is the correct driver.
wpadrivercombo.set_active(4) wpadrivercombo.set_active(4)
@@ -1356,7 +1359,6 @@ class appGui:
dns3Entry.get_text()) dns3Entry.get_text())
daemon.SetWirelessInterface(entryWirelessInterface.get_text()) daemon.SetWirelessInterface(entryWirelessInterface.get_text())
daemon.SetWiredInterface(entryWiredInterface.get_text()) daemon.SetWiredInterface(entryWiredInterface.get_text())
print "setting: " + wpadrivers[wpadrivercombo.get_active()]
daemon.SetWPADriver(wpadrivers[wpadrivercombo.get_active()]) daemon.SetWPADriver(wpadrivers[wpadrivercombo.get_active()])
wired.SetAlwaysShowWiredInterface(wiredcheckbox.get_active()) wired.SetAlwaysShowWiredInterface(wiredcheckbox.get_active())
daemon.SetAutoReconnect(reconnectcheckbox.get_active()) daemon.SetAutoReconnect(reconnectcheckbox.get_active())