4 files changed, 9 insertions, 8 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/UnityShowdesktopHandler.cpp b/plugins/unityshell/src/UnityShowdesktopHandler.cpp
index d34ecf11d..593f9c7fd 100644
--- a/plugins/unityshell/src/UnityShowdesktopHandler.cpp
+++ b/plugins/unityshell/src/UnityShowdesktopHandler.cpp
@@ -168,7 +168,7 @@ ShowdesktopHandlerWindowInterface::PostPaintAction ShowdesktopHandler::Animate (
 
 void ShowdesktopHandler::PaintOpacity (unsigned short &opacity)
 {
- if (progress_ == 1.0f || progress_ == 0.0f)
+ if (progress_ == 0.0f)
 opacity = std::numeric_limits <unsigned short>::max();
 else
 opacity *= (1.0f - progress_);
diff --git a/plugins/unityshell/src/unity-root-accessible.cpp b/plugins/unityshell/src/unity-root-accessible.cpp
index 681d676d6..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"
 
@@ -259,7 +261,7 @@ add_window(UnityRootAccessible* self,
 unity_a11y_get_accessible(window);
 
 /* FIXME: temporal */
- atk_object_set_name (window_accessible, window->GetWindowName().GetTCharPtr());
+ atk_object_set_name (window_accessible, window->GetWindowName().c_str());
 
 if (g_slist_find(self->priv->window_list, window_accessible))
 return;
@@ -338,7 +340,7 @@ search_for_launcher_window(UnityRootAccessible* self)
 nux_object = nux_object_accessible_get_object(accessible);
 bwindow = dynamic_cast<nux::BaseWindow*>(nux_object);
 
- if ((bwindow!= NULL) && (g_strcmp0(bwindow->GetWindowName().GetTCharPtr(), "LauncherWindow") == 0))
+ if ((bwindow!= NULL) && (g_strcmp0(bwindow->GetWindowName().c_str(), "LauncherWindow") == 0))
 {
 found = TRUE;
 break;
@@ -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 52f937410..3bccc2011 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"