From: Dana Jansens <danakj@orodu.net>
Date: Fri, 1 Aug 2003 18:23:23 +0000 (+0000)
Subject: look for masks only where the themerc was read from
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=b98021773bd39d70a0742176db73de9f81695576;p=chaz%2Fopenbox

look for masks only where the themerc was read from
---

diff --git a/render/theme.c b/render/theme.c
index 37bc4717..50df6791 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1040,28 +1040,12 @@ static gboolean read_mask(const RrInstance *inst,
     unsigned int w, h;
     unsigned char *b;
 
-    s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                         theme->name, maskname, NULL);
-    if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+    s = g_build_filename(theme->path, maskname, NULL);
+    if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
         ret = TRUE;
-    else {
-        g_free(s);
-        s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
-        if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
-            ret = TRUE;
-        else {
-            g_free(s);
-            s = g_build_filename(theme->path, maskname, NULL);
-            if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
-                ret = TRUE;
-        }
-    }
-
-    if (ret) {
         *value = RrPixmapMaskNew(inst, w, h, (char*)b);
         XFree(b);
     }
-      
     g_free(s);
 
     return ret;