NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting and kiwis thumbnailer fix - not entirely fixed tho 

SVN revision: 23728
This commit is contained in:
Carsten Haitzler 2006-07-06 06:16:21 +00:00
parent 9911cc4fc3
commit 12f620b919
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_hints.c
View File

@ -412,9 +412,9 @@ e_hints_window_init(E_Border *bd)
{ {
char *str = NULL; char *str = NULL;
if ( if ((ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) ||
(ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) || ((bd->client.icccm.client_leader > 0) &&
((bd->client.icccm.client_leader > 0) && ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str)) ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
) )
{ {
if (!strncmp(str, "E_START|", 8)) if (!strncmp(str, "E_START|", 8))

9
src/bin/e_thumb.c
View File

@ -66,6 +66,9 @@ e_thumb_shutdown(void)
event_handlers = evas_list_remove_list(event_handlers, event_handlers); event_handlers = evas_list_remove_list(event_handlers, event_handlers);
} }
evas_list_free(thumb_files); evas_list_free(thumb_files);
if (pid != -1)
kill(pid, SIGTERM);
return 1; return 1;
} }
@ -587,7 +590,11 @@ _e_thumb_cb_exe_exit(void *data, int type, void *event)
ev = event; ev = event;
if (ev->pid != pid) return 1; if (ev->pid != pid) return 1;
if (!thumb_files) return 1; if (!thumb_files)
{
pid = -1;
return 1;
}
t = thumb_files->data; t = thumb_files->data;
thumb_files = evas_list_remove_list(thumb_files, thumb_files); thumb_files = evas_list_remove_list(thumb_files, thumb_files);