diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index 805c9a7..7ff07d9 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -343,7 +343,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): return noneToBlankString(wireless.GetWirelessProperty(networkid, label)) # Ripped from netentry.py - def save_settings(self, networkid): + def save_settings(self): # Check encryption info if self.encryption_chkbox.get_state(): #print "setting encryption info..." @@ -358,11 +358,11 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): self.set_net_prop(x, noneToString(encryption_info[x]. get_edit_text())) elif not self.encryption_chkbox.get_state() and \ - wireless.GetWirelessProperty(networkid, "encryption"): + wireless.GetWirelessProperty(self.networkID, "encryption"): error(self.ui, self.overlay, language['enable_encryption']) return False else: - #print 'encryption is ' + str(wireless.GetWirelessProperty(networkid, + #print 'encryption is ' + str(wireless.GetWirelessProperty(self.networkID, # "encryption")) #print "no encryption specified..." self.set_net_prop("enctype", "None") @@ -372,9 +372,9 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): self.set_net_prop('use_settings_globally', True) else: self.set_net_prop('use_settings_globally', False) - wireless.RemoveGlobalEssidEntry(networkid) + wireless.RemoveGlobalEssidEntry(self.networkID) - wireless.SaveWirelessNetworkProfile(networkid) + wireless.SaveWirelessNetworkProfile(self.networkID) return True # More or less ripped from netentry.py diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 1b59b54..5237ea2 100644 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -726,10 +726,10 @@ class appGUI(): @wrap_exceptions() def idle_incr(self): theText = " " - #if self.special != None: - # theText += self.special if self.connecting: theText += "-- "+language['connecting']+' -- '+language["esc_to_cancel"] + else: + theText += "-- Press H or ? for Help" quit_note = ' -- '+language["press_to_quit"] self.footer1 = urwid.Text(str(self.incr) + theText+quit_note,wrap='clip') self.incr+=1 diff --git a/setup.py b/setup.py index da80ea5..2e08fb9 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ import subprocess # VERSIONNUMBER VERSION_NUM = '1.6.0' REVISION_NUM = 'unknown' -CURSES_REVNO = 'r270' +CURSES_REVNO = 'r271' try: if not os.path.exists('vcsinfo.py'):