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