size = _e_fm2_icon_mime_size_normalize(ic);
icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size);
if (icon)
- {
- Evas_Object *o;
- o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
- return o;
- }
+ return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
return NULL;
}
file = e_theme_edje_file_get("base/theme/icons", buf);
if (file && file[0])
{
- Evas_Object *obj = edje_object_add(evas);
- if (!obj) return NULL;
- if (!edje_object_file_set(obj, file, buf))
+ Evas_Object *o = edje_object_add(evas);
+ if (!o) return NULL;
+ if (!edje_object_file_set(o, file, buf))
{
- evas_object_del(obj);
+ evas_object_del(o);
return NULL;
}
- return obj;
+ return o;
}
return NULL;
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)
{
- Evas_Object *o;
+ Evas_Object *o = NULL;
if (e_config->icon_theme_overrides)
o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret);
else
o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret);
- if (o) return o;
-
- return NULL;
+ return o;
}
/**
const char *p;
p = strrchr(ic->info.file, '.');
- if (!p)
- return NULL;
+ if (!p) return NULL;
p++;
if (_e_fm2_ext_is_edje(p))
return _e_fm2_icon_desktop_get(evas, ic, type_ret);
else if (_e_fm2_ext_is_imc(p))
return _e_fm2_icon_imc_get(evas, ic, type_ret);
- else
- return NULL;
+ return NULL;
}
/**
void *data, int force_gen, const char **type_ret)
{
const char *icon;
- Evas_Object *o;
+ Evas_Object *o = NULL;
if (ic->info.icon)
{