look for masks in the right place. display the error with just the requested button...

[chaz/openbox] / engines / openbox / obtheme.c

diff --git a/engines/openbox/obtheme.c b/engines/openbox/obtheme.c
index a68d8248523fbcf16152120560f7859fffeca2ca..f7e7941d854ae1e4b7a21aeb9846894e110d74d4 100644 (file)
--- a/engines/openbox/obtheme.c
+++ b/engines/openbox/obtheme.c
@@ -137,14 +137,14 @@ static gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
 
                 g_free(s);
                 themename = g_path_get_basename(engine_theme);
-                s = g_strdup_printf("%s_buttons/%s", engine_theme,
-                                    themename);
+                s = g_strdup_printf("%s/%s_buttons/%s", engine_theme,
+                                    themename, retvalue.addr);
                 g_free(themename);
                 if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
                     BitmapSuccess) 
                     ret = TRUE;
                 else
-                    g_message("Unable to find bitmap '%s'", s);
+                    g_message("Unable to find bitmap '%s'", retvalue.addr);
             }
         }