]>
Commit | Line | Data |
---|---|---|
1 | PLD-specific: adapt to renamed dbus-c++ macros (which had too common names). | |
2 | --- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controller_adapter.h.orig 2017-03-12 20:34:36.412302472 +0100 | |
3 | +++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controller_adapter.h 2017-03-12 19:15:33.792356624 +0100 | |
4 | @@ -22,11 +22,11 @@ | |
5 | controller_adaptor() | |
6 | : ::DBus::InterfaceAdaptor("com.Intel.Thunderbolt1.controller") | |
7 | { | |
8 | - register_method(controller_adaptor, GetControllerID, _GetControllerID_stub); | |
9 | - register_method(controller_adaptor, IsInSafeMode, _IsInSafeMode_stub); | |
10 | - register_method(controller_adaptor, UpdateFirmware, _UpdateFirmware_stub); | |
11 | - register_method(controller_adaptor, GetCurrentNVMVersion, _GetCurrentNVMVersion_stub); | |
12 | - register_method(controller_adaptor, ReadFirmware, _ReadFirmware_stub); | |
13 | + DBus_register_method(controller_adaptor, GetControllerID, _GetControllerID_stub); | |
14 | + DBus_register_method(controller_adaptor, IsInSafeMode, _IsInSafeMode_stub); | |
15 | + DBus_register_method(controller_adaptor, UpdateFirmware, _UpdateFirmware_stub); | |
16 | + DBus_register_method(controller_adaptor, GetCurrentNVMVersion, _GetCurrentNVMVersion_stub); | |
17 | + DBus_register_method(controller_adaptor, ReadFirmware, _ReadFirmware_stub); | |
18 | } | |
19 | ||
20 | // The introspection API changed from DBus-C++ library version 0.5 to | |
21 | --- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controllers_adapter.h.orig 2017-01-19 15:35:27.000000000 +0100 | |
22 | +++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controllers_adapter.h 2017-03-12 20:40:15.498965263 +0100 | |
23 | @@ -21,7 +21,7 @@ | |
24 | controllers_adaptor() | |
25 | : ::DBus::InterfaceAdaptor("com.Intel.Thunderbolt1.controllers") | |
26 | { | |
27 | - register_method(controllers_adaptor, GetControllerList, _GetControllerList_stub); | |
28 | + DBus_register_method(controllers_adaptor, GetControllerList, _GetControllerList_stub); | |
29 | } | |
30 | ||
31 | // The introspection API changed from DBus-C++ library version 0.5 to | |
32 | --- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/logind_manager_proxy.h.orig 2017-01-19 15:35:27.000000000 +0100 | |
33 | +++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/logind_manager_proxy.h 2017-03-12 21:00:03.842285033 +0100 | |
34 | @@ -45,8 +45,8 @@ | |
35 | _shutdown_cb(shutdown_cb), | |
36 | _sleep_cb(sleep_cb) | |
37 | { | |
38 | - connect_signal(LogindManagerProxy, PrepareForShutdown, PrepareForShutdownCb); | |
39 | - connect_signal(LogindManagerProxy, PrepareForSleep, PrepareForSleepCb); | |
40 | + DBus_connect_signal(LogindManagerProxy, PrepareForShutdown, PrepareForShutdownCb); | |
41 | + DBus_connect_signal(LogindManagerProxy, PrepareForSleep, PrepareForSleepCb); | |
42 | }; | |
43 | ||
44 | private: |