3 files changed, 6 insertions, 5 deletions
diff --git a/plugins/unityshell/src/UnityGestureTarget.cpp b/plugins/unityshell/src/UnityGestureTarget.cpp
index 3c4ff2ab6..68fe707fb 100644
--- a/plugins/unityshell/src/UnityGestureTarget.cpp
+++ b/plugins/unityshell/src/UnityGestureTarget.cpp
@@ -27,7 +27,7 @@
 #include "Launcher.h"
 
 #include "UBusMessages.h"
-#include "ubus-server.h"
+#include "UBusWrapper.h"
 
 using namespace nux;
 
@@ -46,9 +46,7 @@ GestureDeliveryRequest UnityGestureTarget::GestureEvent(const nux::GestureEvent
 else if (event.GetGestureClasses() == TAP_GESTURE
 && event.type == EVENT_GESTURE_END)
 {
- ubus_server_send_message(ubus_server_get_default(),
- UBUS_DASH_EXTERNAL_ACTIVATION,
- NULL);
+ UBusManager::SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION);
 }
 
 return GestureDeliveryRequest::NONE;
diff --git a/plugins/unityshell/src/unity-root-accessible.cpp b/plugins/unityshell/src/unity-root-accessible.cpp
index 6b4eaa909..a435b6b04 100644
--- a/plugins/unityshell/src/unity-root-accessible.cpp
+++ b/plugins/unityshell/src/unity-root-accessible.cpp
@@ -30,6 +30,8 @@
 #include "nux-base-window-accessible.h"
 #include "unitya11y.h"
 
+#include <UnityCore/Variant.h>
+
 #include "UBusWrapper.h"
 #include "UBusMessages.h"
 
@@ -352,7 +354,7 @@ search_for_launcher_window(UnityRootAccessible* self)
 }
 
 static void
-ubus_launcher_register_interest_cb(GVariant* variant,
+ubus_launcher_register_interest_cb(unity::glib::Variant const& variant,
 UnityRootAccessible* self)
 {
 //launcher window is the same during all the life of Unity
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 37d5c741d..bacbb08c3 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -59,6 +59,7 @@
 #include "unitya11y.h"
 
 #include "UBusMessages.h"
+#include "UBusWrapper.h"
 #include "UScreen.h"
 
 #include "config.h"