[PATCH 10/12] Get glade files and pixmaps from an environment variable.

[Chris Lumens <clumens redhat com>]

---
 anaconda |    3 +++
 gui.py   |   11 ++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/anaconda b/anaconda
index 8fc4797..0db6755 100755
--- a/anaconda
+++ b/anaconda
@@ -315,6 +315,9 @@ def setupEnvironment():
     if os.environ.has_key("LD_PRELOAD"):
         del os.environ["LD_PRELOAD"]
 
+    os.environ["GLADEPATH"] = "/tmp/updates/:/tmp/updates/ui/:ui/:/usr/share/anaconda/ui/:/usr/share/python-meh/"
+    os.environ["PIXMAPPATH"] = "/tmp/updates/pixmaps/:/tmp/updates/:/tmp/product/pixmaps/:/tmp/product/:pixmaps/:/usr/share/anaconda/pixmaps/:/usr/share/pixmaps/:/usr/share/anaconda/:/usr/share/python-meh/"
+
 def setupLoggingFromOpts(opts):
     if opts.loglevel and logLevelMap.has_key(opts.loglevel):
         log.setHandlersLevel(logLevelMap[opts.loglevel])
diff --git a/gui.py b/gui.py
index 7f56036..0a4ca3b 100755
--- a/gui.py
+++ b/gui.py
@@ -369,8 +369,8 @@ def addFrame(dialog, title=None, showtitle = 1):
     dialog.connect ("key-release-event", handleShiftPrintScrnRelease)
 
 def findGladeFile(file):
-    for dir in ("/tmp/updates/", "/tmp/updates/ui/", "ui/",
-                "/usr/share/anaconda/ui/"):
+    path = os.environ.get("GLADEPATH", "./:ui/:/tmp/updates/:/tmp/updates/ui/")
+    for dir in path.split(":"):
         fn = dir + file
         if os.access(fn, os.R_OK):
             return fn
@@ -386,11 +386,8 @@ def getGladeWidget(file, rootwidget, i18ndomain="anaconda"):
     return (xml, w)
 
 def findPixmap(file):
-    for dir in ( "/tmp/updates/pixmaps/", "/tmp/updates/",
-                 "/tmp/product/pixmaps/", "/tmp/product/", "pixmaps/",
-                 "/usr/share/anaconda/pixmaps/",
-                 "/usr/share/pixmaps/",
-                 "/usr/share/anaconda/", ""):
+    path = os.environ.get("PIXMAPPATH", "./:pixmaps/:/tmp/updates/:/tmp/updates/pixmaps/")
+    for dir in path.split(":"):
         fn = dir + file
         if os.access(fn, os.R_OK):
             return fn
-- 
1.6.1.3