[EGIT] [core/enlightenment] enlightenment-0.19 02/03: fix dialog sizing when icon setting fails

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.19.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f7c07dd0861c2bd84971b448ad46ce87772ac837

commit f7c07dd0861c2bd84971b448ad46ce87772ac837
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Feb 23 16:48:09 2015 -0500

    fix dialog sizing when icon setting fails
---
 src/bin/e_dialog.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index 34475c2..4f1bd48 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -175,7 +175,11 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, 
Evas_Coord size)
              evas_object_show(dia->icon_object);
           }
         if (!e_util_icon_theme_set(dia->icon_object, icon))
-          e_icon_file_edje_set(dia->icon_object, icon, "icon");
+          if (!e_icon_file_edje_set(dia->icon_object, icon, "icon"))
+            {
+               E_FREE_FUNC(dia->icon_object, evas_object_del);
+               return;
+            }
         evas_object_size_hint_min_set(dia->icon_object, size * e_scale, size * 
e_scale);
         edje_object_signal_emit(dia->bg_object, "e,state,icon", "e");
         edje_object_signal_emit(dia->bg_object, "e,icon,enabled", "e");

--