diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-11-28 12:55:58 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-11-28 12:55:58 +0000 |
| commit | 32a6121119c526428ec117332efc980391999245 (patch) | |
| tree | cbef1c19baf88052a531dc8a7ee155605f4fb6da /unity-shared | |
| parent | 942223ad697542fddd69986764d178e084323093 (diff) | |
| parent | da6eae1661e5a762795ff439b0c78e4873529586 (diff) | |
PanelService: use gdbus to notfy upstart of service start/stop
This fixes a memory leak caused by the nih dbus proxy Fixes: #1302955 Approved by: Andrea Azzarone, PS Jenkins bot (bzr r3891)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/UpstartWrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unity-shared/UpstartWrapper.cpp b/unity-shared/UpstartWrapper.cpp index eda82399c..5ec3add22 100644 --- a/unity-shared/UpstartWrapper.cpp +++ b/unity-shared/UpstartWrapper.cpp @@ -20,6 +20,7 @@ #include "UpstartWrapper.h" #include <UnityCore/GLibDBusProxy.h> +#include <upstart/upstart-dbus.h> namespace unity { @@ -41,9 +42,8 @@ private: UpstartWrapper::Impl::Impl(bool test_mode) { - upstart_proxy_ = std::make_shared<unity::glib::DBusProxy>(test_mode ? "com.canonical.Unity.Test.Upstart" : "com.ubuntu.Upstart", - "/com/ubuntu/Upstart", - "com.ubuntu.Upstart0_6"); + upstart_proxy_ = std::make_shared<unity::glib::DBusProxy>(test_mode ? "com.canonical.Unity.Test.Upstart" : DBUS_SERVICE_UPSTART, + DBUS_PATH_UPSTART, DBUS_INTERFACE_UPSTART); } void UpstartWrapper::Impl::Emit(std::string const& name) |