[EGIT] [core/enlightenment] master 01/01: fix ibox crash when border hasn't been assigned to a zone

[Mike Blumenkrantz - Enlightenment Git]

discomfitor pushed a commit to branch master.

commit 1f0a8801b5e44de561d33883ff16757db0f982b4
Author: Mike Blumenkrantz <m.blumenk...@samsung.com>
Date:   Tue Mar 26 11:51:40 2013 +0000

    fix ibox crash when border hasn't been assigned to a zone
---
 src/modules/ibox/e_mod_main.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 42e3e00..b01a71d 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -983,30 +983,29 @@ atend:
 static Eina_Bool
 _ibox_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, void 
*event)
 {
-   E_Event_Border_Add *ev;
+   E_Event_Border_Add *ev = event;
    IBox *b;
    IBox_Icon *ic;
    E_Desk *desk;
+   Eina_List *ibox;
 
-   ev = event;
    /* add if iconic */
+   if (!ev->border->iconic) return ECORE_CALLBACK_RENEW;
+   if (!ev->border->zone) return ECORE_CALLBACK_RENEW;
    desk = e_desk_current_get(ev->border->zone);
-   if (ev->border->iconic)
+        
+   ibox = _ibox_zone_find(ev->border->zone);
+   EINA_LIST_FREE(ibox, b)
      {
-        Eina_List *ibox;
-        ibox = _ibox_zone_find(ev->border->zone);
-        EINA_LIST_FREE(ibox, b)
-          {
-             if (_ibox_icon_find(b, ev->border)) continue;
-             if ((b->inst->ci->show_desk) && (ev->border->desk != desk) && 
(!ev->border->sticky)) continue;
-             ic = _ibox_icon_new(b, ev->border);
-             if (!ic) continue;
-             b->icons = eina_list_append(b->icons, ic);
-             e_box_pack_end(b->o_box, ic->o_holder);
-             _ibox_empty_handle(b);
-             _ibox_resize_handle(b);
-             _gc_orient(b->inst->gcc, -1);
-          }
+        if (_ibox_icon_find(b, ev->border)) continue;
+        if ((b->inst->ci->show_desk) && (ev->border->desk != desk) && 
(!ev->border->sticky)) continue;
+        ic = _ibox_icon_new(b, ev->border);
+        if (!ic) continue;
+        b->icons = eina_list_append(b->icons, ic);
+        e_box_pack_end(b->o_box, ic->o_holder);
+        _ibox_empty_handle(b);
+        _ibox_resize_handle(b);
+        _gc_orient(b->inst->gcc, -1);
      }
    return ECORE_CALLBACK_PASS_ON;
 }

-- 

------------------------------------------------------------------------------
Own the Future-Intel&reg; Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game 
on Steam. $5K grand prize plus 10 genre and skill prizes. 
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d