Merge tag 'upstream/0.6.7'

Upstream version 0.6.7

2 files changed, 23 insertions, 1 deletions

diff --git a/src/utilities/config.vala b/src/utilities/config.vala
index 5dedddb..74bbcbb 100644
--- a/src/utilities/config.vala
+++ b/src/utilities/config.vala
@@ -57,7 +57,7 @@ public class Config : GLib.Object {
     public int  activation_range { get; set; default = 200; }
     public int  max_visible_slices { get; set; default = 24; }
     public bool show_indicator { get; set; default = true; }
-    public bool show_captions { get; set; default = true; }
+    public bool show_captions { get; set; default = false; }
     public bool search_by_string { get; set; default = true; }
     public bool auto_start { get; set; default = false; }
     public int showed_news { get; set; default = 0; }
diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala
index 96bce0a..7bdd642 100644
--- a/src/utilities/paths.vala
+++ b/src/utilities/paths.vala
@@ -108,6 +108,28 @@ public class Paths : GLib.Object {
     public static string executable { get; private set; default=""; }
 
     /////////////////////////////////////////////////////////////////////
+    /// Deletes a directory recursively from disk. Use with care :)
+    /////////////////////////////////////////////////////////////////////
+
+    public static void delete_directory(string directory) {
+        try {
+            var d = Dir.open(directory);
+            string name;
+            while ((name = d.read_name()) != null) {
+                string path = Path.build_filename(directory, name);
+                if (FileUtils.test(path, FileTest.IS_DIR)) {
+                    delete_directory(path);
+                } else {
+                    FileUtils.remove(path);
+                }
+            }
+            DirUtils.remove(directory);
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
+    /////////////////////////////////////////////////////////////////////
     /// Initializes all values above.
     /////////////////////////////////////////////////////////////////////