← Back to branch summary

~jbicha/unity/dont-recommend-uoa

« back to all changes in this revision

Viewing changes to unity-shared/UpstartWrapper.cpp

  • Committer: Bileto Bot
  • Author(s): Dimitri John Ledkov
  • Date: 2017-04-25 17:57:44 UTC
  • mfrom: (4228.3.1 unity)
  • Revision ID: ci-train-bot@canonical.com-20170425175744-e6pd0sdut5mh1j6f
Drop libupstart-dev dependency, and simply include verbantim dbus object paths.

Approved by: Marco Trevisan (Treviño)

Show diffs side-by-side

added added

removed removed

Lines of Context:
unity-shared/UpstartWrapper.cpp
20
20
#include "UpstartWrapper.h"
21
21
 
22
22
#include <UnityCore/GLibDBusProxy.h>
23
 
#include <upstart/upstart-dbus.h>
24
23
 
25
24
namespace unity
26
25
{
49
48
  auto flags = static_cast<GDBusProxyFlags>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
50
49
                                            G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS);
51
50
 
52
 
  auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ?  "com.canonical.Unity.Test.Upstart" : DBUS_SERVICE_UPSTART,
53
 
                                                        DBUS_PATH_UPSTART, DBUS_INTERFACE_UPSTART,
 
51
  auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ?  "com.canonical.Unity.Test.Upstart" : "com.ubuntu.Upstart",
 
52
                                                        "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6",
54
53
                                                        G_BUS_TYPE_SESSION, flags);
55
54
 
56
55
  proxy->CallBegin("EmitEvent", g_variant_new("(sasb)", name.c_str(), nullptr, 0), [proxy] (GVariant*, glib::Error const&) {});