Merge pull request #106 from Ulauncher/issue-104

Issue 104
Ulauncher · Mar 10, 2017 · 36b993c · 36b993c
2 parents 5baa5a2 + 6e81317
commit 36b993c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/ulauncher/config.py b/ulauncher/config.py
@@ -10,18 +10,14 @@
 from time import time
 
 from locale import gettext as _
-from xdg.BaseDirectory import xdg_config_home, xdg_cache_home
+from xdg.BaseDirectory import xdg_config_home, xdg_cache_home, xdg_data_dirs
 
 # Use ulauncher_cache dir because of the WebKit bug
 # https://bugs.webkit.org/show_bug.cgi?id=151646
 CACHE_DIR = os.path.join(xdg_cache_home, 'ulauncher_cache')
 CONFIG_DIR = os.path.join(xdg_config_home, 'ulauncher')
 SETTINGS_FILE_PATH = os.path.join(CONFIG_DIR, 'settings.json')
-DESKTOP_DIRS = filter(os.path.exists, map(os.path.expanduser, [
-    '/usr/local/share/applications',
-    '/usr/share/applications',
-    '~/.local/share/applications'
-]))
+DESKTOP_DIRS = filter(os.path.exists, xdg_data_dirs)
 
 
 class ProjectPathNotFoundError(Exception):

diff --git a/ulauncher/helpers.py b/ulauncher/helpers.py
@@ -61,7 +61,7 @@ def set_up_logging(opts):
     logger_sh = logging.StreamHandler()
     logger_sh.setFormatter(formatter)
     logger.addHandler(logger_sh)
-    logger.setLevel(logging.DEBUG)  # Temporarily set DEBUG by default
+    logger.setLevel(logging.ERROR)
 
     # Set the logging level to show debug messages.
     if opts.verbose: