Merged r336 of experimental-nacl.

curses/prefs_curses.py

@@ -177,7 +177,10 @@ class PrefsDialog(urwid.WidgetWrap):
 
         self.dhcp_header = urwid.Text(dhcp_header_t)
         self.dhcp_l = []
-        # Automatic
+
+        # Order of these is flipped in the actual interface,
+        # (2,3,1 -> dhcpcd, pump, dhclient), because dhclient often doesn't like
+        # to work on several distros.
         self.dhcp0  = urwid.RadioButton(self.dhcp_l,automatic_t)
         self.dhcp1  = DynRadioButton(self.dhcp_l,dhcp1_t)
         self.dhcp2  = DynRadioButton(self.dhcp_l,dhcp2_t)
@@ -199,7 +202,7 @@ class PrefsDialog(urwid.WidgetWrap):
         self.flush_l = [self.flush0,self.flush1,self.flush2]
 
         externalLB = urwid.ListBox([self.dhcp_header,
-                                    self.dhcp0,self.dhcp1,self.dhcp2,self.dhcp3,
+                                    self.dhcp0,self.dhcp2,self.dhcp3,self.dhcp1,
                                     _blank,
                                     self.wired_detect_header,
                                     self.wired0,self.wired1,self.wired2,

curses/wicd-curses.py

@@ -69,6 +69,9 @@ from optparse import OptionParser
 #from grp import getgrgid
 #from os import getgroups,system
 
+#import logging
+#import logging.handler
+
 CURSES_REVNO=wpath.curses_revision
 
 # Fix strings in wicd-curses
@@ -989,7 +992,7 @@ class appGUI():
 ########################################
 
 def main():
-    global ui
+    global ui, dlogger
     # We are _not_ python.
     misc.RenameProcess('wicd-curses')
 
@@ -1003,6 +1006,11 @@ def main():
         import urwid.curses_display
         ui = urwid.curses_display.Screen()
 
+    #if options.debug:
+    #    dlogger = logging.getLogger("Debug")
+    #    dlogger.setLevel(logging.DEBUG)
+    #    dlogger.debug("wicd-curses debug logging started")
+
     # Default Color scheme.
     # Other potential color schemes can be found at:
     # http://excess.org/urwid/wiki/RecommendedPalette
@@ -1033,6 +1041,7 @@ def main():
     urwid.set_encoding('utf8')
     ui.run_wrapper(run)
 
+@wrap_exceptions
 def run():
     global loop
     loop = gobject.MainLoop()
@@ -1087,10 +1096,12 @@ setup_dbus()
 ########################################
 if __name__ == '__main__':
     parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello()))
-    parser.set_defaults(screen='raw')
+    parser.set_defaults(screen='raw',debug=False)
     parser.add_option("-r", "--raw-screen",action="store_const",const='raw'
             ,dest='screen',help="use urwid's raw screen controller (default)")
     parser.add_option("-c", "--curses-screen",action="store_const",const='curses',dest='screen',help="use urwid's curses screen controller")
+    parser.add_option("-d", "--debug",action="store_true"
+            ,dest='debug',help="enable logging of wicd-curses (currently does nothing)")
     (options,args) = parser.parse_args()
     main()
     # Make sure that the terminal does not try to overwrite the last line of