ctxpopup - Don't be dead even if a ctxpopup item callback function is null.

diff --git a/ChangeLog b/ChangeLog
index 2dbd1d0..7838231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1323,3 +1323,7 @@
 2012-05-02 WooHyun Jung
 
         * elm_entry_filter_accept_set function now can recognize tags.
+
+2012-05-02 ChunEon Park (Hermet)
+
+        * Don't be dead even if a ctxpopup item callback function is null.

diff --git a/NEWS b/NEWS
index 5d53d15..1186efe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -222,6 +222,7 @@ Fixes:
    * Fix the toolbar item clipped problem on reordering items.
    * Fix elm_object_cursor_theme_search_enabled_set to do as it's name described.
    * Elm_entry_filter_accept_set function now can recognize tags.
+   * Don't be dead even if a ctxpopup item callback is null.
 
 Removals:
 

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index a8bea71..af1acd0 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1327,6 +1327,7 @@ static void
 _item_wrap_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Ctxpopup_Item *item = data;
+   if (!item->wcb.org_func_cb) return;
    item->wcb.org_func_cb((void *)item->wcb.org_data, item->wcb.cobj, item);
 }