/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

  • Committer: Teddy Hogeborn
  • Date: 2009-09-22 06:51:04 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090922065104-il56jyeb1qshfhiz
Restore some poor D-Bus methods who got a bit hastily deleted.  Enable
writing to the "last_checked_ok" property.

* mandos (ClientDBus.CheckedOK, ClientDBus.Enable,
          ClientDBus.StartChecker, ClientDBus.Disable,
          ClientDBus.StopChecker): Restored.
  (ClientDBus.last_checked_ok_dbus_property): Make writing to this
                                              property do
                                              "self.checked_ok()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
758
758
    ## D-Bus methods & signals
759
759
    _interface = u"se.bsnet.fukt.Mandos.Client"
760
760
    
 
761
    # CheckedOK - method
 
762
    @dbus.service.method(_interface)
 
763
    def CheckedOK(self):
 
764
        return self.checked_ok()
 
765
    
761
766
    # CheckerCompleted - signal
762
767
    @dbus.service.signal(_interface, signature=u"nxs")
763
768
    def CheckerCompleted(self, exitcode, waitstatus, command):
788
793
        "D-Bus signal"
789
794
        pass
790
795
    
 
796
    # Enable - method
 
797
    @dbus.service.method(_interface)
 
798
    def Enable(self):
 
799
        "D-Bus method"
 
800
        self.enable()
 
801
    
 
802
    # StartChecker - method
 
803
    @dbus.service.method(_interface)
 
804
    def StartChecker(self):
 
805
        "D-Bus method"
 
806
        self.start_checker()
 
807
    
 
808
    # Disable - method
 
809
    @dbus.service.method(_interface)
 
810
    def Disable(self):
 
811
        "D-Bus method"
 
812
        self.disable()
 
813
    
 
814
    # StopChecker - method
 
815
    @dbus.service.method(_interface)
 
816
    def StopChecker(self):
 
817
        self.stop_checker()
 
818
    
791
819
    # name - property
792
820
    @dbus_service_property(_interface, signature=u"s", access=u"read")
793
821
    def name_dbus_property(self):
833
861
            self.disable()
834
862
    
835
863
    # last_checked_ok - property
836
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
837
 
    def last_checked_ok_dbus_property(self):
 
864
    @dbus_service_property(_interface, signature=u"s",
 
865
                           access=u"readwrite")
 
866
    def last_checked_ok_dbus_property(self, value=None):
 
867
        if value is not None:
 
868
            self.checked_ok()
 
869
            return
838
870
        if self.last_checked_ok is None:
839
871
            return dbus.String(u"")
840
872
        return dbus.String(self._datetime_to_dbus(self
914
946
    def object_path_dbus_property(self):
915
947
        return self.dbus_object_path # is already a dbus.ObjectPath
916
948
    
917
 
    # secret = property xxx
 
949
    # secret = property
918
950
    @dbus_service_property(_interface, signature=u"ay",
919
951
                           access=u"write", byte_arrays=True)
920
952
    def secret_dbus_property(self, value):