parent
242263bdad
commit
d283372cf7
|
@ -2546,27 +2546,29 @@ e_border_icon_add(E_Border *bd, Evas *evas)
|
|||
{
|
||||
a = e_app_new(bd->internal_icon, 0);
|
||||
if (a)
|
||||
{
|
||||
/* Free the aborted object first. */
|
||||
if (o) evas_object_del(o);
|
||||
o = e_app_icon_add(evas, a);
|
||||
bd->app = a;
|
||||
e_object_ref(E_OBJECT(bd->app));
|
||||
}
|
||||
{
|
||||
/* Free the aborted object first. */
|
||||
if (o) evas_object_del(o);
|
||||
o = e_app_icon_add(evas, a);
|
||||
bd->app = a;
|
||||
e_object_ref(E_OBJECT(bd->app));
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap"))
|
||||
|| (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".edj")))
|
||||
{
|
||||
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
|
||||
e_util_edje_icon_set(o, "enlightenment/e");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!e_util_edje_icon_set(o, bd->internal_icon))
|
||||
e_util_edje_icon_set(o, "enlightenment/e");
|
||||
}
|
||||
}
|
||||
{
|
||||
char *ext;
|
||||
|
||||
ext = strrchr(bd->internal_icon, '.');
|
||||
if ((ext) && ((!strcmp(ext, ".eap")) || (!strcmp(ext, ".edj"))))
|
||||
{
|
||||
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
|
||||
e_util_edje_icon_set(o, "enlightenment/e");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!e_util_edje_icon_set(o, bd->internal_icon))
|
||||
e_util_edje_icon_set(o, "enlightenment/e");
|
||||
}
|
||||
}
|
||||
}
|
||||
return o;
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
_cb_editor_del(E_Object *obj)
|
||||
_cb_editor_del(void *obj)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
|
Loading…
Reference in New Issue