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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2014-10-14 01:09:22 +02:00
parent e956dfcdce
commit 88e7dc36dc
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/desktop.c
View File

@ -2339,16 +2339,15 @@ static int _refresh_loop(Desktop * desktop);
static int _refresh_loop_applications(Desktop * desktop); static int _refresh_loop_applications(Desktop * desktop);
static gint _categories_apps_compare(gconstpointer a, gconstpointer b); static gint _categories_apps_compare(gconstpointer a, gconstpointer b);
static int _refresh_loop_categories(Desktop * desktop); static int _refresh_loop_categories(Desktop * desktop);
static int _refresh_loop_categories_dirs(Desktop * desktop); static void _refresh_loop_categories_path(Desktop * desktop, char const * path,
static void _refresh_loop_categories_dirs_path(Desktop * desktop, char const * apppath);
char const * path, char const * apppath); static void _refresh_loop_categories_xdg(Desktop * desktop,
static void _refresh_loop_categories_dirs_xdg(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath)); char const * apppath));
static void _refresh_loop_categories_dirs_xdg_home(Desktop * desktop, static void _refresh_loop_categories_xdg_home(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath)); char const * apppath));
static void _refresh_loop_categories_dirs_xdg_path(Desktop * desktop, static void _refresh_loop_categories_xdg_path(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath), char const * path); char const * apppath), char const * path);
static int _refresh_loop_files(Desktop * desktop); static int _refresh_loop_files(Desktop * desktop);
@ -2538,18 +2537,12 @@ static int _refresh_loop_applications(Desktop * desktop)
static int _refresh_loop_categories(Desktop * desktop) static int _refresh_loop_categories(Desktop * desktop)
{ {
return _refresh_loop_categories_dirs(desktop); _refresh_loop_categories_xdg(desktop, _refresh_loop_categories_path);
}
static int _refresh_loop_categories_dirs(Desktop * desktop)
{
_refresh_loop_categories_dirs_xdg(desktop,
_refresh_loop_categories_dirs_path);
return 1; return 1;
} }
static void _refresh_loop_categories_dirs_path(Desktop * desktop, static void _refresh_loop_categories_path(Desktop * desktop, char const * path,
char const * path, char const * apppath) char const * apppath)
{ {
DIR * dir; DIR * dir;
int fd; int fd;
@ -2629,7 +2622,7 @@ static void _refresh_loop_categories_dirs_path(Desktop * desktop,
config_delete(config); config_delete(config);
} }
static void _refresh_loop_categories_dirs_xdg(Desktop * desktop, static void _refresh_loop_categories_xdg(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath)) char const * apppath))
{ {
@ -2649,22 +2642,22 @@ static void _refresh_loop_categories_dirs_xdg(Desktop * desktop,
for(i = 0, j = 0;; i++) for(i = 0, j = 0;; i++)
if(p[i] == '\0') if(p[i] == '\0')
{ {
_refresh_loop_categories_dirs_xdg_path(desktop, _refresh_loop_categories_xdg_path(desktop, callback,
callback, &p[j]); &p[j]);
break; break;
} }
else if(p[i] == ':') else if(p[i] == ':')
{ {
p[i] = '\0'; p[i] = '\0';
_refresh_loop_categories_dirs_xdg_path(desktop, _refresh_loop_categories_xdg_path(desktop, callback,
callback, &p[j]); &p[j]);
j = i + 1; j = i + 1;
} }
free(p); free(p);
_refresh_loop_categories_dirs_xdg_home(desktop, callback); _refresh_loop_categories_xdg_home(desktop, callback);
} }
static void _refresh_loop_categories_dirs_xdg_home(Desktop * desktop, static void _refresh_loop_categories_xdg_home(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath)) char const * apppath))
{ {
@ -2677,7 +2670,7 @@ static void _refresh_loop_categories_dirs_xdg_home(Desktop * desktop,
/* 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)
{ {
_refresh_loop_categories_dirs_xdg_path(desktop, callback, path); _refresh_loop_categories_xdg_path(desktop, callback, path);
return; return;
} }
/* fallback to "$HOME/.local/share" */ /* fallback to "$HOME/.local/share" */
@ -2690,11 +2683,11 @@ static void _refresh_loop_categories_dirs_xdg_home(Desktop * desktop,
return; return;
} }
snprintf(p, len, "%s/%s", homedir, fallback); snprintf(p, len, "%s/%s", homedir, fallback);
_refresh_loop_categories_dirs_xdg_path(desktop, callback, p); _refresh_loop_categories_xdg_path(desktop, callback, p);
free(p); free(p);
} }
static void _refresh_loop_categories_dirs_xdg_path(Desktop * desktop, static void _refresh_loop_categories_xdg_path(Desktop * desktop,
void (*callback)(Desktop * desktop, char const * path, void (*callback)(Desktop * desktop, char const * path,
char const * apppath), char const * path) char const * apppath), char const * path)
{ {