DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2015-06-18 01:18:04 -04:00
parent 5c041cec9b
commit 79b750786a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/applets/menu.c
View File

@ -512,8 +512,7 @@ static void _xdg_dirs_home(Menu * menu, void (*callback)(Menu * menu,
char const fallback[] = ".local/share"; char const fallback[] = ".local/share";
char const * path; char const * path;
char const * homedir; char const * homedir;
size_t len; String * p;
char * p;
/* use $XDG_DATA_HOME if set and not empty */ /* use $XDG_DATA_HOME if set and not empty */
if((path = getenv("XDG_DATA_HOME")) != NULL && strlen(path) > 0) if((path = getenv("XDG_DATA_HOME")) != NULL && strlen(path) > 0)
@ -524,15 +523,13 @@ static void _xdg_dirs_home(Menu * menu, void (*callback)(Menu * menu,
/* fallback to "$HOME/.local/share" */ /* fallback to "$HOME/.local/share" */
if((homedir = getenv("HOME")) == NULL) if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir(); homedir = g_get_home_dir();
len = strlen(homedir) + 1 + sizeof(fallback); if((p = string_new_append(homedir, "/", fallback, NULL)) == NULL)
if((p = malloc(len)) == NULL)
{ {
menu->helper->error(NULL, homedir, 1); menu->helper->error(NULL, homedir, 1);
return; return;
} }
snprintf(p, len, "%s/%s", homedir, fallback);
_xdg_dirs_path(menu, callback, p); _xdg_dirs_path(menu, callback, p);
free(p); string_delete(p);
} }
static void _xdg_dirs_path(Menu * menu, void (*callback)(Menu * menu, static void _xdg_dirs_path(Menu * menu, void (*callback)(Menu * menu,