From 4cea03da00cdd5c6c4eb92574d15be6dc5e541b1 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 2 Jul 2012 13:52:12 +0000
Subject: [PATCH] cleanup/fix notification module shutdown to not crash

SVN revision: 73167
---
 src/modules/notification/e_mod_box.c  | 23 +----------------------
 src/modules/notification/e_mod_main.h |  1 -
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/modules/notification/e_mod_box.c b/src/modules/notification/e_mod_box.c
index 713ffc3d3..622bd38a3 100644
--- a/src/modules/notification/e_mod_box.c
+++ b/src/modules/notification/e_mod_box.c
@@ -85,24 +85,6 @@ notification_box_shutdown(void)
      }
 }
 
-void
-notification_box_del(const char *id)
-{
-   Eina_List *l;
-   Notification_Box *b;
-
-   /* Find old config */
-   EINA_LIST_FOREACH(notification_cfg->n_box, l, b)
-     {
-        if (b->id == id)
-          {
-             notification_cfg->n_box = eina_list_remove(notification_cfg->n_box, b);
-             _notification_box_free(b);
-             return;
-          }
-     }
-}
-
 void
 notification_box_visible_set(Notification_Box *b, Eina_Bool visible)
 {
@@ -233,9 +215,6 @@ _notification_box_free(Notification_Box *b)
 {
    _notification_box_empty(b);
    eina_stringshare_del(b->id);
-   evas_object_del(b->o_box);
-   if (b->o_empty) evas_object_del(b->o_empty);
-   b->o_empty = NULL;
    free(b);
 }
 
@@ -275,7 +254,7 @@ _notification_box_empty(Notification_Box *b)
 {
    Notification_Box_Icon *ic;
    EINA_LIST_FREE(b->icons, ic)
-     _notification_box_icon_free(b->icons->data);
+     _notification_box_icon_free(ic);
    _notification_box_empty_handle(b);
 }
 
diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h
index 223982544..eca04861a 100644
--- a/src/modules/notification/e_mod_main.h
+++ b/src/modules/notification/e_mod_main.h
@@ -127,7 +127,6 @@ void notification_popup_close(unsigned int id);
 
 void notification_box_notify(E_Notification *n, unsigned int replaces_id, unsigned int id);
 void notification_box_shutdown(void);
-void notification_box_del(const char *id);
 void notification_box_visible_set(Notification_Box *b, Eina_Bool visible);
 Notification_Box *notification_box_get(const char *id, Evas *evas);
 Config_Item *notification_box_config_item_get(const char *id);