From d98b09b6ff756ec96fb39136f1fdee5e99805859 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sat, 24 Mar 2007 15:18:00 +0000 Subject: [PATCH] internal_icons should always point to an icon, not to an e_app SVN revision: 29012 --- src/bin/e_border.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index b10a733ad..14e414858 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2591,30 +2591,18 @@ e_border_icon_add(E_Border *bd, Evas *evas) e_util_edje_icon_set(o, "enlightenment/e"); else { - 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(a, evas); - bd->app = a; - e_object_ref(E_OBJECT(bd->app)); - } - else - { - char *ext; + char *ext; - ext = strrchr(bd->internal_icon, '.'); - if ((ext) && ((!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"); - } + ext = strrchr(bd->internal_icon, '.'); + if ((ext) && ((!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"); } } if (o)