[meld] Remove override of XDG_DATA_DIRS for uninstalled mode (BGO#791173)



commit fecf0e630d346af1e17a921720da36c0f1f2c838
Author: Vasily Galkin <galkin-vv ya ru>
Date:   Sun Dec 3 17:20:25 2017 +0300

    Remove override of XDG_DATA_DIRS for uninstalled mode (BGO#791173)
    
    According to commit log it was introduced in 4d84c25
    Enable Mallard-based help from within Meld
    
    But since that the uninstalled version switched to unconditionally
    showing web-based help. All other meld files (css, ui, icons, styles and
    schemas) are explicitly loaded from meld.conf.DATADIR for unistalled
    mode. So it looks unnecessary now.
    
    For msys2 overrideing XDG_DATA_DIRS leads to problems since it is
    preferred over internally computed prefix and glib fails to find
    schemas. Not overriding XDG_DATA_DIRS seems ok: all meld icons shows
    fine, change highlighting works too.

 meld/conf.py |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/meld/conf.py b/meld/conf.py
index 04dc7dd..ada0dd6 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -44,12 +44,6 @@ def uninstalled():
     UNINSTALLED = True
     UNINSTALLED_SCHEMA = True
 
-    # This first bit should be unnecessary, but some things (GTK icon theme
-    # location, GSettings schema location) don't fall back correctly.
-    data_dir = os.environ.get('XDG_DATA_DIRS', "/usr/local/share/:/usr/share/")
-    data_dir = ":".join((melddir, data_dir))
-    os.environ['XDG_DATA_DIRS'] = data_dir
-
 
 def ui_file(filename):
     return os.path.join(DATADIR, "ui", filename)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]