/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: 2019-07-06 22:13:13 UTC
  • Revision ID: teddy@recompile.se-20190706221313-uaoa5cup12s72rec
mandos-ctl: Update Emacs lisp test runner code

* mandos-ctl: Update Emacs lisp after-save-hook test runner to use
              file-local-name if available (i.e. Emacs 26), or to use
              file-remote-p if not (Emacs 25).  Either should be more
              general than the tramp-* functions were.  Also use
              process-file-shell-command instead of shell-command,
              which enables the use of the less intrusive
              display-buffer-in-side-window action function argument
              to display-buffer.  This stops the takeover of buffers
              (and/or disappearance of windows) when saving.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
1
 
#!/usr/bin/python3 -bb
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
59
59
domain = 'se.recompile'
60
60
server_interface = domain + '.Mandos'
61
61
client_interface = domain + '.Mandos.Client'
62
 
version = "1.8.8"
 
62
version = "1.8.4"
63
63
 
64
64
try:
65
65
    dbus.OBJECT_MANAGER_IFACE
628
628
                            path=path)
629
629
 
630
630
        self.refresh()
631
 
        self._input_callback_tag = (
632
 
            GLib.io_add_watch(
633
 
                GLib.IOChannel.unix_new(sys.stdin.fileno()),
634
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
635
 
                self.process_input))
 
631
        self._input_callback_tag = (GLib.io_add_watch
 
632
                                    (sys.stdin.fileno(),
 
633
                                     GLib.IO_IN,
 
634
                                     self.process_input))
636
635
        self.main_loop.run()
637
636
        # Main loop has finished, we should close everything now
638
637
        GLib.source_remove(self._input_callback_tag)