From: Dana Jansens <danakj@orodu.net>
Date: Fri, 10 Jan 2003 22:40:16 +0000 (+0000)
Subject: load buttons from the global dir if they arent found in the user dir
X-Git-Tag: openbox-2_3_0~455
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6c4711cbaa36ba16c942af9907fa51489373ec63;p=dana%2Fopenbox.git

load buttons from the global dir if they arent found in the user dir
---

diff --git a/otk/style.cc b/otk/style.cc
index fe34bbf4..f0aeddab 100644
--- a/otk/style.cc
+++ b/otk/style.cc
@@ -179,6 +179,12 @@ void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask,
       ret = XReadBitmapFile(OBDisplay::display, root_window,
                             expandTilde(xbmFile).c_str(), &pixmapMask.w,
                             &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      if (ret != BitmapSuccess) {
+        xbmFile = std::string(BUTTONSDIR) + "/" + s;
+        ret = XReadBitmapFile(OBDisplay::display, root_window,
+                              xbmFile.c_str(), &pixmapMask.w,
+                              &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      }
     } else
       ret = XReadBitmapFile(OBDisplay::display, root_window,
                             expandTilde(s).c_str(), &pixmapMask.w,