From 5cfae178706d665f472b356497704ced74fb55e2 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Wed, 12 Jan 2005 13:59:01 +0000
Subject: [PATCH] some extra object checks to catch wierdness/badness..

also fix segv if you have NO apps :)


SVN revision: 12925
---
 src/bin/e_int_menus.c | 39 +++++++++++++++++++++------------------
 src/bin/e_object.c    | 12 ++++++++++++
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index e0b292b32..ef55b2975 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -218,26 +218,29 @@ _e_int_menus_apps_scan(E_Menu *m)
    
    a = e_object_data_get(E_OBJECT(m));
    e_app_subdir_scan(a, 0);
-   for (l = a->subapps; l; l = l->next)
+   if (a)
      {
-	a = l->data;
-	
-	mi = e_menu_item_new(m);
-	e_menu_item_label_set(mi, a->name);
-	if (a->exe)
+	for (l = a->subapps; l; l = l->next)
 	  {
-	     e_menu_item_icon_edje_set(mi, a->path, "icon");
-	     e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
-	     app_count++;
-	  }
-	else
-	  {
-	     char buf[4096];
+	     a = l->data;
 	     
-	     snprintf(buf, sizeof(buf), "%s/.directory.eet", a->path);
-	     e_menu_item_icon_edje_set(mi, buf, "icon");
-	     e_menu_item_submenu_set(mi, e_int_menus_apps_new(a->path));
-	     app_count++;
+	     mi = e_menu_item_new(m);
+	     e_menu_item_label_set(mi, a->name);
+	     if (a->exe)
+	       {
+		  e_menu_item_icon_edje_set(mi, a->path, "icon");
+		  e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
+		  app_count++;
+	       }
+	     else
+	       {
+		  char buf[4096];
+		  
+		  snprintf(buf, sizeof(buf), "%s/.directory.eet", a->path);
+		  e_menu_item_icon_edje_set(mi, buf, "icon");
+		  e_menu_item_submenu_set(mi, e_int_menus_apps_new(a->path));
+		  app_count++;
+	       }
 	  }
      }
    if (app_count == 0)
@@ -266,7 +269,7 @@ _e_int_menus_apps_del_hook(void *obj)
 	E_Menu_Item *mi;
 	
 	mi = l->data;
-	if (mi->submenu) e_object_del(mi->submenu);
+	if (mi->submenu) e_object_del(E_OBJECT(mi->submenu));
      }
 }
 
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index ed619d1b1..67a827b6f 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -184,6 +184,18 @@ e_object_error(E_Object *obj)
 			"%s",
 			obj, magic,
 			bt);
+	     else if (obj->references < 0)
+	       snprintf(buf, sizeof(buf),
+			"Object [%p] has negative references (%i).\n"
+			"%s",
+			obj, obj->references,
+			bt);
+	     else if (obj->references > 100)
+	       snprintf(buf, sizeof(buf),
+			"Object [%p] has unusually high reference count (%i).\n"
+			"%s",
+			obj, obj->references,
+			bt);
 	     /* it's all ok! */
 	     else
 	       {