Merge branch 'feature/upstream' into develop

1 files changed, 19 insertions, 32 deletions

diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala
index f076ddc..a6e01ef 100644
--- a/src/utilities/paths.vala
+++ b/src/utilities/paths.vala
@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2017 by Simon Schneegans
+// Copyright 2011-2018 Simon Schneegans
 //
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
@@ -39,13 +45,6 @@ public class Paths : GLib.Object {
     public static string log { get; private set; default=""; }
 
     /////////////////////////////////////////////////////////////////////
-    /// The statistics file,
-    /// usually ~/.config/gnome-pie/gnome-pie.stats.
-    /////////////////////////////////////////////////////////////////////
-
-    public static string stats { get; private set; default=""; }
-
-    /////////////////////////////////////////////////////////////////////
     /// The settings file,
     /// usually ~/.config/gnome-pie/gnome-pie.conf.
     /////////////////////////////////////////////////////////////////////
@@ -232,7 +231,6 @@ public class Paths : GLib.Object {
         pie_config = config_file.get_path();
         settings = config_dir.get_path() + "/gnome-pie.conf";
         log = config_dir.get_path() + "/gnome-pie.log";
-        stats = config_dir.get_path() + "/gnome-pie.stats";
 
         if (!GLib.File.new_for_path(log).query_exists()) {
             try {
@@ -242,14 +240,6 @@ public class Paths : GLib.Object {
             }
         }
 
-        if (!GLib.File.new_for_path(stats).query_exists()) {
-            try {
-                FileUtils.set_contents(stats, "");
-            } catch (GLib.FileError e) {
-                error(e.message);
-            }
-        }
-
         // autostart file name
         autostart = GLib.Path.build_filename(GLib.Environment.get_user_config_dir(),
                                              "autostart", "gnome-pie.desktop", null);
@@ -264,9 +254,6 @@ public class Paths : GLib.Object {
         if (!GLib.File.new_for_path(log).query_exists())
             warning("Failed to find log file \"gnome-pie.log\"!");
 
-        if (!GLib.File.new_for_path(stats).query_exists())
-            warning("Failed to find statistics file \"gnome-pie.stats\"!");
-
         if (!GLib.File.new_for_path(local_themes).query_exists())
             warning("Failed to find local themes directory!");