From c0c16dbf94ee30d76cf076c2f9c26f34eb452efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Sat, 21 Apr 2018 21:28:19 +0200
Subject: [PATCH] Dont change path names because plugins use them

---
 gajim/common/configpaths.py | 6 +++---
 gajim/common/helpers.py     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py
index b2d4b6e07..6e0e43a73 100644
--- a/gajim/common/configpaths.py
+++ b/gajim/common/configpaths.py
@@ -134,9 +134,9 @@ class ConfigPaths:
 
         user_dir_paths = [
             ('TMP', tempfile.gettempdir()),
-            ('CONFIG_ROOT', self.config_root),
-            ('CACHE_ROOT', self.cache_root),
-            ('DATA_ROOT', self.data_root),
+            ('MY_CONFIG', self.config_root),
+            ('MY_CACHE', self.cache_root),
+            ('MY_DATA', self.data_root),
         ]
 
         for path in user_dir_paths:
diff --git a/gajim/common/helpers.py b/gajim/common/helpers.py
index c1c88f9ad..eb9f27bb1 100644
--- a/gajim/common/helpers.py
+++ b/gajim/common/helpers.py
@@ -863,7 +863,7 @@ def check_soundfile_path(file_, dirs=None):
     :return      the path to file or None if it doesn't exists.
     """
     if dirs is None:
-        dirs = [app.configpaths.get('DATA_ROOT'),
+        dirs = [app.configpaths.get('MY_DATA'),
                 app.DATA_DIR]
 
     if not file_:
@@ -891,7 +891,7 @@ def strip_soundfile_path(file_, dirs=None, abs=True):
         return None
 
     if dirs is None:
-        dirs = [app.configpaths.get('DATA_ROOT'),
+        dirs = [app.configpaths.get('MY_DATA'),
                 app.DATA_DIR]
 
     name = os.path.basename(file_)