Merge lp:~brandontschaefer/unity/lp.1328677-fix into lp:unity

[Brandon Schaefer]

Use CONFIG instead of CACHE to store the first_run.stamp

Use CONFIG instead of CACHE to store the first_run.stamp

[Stephen M. Webb (bregma)]

Is there a way to add an "upgrade" option so that everyone isn't forced to see the Shortcuts screen again when they upgrade to this fix?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3848
http://jenkins.qa.ubuntu.com/job/unity-ci/1061/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/148

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Ill just stick in a second check for the old location. After a while we can remove it I suppose. Not that big of a hit keeping that. (Also I should remove that printf).

[lp:~brandontschaefer/unity/lp.1328677-fix]

3849. By Brandon Schaefer on 2014-08-13

* Make sure we still check ~/.cache other wise it'll cause the shortcut window to pop up on upgrades.
  * NOTE * This means, no first_run.stamp will be created if it exists in ~/.cache.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3849
http://jenkins.qa.ubuntu.com/job/unity-ci/1062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/149

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

If it's in XDG_CACHE_HOME, would it be possible to remove it and recreate it in XDG_CACHE_HOME, and otherwise treat it as if it were founf in XDG_CACHE_HOME? That would fix the problem permanently.

[Marco Trevisan (Treviño) (3v1n0)]

Instead of checking if both config and cache dir, why not instead adding a migration script that moves the file in cache directory (if any) to the config one, and only using config?

review: Needs Information

[Brandon Schaefer (brandontschaefer)]

Better way (from Marcos comment) here:

https://code.launchpad.net/~brandontschaefer/unity/lp.1328677-fixv2

I also had extra commits to this branch, soo easier to just make a new branch.

Unmerged revisions

3849. By Brandon Schaefer on 2014-08-13

* Make sure we still check ~/.cache other wise it'll cause the shortcut window to pop up on upgrades.
  * NOTE * This means, no first_run.stamp will be created if it exists in ~/.cache.

3848. By Brandon Schaefer on 2014-08-12

* Go to use CONFIG instead of CACHE to store the first_run.stamp

=== modified file 'UnityCore/DesktopUtilities.cpp'
--- UnityCore/DesktopUtilities.cpp	2014-04-16 22:17:11 +0000
+++ UnityCore/DesktopUtilities.cpp	2014-08-13 22:37:17 +0000
@@ -66,6 +66,18 @@
   return "";
 }
 
+std::string DesktopUtilities::GetUserConfigDirectory()
+{
+  const char *config_dir = g_get_user_config_dir();
+  auto unity_config = glib::gchar_to_string(config_dir).append(G_DIR_SEPARATOR_S "unity" G_DIR_SEPARATOR_S);
+
+  if (g_mkdir_with_parents(unity_config.c_str(), 0700) >= 0)
+    return unity_config;
+
+  LOG_ERROR(logger) << "Impossible to create unity config folder '"<< unity_config <<"' !";
+  return "";
+}
+
 std::string DesktopUtilities::GetUserRuntimeDirectory()
 {
   const char *runtime_dir = g_get_user_runtime_dir();

=== modified file 'UnityCore/DesktopUtilities.h'
--- UnityCore/DesktopUtilities.h	2014-04-16 22:17:11 +0000
+++ UnityCore/DesktopUtilities.h	2014-08-13 22:37:17 +0000
@@ -32,6 +32,7 @@
   static std::string GetUserDataDirectory();
   static std::string GetUserCacheDirectory();
   static std::string GetUserRuntimeDirectory();
+  static std::string GetUserConfigDirectory();
   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-08-11 12:30:55 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-08-13 22:37:17 +0000
@@ -4041,8 +4041,13 @@
 void UnityScreen::ShowFirstRunHints()
 {
   sources_.AddTimeoutSeconds(1, [this] {
+    auto const& config_dir = DesktopUtilities::GetUserConfigDirectory();
     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))
+
+    bool is_not_in_config_dir = (!config_dir.empty() && !g_file_test((config_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS));
+    bool is_not_in_cache_dir  = (!cache_dir.empty()  && !g_file_test( (cache_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS));
+
+    if (is_not_in_config_dir && is_not_in_cache_dir)
     {
       // We focus the panel, so the shortcut hint will be hidden at first user input
       auto const& panels = panel_controller_->panels();
@@ -4055,7 +4060,7 @@
       shortcut_controller_->Show();
 
       glib::Error error;
-      g_file_set_contents((cache_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
+      g_file_set_contents((config_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
 
       if (error)
       {