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

Also look for applications in "~/.local/share" if XDG_DATA_HOME is not set

Browse Source
This commit is contained in:
Pierre Pronchery 2013-11-24 01:31:36 +01:00
parent c7863e864f
commit 8bb5a72064
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/applets/main.c
View File

@ -497,6 +497,7 @@ static void _clicked_position_menu(GtkMenu * menu, gint * x, gint * y,
/* on_idle */ /* on_idle */
static void _idle_home(Main * main);
static void _idle_path(Main * main, char const * path); static void _idle_path(Main * main, char const * path);
static void _idle_path_do(Main * main, char const * path); static void _idle_path_do(Main * main, char const * path);
static gint _idle_apps_compare(gconstpointer a, gconstpointer b); static gint _idle_apps_compare(gconstpointer a, gconstpointer b);
@ -531,13 +532,38 @@ static gboolean _on_idle(gpointer data)
} }
else else
_idle_path(main, DATADIR); _idle_path(main, DATADIR);
/* FIXME fallback to "$HOME/.local/share" if not set */ _idle_home(main);
if((path = getenv("XDG_DATA_HOME")) != NULL && strlen(path) > 0)
_idle_path(main, path);
g_timeout_add(1000, _on_timeout, main); g_timeout_add(1000, _on_timeout, main);
return FALSE; return FALSE;
} }
static void _idle_home(Main * main)
{
char const fallback[] = ".local/share";
char const * path;
char const * homedir;
size_t len;
char * p;
/* FIXME fallback to "$HOME/.local/share" if not set */
if((path = getenv("XDG_DATA_HOME")) != NULL && strlen(path) > 0)
{
_idle_path(main, path);
return;
}
if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir();
len = strlen(homedir) + 1 + sizeof(fallback);
if((p = malloc(len)) == NULL)
{
main->helper->error(NULL, homedir, 1);
return;
}
snprintf(p, len, "%s/%s", homedir, fallback);
_idle_path(main, p);
free(p);
}
static void _idle_path(Main * main, char const * path) static void _idle_path(Main * main, char const * path)
{ {
const char applications[] = "/applications"; const char applications[] = "/applications";