/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: 2015-08-02 16:45:29 UTC
  • Revision ID: teddy@recompile.se-20150802164529-pemtk1agiqluoiua
Deprecate some D-Bus methods in favor of D-Bus properties.

The following D-Bus methods on the interface
"se.recompile.Mandos.Client" are redundant, and are therefore
deprecated:  "Disable", "Enable", "StartChecker", and "StopChecker".
Instead, the D-Bus properties "Enabled" and "CheckerRunning" should be
set, as was always also possible.

* DBUS-API (se.recompile.Mandos.Client.Disable): Remove; deprecated.
  (se.recompile.Mandos.Client.Enable): - '' -
  (se.recompile.Mandos.Client.StartChecker): - '' -
  (se.recompile.Mandos.Client.StopChecker): - '' -
* mandos (ClientDBus.Enable): Annotate as deprecated.
  (ClientDBus.StartChecker): - '' -
  (ClientDBus.Disable): - '' -
  (ClientDBus.StopChecker): - '' -
* mandos-monitor (MandosClientWidget.keypress): Set properties instead
                                                of calling deprecated
                                                methods.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1465
1465
        self.checked_ok()
1466
1466
    
1467
1467
    # Enable - method
 
1468
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1468
1469
    @dbus.service.method(_interface)
1469
1470
    def Enable(self):
1470
1471
        "D-Bus method"
1471
1472
        self.enable()
1472
1473
    
1473
1474
    # StartChecker - method
 
1475
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1474
1476
    @dbus.service.method(_interface)
1475
1477
    def StartChecker(self):
1476
1478
        "D-Bus method"
1477
1479
        self.start_checker()
1478
1480
    
1479
1481
    # Disable - method
 
1482
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1480
1483
    @dbus.service.method(_interface)
1481
1484
    def Disable(self):
1482
1485
        "D-Bus method"
1483
1486
        self.disable()
1484
1487
    
1485
1488
    # StopChecker - method
 
1489
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1486
1490
    @dbus.service.method(_interface)
1487
1491
    def StopChecker(self):
1488
1492
        self.stop_checker()
1524
1528
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1525
1529
    
1526
1530
    # Name - property
 
1531
    @dbus_annotations(
 
1532
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1527
1533
    @dbus_service_property(_interface, signature="s", access="read")
1528
1534
    def Name_dbus_property(self):
1529
1535
        return dbus.String(self.name)
1530
1536
    
1531
1537
    # Fingerprint - property
 
1538
    @dbus_annotations(
 
1539
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1532
1540
    @dbus_service_property(_interface, signature="s", access="read")
1533
1541
    def Fingerprint_dbus_property(self):
1534
1542
        return dbus.String(self.fingerprint)
1543
1551
        self.host = str(value)
1544
1552
    
1545
1553
    # Created - property
 
1554
    @dbus_annotations(
 
1555
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1546
1556
    @dbus_service_property(_interface, signature="s", access="read")
1547
1557
    def Created_dbus_property(self):
1548
1558
        return datetime_to_dbus(self.created)
1663
1673
            self.stop_checker()
1664
1674
    
1665
1675
    # ObjectPath - property
 
1676
    @dbus_annotations(
 
1677
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1666
1678
    @dbus_service_property(_interface, signature="o", access="read")
1667
1679
    def ObjectPath_dbus_property(self):
1668
1680
        return self.dbus_object_path # is already a dbus.ObjectPath
1669
1681
    
1670
1682
    # Secret = property
 
1683
    @dbus_annotations(
 
1684
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1685
         "invalidates"})
1671
1686
    @dbus_service_property(_interface,
1672
1687
                           signature="ay",
1673
1688
                           access="write",