/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-02-27 17:33:28 UTC
  • mfrom: (237.5.2 mandos-release)
  • Revision ID: teddy@fukt.bsnet.se-20110227173328-iobho8fi50761460
Merge fix for password-prompt/plymouth conflict from Björn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
51
51
domain = 'se.bsnet.fukt'
52
52
server_interface = domain + '.Mandos'
53
53
client_interface = domain + '.Mandos.Client'
54
 
version = "1.3.0"
 
54
version = "1.2.3"
55
55
 
56
56
# Always run in monochrome mode
57
57
urwid.curses_display.curses.has_colors = lambda : False
358
358
        """Handle keys.
359
359
        This overrides the method from urwid.FlowWidget"""
360
360
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface,
362
 
                              ignore_reply=True)
 
361
            self.proxy.Enable(dbus_interface = client_interface)
363
362
        elif key == "-":
364
 
            self.proxy.Disable(dbus_interface = client_interface,
365
 
                               ignore_reply=True)
 
363
            self.proxy.Disable(dbus_interface = client_interface)
366
364
        elif key == "a":
367
365
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
368
 
                               dbus_interface = client_interface,
369
 
                               ignore_reply=True)
 
366
                               dbus_interface = client_interface)
370
367
        elif key == "d":
371
368
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
372
 
                                  dbus_interface = client_interface,
373
 
                               ignore_reply=True)
 
369
                                  dbus_interface = client_interface)
374
370
        elif key == "R" or key == "_" or key == "ctrl k":
375
371
            self.server_proxy_object.RemoveClient(self.proxy
376
 
                                                  .object_path,
377
 
                                                  ignore_reply=True)
 
372
                                                  .object_path)
378
373
        elif key == "s":
379
 
            self.proxy.StartChecker(dbus_interface = client_interface,
380
 
                                    ignore_reply=True)
 
374
            self.proxy.StartChecker(dbus_interface = client_interface)
381
375
        elif key == "S":
382
 
            self.proxy.StopChecker(dbus_interface = client_interface,
383
 
                                   ignore_reply=True)
 
376
            self.proxy.StopChecker(dbus_interface = client_interface)
384
377
        elif key == "C":
385
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
386
 
                                 ignore_reply=True)
 
378
            self.proxy.CheckedOK(dbus_interface = client_interface)
387
379
        # xxx
388
380
#         elif key == "p" or key == "=":
389
381
#             self.proxy.pause()