diff options
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | services/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | services/panel-service.c | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unity-shared/UpstartWrapper.cpp | 5 |
5 files changed, 6 insertions, 11 deletions
diff --git a/debian/control b/debian/control index 210814e77..6ef9ba25c 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,6 @@ Build-Depends: cmake, libunique-dev, libunity-dev (>= 7.1.0), libunity-misc-dev (>= 4.0.4), - libupstart-dev, libxcb-icccm4-dev, libxfixes-dev (>= 1:5.0.1), libxi-dev (>= 2:1.7.1.901), diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index 9a9f9e01f..fe5dff1f8 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -12,7 +12,6 @@ set(UNITY_PANEL_SERVICE_DEPS indicator3-0.4>=12.10.2 x11 libido3-0.1>=13.0.0 - libupstart ) pkg_check_modules(SERVICE_DEPS REQUIRED ${UNITY_PANEL_SERVICE_DEPS}) diff --git a/services/panel-service.c b/services/panel-service.c index f65647d4d..55be9aeae 100644 --- a/services/panel-service.c +++ b/services/panel-service.c @@ -34,8 +34,6 @@ #include <X11/XF86keysym.h> #include <X11/extensions/XInput2.h> -#include <upstart/upstart-dbus.h> - G_DEFINE_TYPE (PanelService, panel_service, G_TYPE_OBJECT); #define GET_PRIVATE(o) \ @@ -851,9 +849,9 @@ emit_upstart_event (const gchar *event) return; } - GVariant *result = g_dbus_connection_call_sync (conn, DBUS_SERVICE_UPSTART, - DBUS_PATH_UPSTART, - DBUS_INTERFACE_UPSTART, + GVariant *result = g_dbus_connection_call_sync (conn, "com.ubuntu.Upstart", + "/com/ubuntu/Upstart", + "com.ubuntu.Upstart0_6", "EmitEvent", g_variant_new ("(sasb)", event, NULL, 0), NULL, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 15284cde8..c6ebb8f6e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -39,7 +39,7 @@ endif (GMOCK_SOURCE_DIR) # # Unit tests # -set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;xtst") +set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;xtst") pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS}) string (REPLACE ";" " " TEST_UNIT_DEPS_CFLAGS_OTHER "${TEST_UNIT_CFLAGS_OTHER}") diff --git a/unity-shared/UpstartWrapper.cpp b/unity-shared/UpstartWrapper.cpp index 284668b41..6870a5555 100644 --- a/unity-shared/UpstartWrapper.cpp +++ b/unity-shared/UpstartWrapper.cpp @@ -20,7 +20,6 @@ #include "UpstartWrapper.h" #include <UnityCore/GLibDBusProxy.h> -#include <upstart/upstart-dbus.h> namespace unity { @@ -49,8 +48,8 @@ void UpstartWrapper::Impl::Emit(std::string const& name) auto flags = static_cast<GDBusProxyFlags>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS); - auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ? "com.canonical.Unity.Test.Upstart" : DBUS_SERVICE_UPSTART, - DBUS_PATH_UPSTART, DBUS_INTERFACE_UPSTART, + auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ? "com.canonical.Unity.Test.Upstart" : "com.ubuntu.Upstart", + "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", G_BUS_TYPE_SESSION, flags); proxy->CallBegin("EmitEvent", g_variant_new("(sasb)", name.c_str(), nullptr, 0), [proxy] (GVariant*, glib::Error const&) {}); |