From 80b9359ad3735dbf010dfe5eda992bd979604533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 4 Nov 2014 19:56:32 +0100
Subject: UpstartWrapper: use upstart defined values for proxy name, path and
 interface

(bzr r3884.5.2)
---
 unity-shared/UpstartWrapper.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'unity-shared')

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)
-- 
cgit v1.2.3