/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: Björn Påhlsson
  • Date: 2011-10-02 19:18:24 UTC
  • mto: This revision was merged to the branch mainline in revision 505.
  • Revision ID: belorn@fukt.bsnet.se-20111002191824-eweh4pvneeg3qzia
transitional stuff actually working
documented change to D-Bus API

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
644
644
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
645
                                   + interface_name + "."
646
646
                                   + property_name)
 
647
 
647
648
    
648
649
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
649
650
                         out_signature="v")
949
950
    
950
951
    ## D-Bus methods, signals & properties
951
952
    _interface = "se.bsnet.fukt.Mandos.Client"
952
 
    
 
953
 
953
954
    ## Signals
954
955
    
955
956
    # CheckerCompleted - signal
1934
1935
    # End of Avahi example code
1935
1936
    if use_dbus:
1936
1937
        try:
1937
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1938
 
                                            bus, do_not_queue=True)
1939
 
            bus_name_transitional = dbus.service.BusName("se.bsnet.fukt.Mandos",
1940
 
                                                         bus, do_not_queue=True)
 
1938
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1939
                                            bus, do_not_queue=True)
 
1940
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
 
1941
                                            bus, do_not_queue=True)
1941
1942
        except dbus.exceptions.NameExistsException as e:
1942
1943
            logger.error(unicode(e) + ", disabling D-Bus")
1943
1944
            use_dbus = False