=== modified file 'restricted-manager'
--- restricted-manager	2007-03-14 08:59:18 +0000
+++ restricted-manager	2007-03-14 11:12:50 +0000
@@ -36,6 +36,7 @@
 import os
 import sys
 import gettext
+from optparse import OptionParser
 
 import pygtk
 pygtk.require("2.0")
@@ -43,7 +44,6 @@
 import gobject
 import gtk
 import gtk.glade
-import gnome
 import pynotify
 
 import RestrictedManager
@@ -230,11 +230,14 @@
         return 1
 
 
-    if opts["update"]:
+    if opts.update:
         load_restricted_list(force=True)
-    elif opts["check"]:
-        handlers = get_handlers()
-
+    elif opts.list:
+        handlers = get_handlers()
+        for handler in handlers.values():
+            print handler.name
+    elif opts.check:
+        handlers = get_handlers()
         used = load_used_list()
         new = []
 
@@ -250,7 +253,7 @@
 
             Notification()
             gtk.main()
-    elif opts["check-composite"]:
+    elif opts.check_composite:
         handlers = get_handlers()
         try:
             handler = handlers["nvidia"]
@@ -266,32 +269,32 @@
     elif os.getuid() > 0:
         print >>sys.stderr, _("Must be run as root")
         return 1
-    elif opts["enable"]:
+    elif opts.enable:
         handlers = get_handlers()
         try:
-            handler = handlers[opts["enable"]]
+            handler = handlers[opts.enable]
         except KeyError:
-            print >>sys.stderr, _("Unknown module: %s") % opts["enable"]
+            print >>sys.stderr, _("Unknown module: %s") % opts.enable
             return 1
 
         if handler.is_enabled():
-            print >>sys.stderr, _("%s is already enabled") % opts["enable"]
+            print >>sys.stderr, _("%s is already enabled") % opts.enable
             return 1
 
         if ConfirmDialog(xml, handler, False).run() != gtk.RESPONSE_OK:
             return
 
         handler.enable()
-    elif opts["disable"]:
+    elif opts.disable:
         handlers = get_handlers()
         try:
-            handler = handlers[opts["disable"]]
+            handler = handlers[opts.disable]
         except KeyError:
-            print >>sys.stderr, "Unknown module: %s" % opts["disable"]
+            print >>sys.stderr, "Unknown module: %s" % opts.disable
             return 1
 
         if not handler.is_enabled():
-            print >>sys.stderr, "%s is already disabled" % opts["disable"]
+            print >>sys.stderr, "%s is already disabled" % opts.disable
             return 1
 
         if ConfirmDialog(xml, handler, True).run() != gtk.RESPONSE_OK:
@@ -304,21 +307,31 @@
         ManagerWindow(xml, handlers)
         gtk.main()
 
-
-options = [
-    ("update",  'u', None, None, 0, _("Update restricted modules list"), ""),
-    ("check",   'c', None, None, 0, _("Check for newly used restricted modules"), ""),
-    ("enable",  'e', str,  None, 0, _("Enable the named module"),        "MODULE"),
-    ("disable", 'd', str,  None, 0, _("Disable the named module"),       "MODULE"),
-    ("check-composite", "C", None,  None, 0, _("Check if there is a graphics driver available that supports composite and offer to enable it"), ""),
-    ]
-
+def get_opt_args():
+    parser = OptionParser()
+    parser.add_option ("-u", "--update", action="store_true",
+                       dest="update", default=False,
+                       help=_("Update restricted modules list"))
+    parser.add_option ("-c", "--check", action="store_true",
+                       dest="check", default=False,
+                       help=_("Check for newly used restricted modules"))
+    parser.add_option ("-l", "--list", action="store_true",
+                       dest="list", default=False,
+                       help=_("List available restricted modules"))
+    parser.add_option ("-C", "--check-composite", action="store_true",
+                       dest="check_composite", default=False,
+                       help=_("Check if there is a graphics driver available that supports composite and offer to enable it"))
+    parser.add_option ("-e", "--enable", type="string",
+                       dest="enable", default="", metavar="MODULE",
+                       help=_("Enable the named module"))
+    parser.add_option ("-d", "--disable", type="string",
+                       dest="disable", default="", metavar="MODULE",
+                       help=_("Disable the named module"))
+    return parser.parse_args()
 
 if __name__ == "__main__":
     gettext.textdomain("restricted-manager")
     #gettext.bindtextdomain("restricted-manager", "po/mo")
-    prog = gnome.init("restricted-manager", "0.6",
-                      gnome.libgnome_module_info_get(), sys.argv, options)
-    (args, opts) = prog.get_popt_args()
+    (opts,args) = get_opt_args()
 
     sys.exit(main(args, opts))