Resolves 2 - 2.1 / 2.2

- resolves 2.1
- resolves 2.2

Author: samlane-ma

budgie-wpreviews/src/previews_creator.vala

@@ -56,9 +56,8 @@ namespace create_previews {
         if (wnck_scr == null) return; // usually if not run on X11
         gdk_scr = Gdk.Screen.get_default();
         if (gdk_scr == null) return; // usually if there is no display
-        string user = Environment.get_user_name();
-        var tmp = Environment.get_tmp_dir() + "/";
-        previewspath = tmp.concat(user, "_window-previews");
+        string tmpdir = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
+        previewspath = GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmpdir, ".windows-previews");
         update_winlist();
         wnck_scr.window_opened.connect(update_winlist);
         wnck_scr.window_opened.connect(refresh_new);

budgie-wpreviews/src/previews_daemon.vala

@@ -31,7 +31,6 @@ namespace NewPreviews {
     bool showtooltips;
     bool allapps;
     Gtk.Button[] currbuttons;
-    string user;
     File triggerdir;
     File nexttrigger;
     File allappstrigger;
@@ -661,25 +660,25 @@ namespace NewPreviews {
             allworkspaces = previews_settings.get_boolean("allworkspaces");
             showtooltips = previews_settings.get_boolean("showtooltips");
         });
-        var tmp = Environment.get_tmp_dir() + "/";
+        string tmp = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
         triggerdir = File.new_for_path(tmp);
         allappstrigger = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_all")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_all")
         );
         allappstriggerhotc = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_all_hotcorner")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_all_hotcorner")
         );
         currapptriggerhotc = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_curr_hotcorner")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_curr_hotcorner")
         );
         nexttrigger = File.new_for_path(
-            tmp.concat(user, "_nexttrigger")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".nexttrigger")
         );
         previoustrigger = File.new_for_path(
-            tmp.concat(user, "_previoustrigger")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".previoustrigger")
         );
         triggercurrent = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_current")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_current")
         );
         // start with a clean plate please
         cleanup();
@@ -711,9 +710,8 @@ namespace NewPreviews {
     }
 
     public static void main (string[] args) {
-        user = Environment.get_user_name();
-        var tmp = Environment.get_tmp_dir() + "/";
-        previewspath = tmp.concat(user, "_window-previews");
+        string tmp = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
+        previewspath = GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".windows-previews");
         try {
             File file = File.new_for_commandline_arg (previewspath);
             file.make_directory ();

budgie-wpreviews/src/previews_triggers.vala

@@ -37,27 +37,26 @@ namespace previews_triggers {
 
     public static void main (string[] args) {
 
-        // user
-        string user = Environment.get_user_name();
+        // user dir
+        string tmp = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
         // files
-        var tmp = Environment.get_tmp_dir() + "/";
         File allappstrigger = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_all")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_all")
         );
         File nexttrigger = File.new_for_path(
-            tmp.concat(user, "_nexttrigger")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".nexttrigger")
         );
         File previoustrigger = File.new_for_path(
-            tmp.concat(user, "_previoustrigger")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".previoustrigger")
         );
         File triggercurrent = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_current")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_current")
         );
         File allappstriggerhotc = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_all_hotcorner")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_all_hotcorner")
         );
         File currapptriggerhotc = File.new_for_path(
-            tmp.concat(user, "_prvtrigger_curr_hotcorner")
+            GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmp, ".prvtrigger_curr_hotcorner")
         );
 
         File trg = nexttrigger;

budgie-wpreviews/src/separate_shot.vala

@@ -34,9 +34,8 @@ namespace fixpreviews {
 
         private void make_prvpath () {
             // make previews path
-            string user = Environment.get_user_name();
-            var tmp = Environment.get_tmp_dir() + "/";
-            previewspath = tmp.concat(user, "_window-previews");
+            string tmpdir = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
+            previewspath = GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmpdir, ".windows-previews");
 
             try {
                 File file = File.new_for_commandline_arg (previewspath);