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

No longer infinitely loop when idle if the applications were not found

Browse Source
This commit is contained in:
Pierre Pronchery 2010-02-06 17:54:05 +00:00
parent 639cb68832
commit 781acabb28
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/applets/main.c
View File

@ -347,19 +347,21 @@ static gboolean _on_idle(gpointer data)
|| (fd = dirfd(dir)) < 0 || (fd = dirfd(dir)) < 0
|| fstat(fd, &st) != 0) || fstat(fd, &st) != 0)
#endif #endif
return error_set_print("panel", FALSE, "%s: %s", path, strerror( return main->helper->error(NULL, path, FALSE);
errno));
main->refresh_mti = st.st_mtime; main->refresh_mti = st.st_mtime;
while((de = readdir(dir)) != NULL) while((de = readdir(dir)) != NULL)
{ {
if(de->d_name[0] == '.')
if(de->d_name[1] == '\0' || (de->d_name[1] == '.'
&& de->d_name[2] == '\0'))
continue;
len = strlen(de->d_name); len = strlen(de->d_name);
if(len < sizeof(ext) || strncmp(&de->d_name[len - sizeof(ext) if(len < sizeof(ext) || strncmp(&de->d_name[len - sizeof(ext)
+ 1], ext, sizeof(ext)) != 0) + 1], ext, sizeof(ext)) != 0)
continue; continue;
if((p = realloc(name, sizeof(path) + len + 1)) == NULL) if((p = realloc(name, sizeof(path) + len + 1)) == NULL)
{ {
error_set_print("panel", 1, "%s: %s", "realloc", main->helper->error(NULL, path, 1);
strerror(errno));
continue; continue;
} }
name = p; name = p;
@ -370,11 +372,10 @@ static gboolean _on_idle(gpointer data)
#endif #endif
if(config == NULL && (config = config_new()) == NULL) if(config == NULL && (config = config_new()) == NULL)
continue; /* XXX report error */ continue; /* XXX report error */
else
config_reset(config); config_reset(config);
if(config_load(config, name) != 0) if(config_load(config, name) != 0)
{ {
error_print("panel"); error_print("Panel"); /* XXX use the error helper */
continue; continue;
} }
q = config_get(config, section, "Name"); q = config_get(config, section, "Name");