enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

umm - probably clear up some invalid reads/uninit values here. 

SVN revision: 62615
This commit is contained in:
Carsten Haitzler 2011-08-20 03:57:28 +00:00
parent bc14c3e150
commit c92b31afb7
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/e_fm.c
View File

@ -2047,11 +2047,7 @@ _e_fm2_icon_mime_fdo_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret
size = _e_fm2_icon_mime_size_normalize(ic); size = _e_fm2_icon_mime_size_normalize(ic);
icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size); icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size);
if (icon) if (icon)
{ return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
Evas_Object *o;
o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
return o;
}
return NULL; return NULL;
} }
@ -2068,14 +2064,14 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r
file = e_theme_edje_file_get("base/theme/icons", buf); file = e_theme_edje_file_get("base/theme/icons", buf);
if (file && file[0]) if (file && file[0])
{ {
Evas_Object *obj = edje_object_add(evas); Evas_Object *o = edje_object_add(evas);
if (!obj) return NULL; if (!o) return NULL;
if (!edje_object_file_set(obj, file, buf)) if (!edje_object_file_set(o, file, buf))
{ {
evas_object_del(obj); evas_object_del(o);
return NULL; return NULL;
} }
return obj; return o;
} }
return NULL; return NULL;
@ -2087,7 +2083,7 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r
static Evas_Object * static Evas_Object *
_e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __UNUSED__, void *data __UNUSED__, int force_gen __UNUSED__, const char **type_ret) _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __UNUSED__, void *data __UNUSED__, int force_gen __UNUSED__, const char **type_ret)
{ {
Evas_Object *o; Evas_Object *o = NULL;
if (e_config->icon_theme_overrides) if (e_config->icon_theme_overrides)
o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret); o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret);
@ -2101,9 +2097,7 @@ _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __
else else
o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret); o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret);
if (o) return o; return o;
return NULL;
} }
/** /**
@ -2158,8 +2152,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun
const char *p; const char *p;
p = strrchr(ic->info.file, '.'); p = strrchr(ic->info.file, '.');
if (!p) if (!p) return NULL;
return NULL;
p++; p++;
if (_e_fm2_ext_is_edje(p)) if (_e_fm2_ext_is_edje(p))
@ -2169,8 +2162,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun
return _e_fm2_icon_desktop_get(evas, ic, type_ret); return _e_fm2_icon_desktop_get(evas, ic, type_ret);
else if (_e_fm2_ext_is_imc(p)) else if (_e_fm2_ext_is_imc(p))
return _e_fm2_icon_imc_get(evas, ic, type_ret); return _e_fm2_icon_imc_get(evas, ic, type_ret);
else return NULL;
return NULL;
} }
/** /**
@ -2190,7 +2182,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
void *data, int force_gen, const char **type_ret) void *data, int force_gen, const char **type_ret)
{ {
const char *icon; const char *icon;
Evas_Object *o; Evas_Object *o = NULL;
if (ic->info.icon) if (ic->info.icon)
{ {