X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=106130e1e28f0d59d97e58e097bd0963dcd5ccbe;hb=0a459f7a57f765d6e32dabacf6ff826cc66ff641;hp=c80f485751771b0f416fc6a502ad0a9f9ccef438;hpb=bf2f0c58ca4dce233a7f99ac3cc688271c87a8ec;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index c80f4857..106130e1 100644 --- a/render/theme.c +++ b/render/theme.c @@ -721,7 +721,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, char *rclass = create_class_name(rname); char *rettype; char *s; - char *button_dir; + char *data_dir; XrmValue retvalue; int hx, hy; /* ignored */ unsigned int w, h; @@ -730,16 +730,16 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - button_dir = g_strdup_printf("%s_data", theme); + data_dir = g_strdup_printf("%s_data", theme); s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - button_dir, retvalue.addr, NULL); + data_dir, retvalue.addr, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; else { g_free(s); - s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL); + s = g_build_filename(THEMEDIR, data_dir, retvalue.addr, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; @@ -765,7 +765,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, } g_free(s); - g_free(button_dir); + g_free(data_dir); } g_free(rclass);