From f483a73406d5e64cdc8c2d556816e3b4a43e8e40 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 5 Mar 2005 04:47:46 +0000
Subject: [PATCH] callback paranoia

touchies


SVN revision: 13626
---
 legacy/evas/autogen.sh                      | 2 ++
 legacy/evas/src/lib/canvas/evas_callbacks.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/legacy/evas/autogen.sh b/legacy/evas/autogen.sh
index 9d8816d85d..464d901636 100755
--- a/legacy/evas/autogen.sh
+++ b/legacy/evas/autogen.sh
@@ -3,6 +3,8 @@
 rm -rf autom4te.cache
 rm -f aclocal.m4
 
+touch README
+
 echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
 && echo "Running autoheader..."; autoheader \
 && echo "Running autoconf..."; autoconf \
diff --git a/legacy/evas/src/lib/canvas/evas_callbacks.c b/legacy/evas/src/lib/canvas/evas_callbacks.c
index d09ba09a1a..bac478e360 100644
--- a/legacy/evas/src/lib/canvas/evas_callbacks.c
+++ b/legacy/evas/src/lib/canvas/evas_callbacks.c
@@ -115,6 +115,7 @@ evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void
    /* MEM OK */
    Evas_Object_List **l_mod, *l;
    
+   if (obj->delete_me) return;
    if (!obj->callbacks)
      {
 	if ((obj->smart.parent) &&
@@ -184,7 +185,10 @@ evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void
 	
 	fn = (Evas_Func_Node *)l;
 	if (!fn->delete_me)
-	  fn->func(fn->data, obj->layer->evas, obj, event_info);
+	  {
+	     if (fn->func)
+	       fn->func(fn->data, obj->layer->evas, obj, event_info);
+	  }
 	if (obj->delete_me) break;
      }
    obj->callbacks->walking_list--;