nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename the button_dir var to data_dir.. pointless :>

Browse source
This commit is contained in:
Dana Jansens 2003-06-28 15:53:37 +00:00
parent bbe0e7da26
commit 0a459f7a57
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
render/theme.c
View file

@ -721,7 +721,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
char *rclass = create_class_name(rname); char *rclass = create_class_name(rname);
char *rettype; char *rettype;
char *s; char *s;
char *button_dir; char *data_dir;
XrmValue retvalue; XrmValue retvalue;
int hx, hy; /* ignored */ int hx, hy; /* ignored */
unsigned int w, h; unsigned int w, h;
@ -730,16 +730,16 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) { 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", 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) if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE; ret = TRUE;
else { else {
g_free(s); 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) if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE; ret = TRUE;
@ -765,7 +765,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
} }
g_free(s); g_free(s);
g_free(button_dir); g_free(data_dir);
} }
g_free(rclass); g_free(rclass);