mirror of
https://github.com/gryf/wicd.git
synced 2025-12-20 04:48:00 +01:00
Fixed bug where preferences window sometimes wouldn't appear due to a problem with the wpacombobox.
This commit is contained in:
14
gui.py
14
gui.py
@@ -497,7 +497,7 @@ class NetworkEntry(gtk.Expander):
|
|||||||
gateway.set_text('.'.join(ip_parts[0:3]) + '.1')
|
gateway.set_text('.'.join(ip_parts[0:3]) + '.1')
|
||||||
|
|
||||||
if stringToNone(netmask.get_text()) == None: # Make sure the netmask is blank
|
if stringToNone(netmask.get_text()) == None: # Make sure the netmask is blank
|
||||||
netmask.set_text('255.255.255.0') # Fill in the most common one
|
netmask.set_text('255.255.255.0') # Fill in the most common one
|
||||||
elif ipAddress != "":
|
elif ipAddress != "":
|
||||||
misc.error(None, "Invalid IP Address Entered.")
|
misc.error(None, "Invalid IP Address Entered.")
|
||||||
|
|
||||||
@@ -517,9 +517,7 @@ class NetworkEntry(gtk.Expander):
|
|||||||
else:
|
else:
|
||||||
self.checkboxStaticDNS.set_active(False)
|
self.checkboxStaticDNS.set_active(False)
|
||||||
|
|
||||||
#blankify stuff!
|
# This will properly disable unused boxes.
|
||||||
#this will properly disable
|
|
||||||
#unused boxes
|
|
||||||
self.toggleIPCheckbox()
|
self.toggleIPCheckbox()
|
||||||
self.toggleDNSCheckbox()
|
self.toggleDNSCheckbox()
|
||||||
self.toggleGlobalDNSCheckbox()
|
self.toggleGlobalDNSCheckbox()
|
||||||
@@ -959,7 +957,7 @@ class appGui:
|
|||||||
self.status_area.hide_all()
|
self.status_area.hide_all()
|
||||||
|
|
||||||
self.statusID = None
|
self.statusID = None
|
||||||
self.first_dialog_load = False
|
self.first_dialog_load = True
|
||||||
self.vpn_connection_pipe = None
|
self.vpn_connection_pipe = None
|
||||||
self.is_visible = True
|
self.is_visible = True
|
||||||
|
|
||||||
@@ -1077,10 +1075,10 @@ 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.
|
||||||
if not self.first_dialog_load:
|
wpadrivercombo = gtk.combo_box_new_text()
|
||||||
self.first_dialog_load = True
|
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")
|
||||||
wpadrivercombo = gtk.combo_box_new_text()
|
|
||||||
wpa_hbox.pack_end(wpadrivercombo)
|
wpa_hbox.pack_end(wpadrivercombo)
|
||||||
|
|
||||||
wpadrivers = ["hostap", "hermes", "madwifi", "atmel", "wext",
|
wpadrivers = ["hostap", "hermes", "madwifi", "atmel", "wext",
|
||||||
|
|||||||
Reference in New Issue
Block a user