From b44ac37ec86d52d3d68ab3efa103795fd9e49a29 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 20 Aug 2011 02:43:05 +0000 Subject: [PATCH] e17: show fallback border icon again SVN revision: 62611 --- src/bin/e_border.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 39c6a835b..8d3eecb56 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -3750,9 +3750,11 @@ e_border_icon_add(E_Border *bd, o = NULL; if (bd->internal) { - o = edje_object_add(evas); if (!bd->internal_icon) - e_util_edje_icon_set(o, "enlightenment"); + { + o = e_icon_add(evas); + e_util_icon_theme_set(o, "enlightenment"); + } else { if (!bd->internal_icon_key) @@ -3762,18 +3764,17 @@ e_border_icon_add(E_Border *bd, ext = strrchr(bd->internal_icon, '.'); if ((ext) && ((!strcmp(ext, ".edj")))) { + o = edje_object_add(evas); if (!edje_object_file_set(o, bd->internal_icon, "icon")) - e_util_edje_icon_set(o, "enlightenment"); + e_util_icon_theme_set(o, "enlightenment"); } else if (ext) { - evas_object_del(o); o = e_icon_add(evas); e_icon_file_set(o, bd->internal_icon); } else { - evas_object_del(o); o = e_icon_add(evas); if (!e_util_icon_theme_set(o, bd->internal_icon)) e_util_icon_theme_set(o, "enlightenment"); @@ -3781,6 +3782,7 @@ e_border_icon_add(E_Border *bd, } else { + o = edje_object_add(evas); edje_object_file_set(o, bd->internal_icon, bd->internal_icon_key); }