Merged with trunk.

(bzr r2934.3.6)

3 files changed, 10 insertions, 4 deletions

diff --git a/plugins/unityshell/CMakeLists.txt b/plugins/unityshell/CMakeLists.txt
index 36db0176c..d4d170ae2 100644
--- a/plugins/unityshell/CMakeLists.txt
+++ b/plugins/unityshell/CMakeLists.txt
@@ -11,7 +11,7 @@ compiz_plugin (unityshell
 LIBDIRS "${CMAKE_BINARY_DIR}/UnityCore"
 )
 add_dependencies(unityshell unity-core-${UNITY_API_VERSION} dash-lib launcher-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz)
-target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz)
+target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-bamf unity-shared-compiz)
 set_target_properties(unityshell 
 PROPERTIES INSTALL_RPATH "${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS}"
 INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/plugins/unityshell/src/ElapsedTimeMonitor.cpp b/plugins/unityshell/src/ElapsedTimeMonitor.cpp
index b5afc3aed..586ab6368 100644
--- a/plugins/unityshell/src/ElapsedTimeMonitor.cpp
+++ b/plugins/unityshell/src/ElapsedTimeMonitor.cpp
@@ -39,7 +39,7 @@ void ElapsedTimeMonitor::StopMonitor(GVariantBuilder* builder)
 {
 struct timespec current;
 clock_gettime(CLOCK_MONOTONIC, &current);
- int diff = TimeUtil::TimeDelta(&current, &_start);
+ DeltaTime diff = TimeUtil::TimeDelta(&current, &_start);
 
 variant::BuilderWrapper(builder)
 .add("elapsed-time", diff);
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e3181452f..869aa85d7 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1853,8 +1853,11 @@ void UnityScreen::SendExecuteCommand()
 adapter.TerminateScale();
 }
 
+ ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL, glib::Source::Priority::HIGH);
+
 ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
- g_variant_new("(sus)", "commands.lens", 0, ""));
+ g_variant_new("(sus)", "commands.lens", 0, ""),
+ glib::Source::Priority::LOW);
 }
 
 bool UnityScreen::executeCommand(CompAction* action,
@@ -3068,7 +3071,10 @@ bool UnityScreen::setOptionForPlugin(const char* plugin, const char* name,
 if (strcmp(plugin, "core") == 0)
 {
 if (strcmp(name, "hsize") == 0 || strcmp(name, "vsize") == 0)
- launcher_controller_->UpdateNumWorkspaces(screen->vpSize().width() * screen->vpSize().height());
+ {
+ WindowManager& wm = WindowManager::Default();
+ wm.viewport_layout_changed.emit(screen->vpSize().width(), screen->vpSize().height());
+ }
 }
 }
 return status;