[gnome-sound-recorder/bilelmoussaoui/waveform: 1/2] move recordings directory into xdg-data

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 00473fc84ba77af529a261d6e8bf4c6f18361545
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sun Aug 9 03:26:46 2020 +0200

    move recordings directory into xdg-data
    
    this also copies the old files to the new location async and
    they appear as $oldName followed by a suffix to differentiate them
    
    Note: currently we don't regenerate waveform data for those files
    this will come in a next merge request
    
    Fixes #20 #30

 src/application.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index 22a27da2..a1f9c4f4 100644
--- a/src/application.js
+++ b/src/application.js
@@ -20,8 +20,8 @@
 
 const { Gdk, Gio, GLib, GObject, Gst, Gtk, Handy } = imports.gi;
 
-/* Translators: "Recordings" here refers to the name of the directory where the application places files */
-var RecordingsDir = Gio.file_new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), pkg.name]));
+
+var RecordingsDir = Gio.file_new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), pkg.name]))
 var CacheDir = Gio.file_new_for_path(GLib.build_filenamev([GLib.get_user_cache_dir(), pkg.name]));
 var Settings = new Gio.Settings({ schema: pkg.name });
 
@@ -133,9 +133,15 @@ var Application = GObject.registerClass(class Application extends Gtk.Applicatio
         Handy.init();
         Gst.init(null);
 
+<<<<<<< HEAD
         if (!RecordingsDir.query_exists(null))
             RecordingsDir.make_directory_with_parents(null);
         if (!CacheDir.query_exists(null))
+=======
+        if(!RecordingsDir.query_exists(null))
+            RecordingsDir.make_directory_with_parents(null);
+        if(!CacheDir.query_exists(null))
+>>>>>>> 0e86097... move recordings directory into xdg-data
             CacheDir.make_directory_with_parents(null);
 
         this._initAppMenu();