forked from enlightenment/enlightenment
- this was causing e to segv under valgrind. I'm assuming full_path is the
correct thing to thumb (and it seems to work) but c was never set to anything, so it was wrong. SVN revision: 23197
This commit is contained in:
parent
9aaf7f3a5c
commit
1b90fddb72
|
@ -133,7 +133,6 @@ _load_inits(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int selnum = -1;
|
int selnum = -1;
|
||||||
const char *s;
|
const char *s;
|
||||||
char *c;
|
|
||||||
char *homedir;
|
char *homedir;
|
||||||
|
|
||||||
if (!il) return;
|
if (!il) return;
|
||||||
|
@ -147,7 +146,6 @@ _load_inits(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
im = e_widget_preview_add(cfd->dia->win->evas, 320,
|
im = e_widget_preview_add(cfd->dia->win->evas, 320,
|
||||||
(320 * e_zone_current_get(cfd->dia->win->container)->h) /
|
(320 * e_zone_current_get(cfd->dia->win->container)->h) /
|
||||||
e_zone_current_get(cfd->dia->win->container)->w);
|
e_zone_current_get(cfd->dia->win->container)->w);
|
||||||
|
|
||||||
|
|
||||||
/* Load inits */
|
/* Load inits */
|
||||||
init_dirs = e_path_dir_list_get(path_init);
|
init_dirs = e_path_dir_list_get(path_init);
|
||||||
|
@ -198,7 +196,7 @@ _load_inits(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
if (ecore_file_is_dir(full_path)) continue;
|
if (ecore_file_is_dir(full_path)) continue;
|
||||||
if (!e_util_edje_collection_exists(full_path, "init/splash")) continue;
|
if (!e_util_edje_collection_exists(full_path, "init/splash")) continue;
|
||||||
|
|
||||||
if (!e_thumb_exists(c))
|
if (!e_thumb_exists(full_path))
|
||||||
ic = e_thumb_generate_begin(full_path, 48, 48, cfd->dia->win->evas, &ic, NULL, NULL);
|
ic = e_thumb_generate_begin(full_path, 48, 48, cfd->dia->win->evas, &ic, NULL, NULL);
|
||||||
else
|
else
|
||||||
ic = e_thumb_evas_object_get(full_path, cfd->dia->win->evas, 48, 48, 1);
|
ic = e_thumb_evas_object_get(full_path, cfd->dia->win->evas, 48, 48, 1);
|
||||||
|
@ -224,7 +222,6 @@ _load_inits(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
}
|
}
|
||||||
evas_list_free(init);
|
evas_list_free(init);
|
||||||
if (init_dirs) e_path_dir_list_free(init_dirs);
|
if (init_dirs) e_path_dir_list_free(init_dirs);
|
||||||
free(c);
|
|
||||||
cfd->data = im;
|
cfd->data = im;
|
||||||
e_widget_ilist_go(il);
|
e_widget_ilist_go(il);
|
||||||
if (selnum >= 0)
|
if (selnum >= 0)
|
||||||
|
|
Loading…
Reference in New Issue