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 fe34bbf41ec1c5e92f931e6470e2b5ac63f761ab..f0aeddabc9d08cc57ac7e7115fc20fdbc4062571 100644 (file)
--- 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,