Merge lp:~3v1n0/unity/relocks-on-crashes into lp:unity

[Marco Trevisan (Treviño)]

UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup

This makes unity to relocks if it was locked before crashing...

[Brandon Schaefer (brandontschaefer)]

Sweeet. Confirmed fixes the issue, and no double lock on a reboot!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3787
http://jenkins.qa.ubuntu.com/job/unity-ci/883/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/417

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/883/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Given the late arrival of this branch I would prefer if the patch only contained the minimum number of changes required. This fixes up some existing code as well.

=== modified file 'UnityCore/DesktopUtilities.cpp'
--- UnityCore/DesktopUtilities.cpp	2012-11-06 18:19:09 +0000
+++ UnityCore/DesktopUtilities.cpp	2014-04-16 22:18:11 +0000
@@ -23,12 +23,17 @@
 
 #include <glib.h>
 #include <gio/gdesktopappinfo.h>
+#include <NuxCore/Logger.h>
 
 #include "DesktopUtilities.h"
 #include "GLibWrapper.h"
 
 namespace unity
 {
+namespace
+{
+DECLARE_LOGGER(logger, "unity.desktop.utilities");
+}
 
 std::string DesktopUtilities::GetUserDataDirectory()
 {
@@ -49,6 +54,30 @@
   return "";
 }
 
+std::string DesktopUtilities::GetUserCacheDirectory()
+{
+  const char *cache_dir = g_get_user_cache_dir();
+  auto unity_cache = glib::gchar_to_string(cache_dir).append(G_DIR_SEPARATOR_S "unity" G_DIR_SEPARATOR_S);
+
+  if (g_mkdir_with_parents(unity_cache.c_str(), 0700) >= 0)
+    return unity_cache;
+
+  LOG_ERROR(logger) << "Impossible to create unity cache folder '"<< unity_cache <<"' !";
+  return "";
+}
+
+std::string DesktopUtilities::GetUserRuntimeDirectory()
+{
+  const char *runtime_dir = g_get_user_runtime_dir();
+  auto unity_runtime = glib::gchar_to_string(runtime_dir).append(G_DIR_SEPARATOR_S "unity" G_DIR_SEPARATOR_S);
+
+  if (g_mkdir_with_parents(unity_runtime.c_str(), 0700) >= 0)
+    return unity_runtime;
+
+  LOG_ERROR(logger) << "Impossible to create unity runtime folder '"<< unity_runtime <<"' !";
+  return "";
+}
+
 std::vector<std::string> DesktopUtilities::GetSystemDataDirectories()
 {
   const char* const* system_dirs = g_get_system_data_dirs();

=== modified file 'UnityCore/DesktopUtilities.h'
--- UnityCore/DesktopUtilities.h	2012-09-07 14:32:44 +0000
+++ UnityCore/DesktopUtilities.h	2014-04-16 22:18:11 +0000
@@ -30,6 +30,8 @@
 {
 public:
   static std::string GetUserDataDirectory();
+  static std::string GetUserCacheDirectory();
+  static std::string GetUserRuntimeDirectory();
   static std::vector<std::string> GetSystemDataDirectories();
   static std::vector<std::string> GetDataDirectories();
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-14 14:21:46 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-16 22:18:11 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /* Compiz unity plugin
- * unity.cpp 
+ * unityshell.cpp
  *
  * Copyright (c) 2010-11 Canonical Ltd.
  *
@@ -26,6 +26,7 @@
 #include <Nux/WindowCompositor.h>
 
 #include <UnityCore/DBusIndicators.h>
+#include <UnityCore/DesktopUtilities.h>
 #include <UnityCore/GnomeSessionManager.h>
 #include <UnityCore/ScopeProxyInterface.h>
 
@@ -58,6 +59,7 @@
 #include "decorations/DecorationsManager.h"
 
 #include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -142,6 +144,7 @@
 const RawPixel SCALE_SPACING = 20_em;
 const std::string RELAYOUT_TIMEOUT = "relayout-timeout";
 const std::string FIRST_RUN_STAMP = "first_run.stamp";
+const std::string LOCKED_STAMP = "locked.stamp";
 } // namespace local
 } // anon namespace
 
@@ -466,6 +469,7 @@
   unity_a11y_finalize();
   QuicklistManager::Destroy();
   decoration::DataPool::Reset();
+  SaveLockStamp(false);
 
   reset_glib_logging();
 }
@@ -3727,7 +3731,7 @@
   RaiseOSK();
 }
 
-void UnityScreen::LockscreenRequested()
+void UnityScreen::OnLockScreenRequested()
 {
   if (switcher_controller_->Visible())
   {
@@ -3748,6 +3752,32 @@
   RaiseOSK();
 }
 
+void UnityScreen::SaveLockStamp(bool save)
+{
+  auto const& cache_dir = DesktopUtilities::GetUserRuntimeDirectory();
+
+  if (cache_dir.empty())
+    return;
+
+  if (save)
+  {
+    glib::Error error;
+    g_file_set_contents((cache_dir+local::LOCKED_STAMP).c_str(), "", 0, &error);
+
+    if (error)
+    {
+      LOG_ERROR(logger) << "Impossible to save the unity locked stamp file: " << error;
+    }
+  }
+  else
+  {
+    if (g_unlink((cache_dir+local::LOCKED_STAMP).c_str()) < 0)
+    {
+      LOG_ERROR(logger) << "Impossible to delete the unity locked stamp file";
+    }
+  }
+}
+
 void UnityScreen::RaiseOSK()
 {
   /* stack any windows named "onboard" above us */
@@ -3813,7 +3843,9 @@
 
   // Setup Session Controller
   auto manager = std::make_shared<session::GnomeManager>();
-  manager->lock_requested.connect(sigc::mem_fun(this, &UnityScreen::LockscreenRequested));
+  manager->lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
+  manager->locked.connect(sigc::bind(sigc::mem_fun(this, &UnityScreen::SaveLockStamp), true));
+  manager->unlocked.connect(sigc::bind(sigc::mem_fun(this, &UnityScreen::SaveLockStamp), false));
   session_dbus_manager_ = std::make_shared<session::DBusManager>(manager);
   session_controller_ = std::make_shared<session::Controller>(manager);
   AddChild(session_controller_.get());
@@ -3823,6 +3855,9 @@
   lockscreen_controller_ = std::make_shared<lockscreen::Controller>(screensaver_dbus_manager_, manager);
   UpdateActivateIndicatorsKey();
 
+  if (g_file_test((DesktopUtilities::GetUserRuntimeDirectory()+local::LOCKED_STAMP).c_str(), G_FILE_TEST_EXISTS))
+    manager->PromptLockScreen();
+
   auto on_launcher_size_changed = [this] (nux::Area* area, int w, int h) {
     /* The launcher geometry includes 1px used to draw the right margin
      * that must not be considered when drawing an overlay */
@@ -3907,8 +3942,8 @@
 void UnityScreen::ShowFirstRunHints()
 {
   sources_.AddTimeoutSeconds(1, [this] {
-    auto const& cache_dir = glib::gchar_to_string(g_get_user_cache_dir())+"/unity/";
-    if (!g_file_test((cache_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS))
+    auto const& cache_dir = DesktopUtilities::GetUserCacheDirectory();
+    if (!cache_dir.empty() && !g_file_test((cache_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS))
     {
       // We focus the panel, so the shortcut hint will be hidden at first user input
       auto const& panels = panel_controller_->panels();
@@ -3920,19 +3955,12 @@
       shortcut_controller_->first_run = true;
       shortcut_controller_->Show();
 
-      if (g_mkdir_with_parents(cache_dir.c_str(), 0700) >= 0)
-      {
-        glib::Error error;
-        g_file_set_contents((cache_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
+      glib::Error error;
+      g_file_set_contents((cache_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
 
-        if (error)
-        {
-          LOG_ERROR(logger) << "Impossible to save the unity stamp file: " << error;
-        }
-      }
-      else
+      if (error)
       {
-        LOG_ERROR(logger) << "Impossible to create unity cache folder!";
+        LOG_ERROR(logger) << "Impossible to save the unity stamp file: " << error;
       }
     }
     return false;

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-04-12 16:26:38 +0000
+++ plugins/unityshell/src/unityshell.h	2014-04-16 22:18:11 +0000
@@ -232,7 +232,8 @@
 
   void OnMinimizeDurationChanged();
 
-  void LockscreenRequested();
+  void OnLockScreenRequested();
+  void SaveLockStamp(bool);
 
   switcher::Controller::Ptr switcher_controller();
   launcher::Controller::Ptr launcher_controller();