register living objects in a hashtable.

Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkobject.c: register living objects in a hashtable.

diff --git a/ChangeLog b/ChangeLog
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2c1c9ee7c72b43dbab64ecc7584644d0f0b5cf99..93f1633ed19350f01a0a28bcb12b30fc9001756f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sun Mar  8 00:18:04 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkobject.c: register living objects in a hashtable.
+
 Sat Mar  7 20:20:53 1998  Tim Janik  <timj@gimp.org>
 
        * gtk/gtkobject.c:

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9cbd961a0b85dbb064bf284dbc5ecb6252bbbb99..c4b8da2d79372494a952c4218c484ba594dd80d5 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -847,18 +847,14 @@ gtk_menu_need_resize (GtkContainer *container)
 static void
 gtk_menu_deactivate (GtkMenuShell *menu_shell)
 {
-  GtkMenuShell *parent;
-
   g_return_if_fail (menu_shell != NULL);
   g_return_if_fail (GTK_IS_MENU (menu_shell));
 
-  parent = GTK_MENU_SHELL (menu_shell->parent_menu_shell);
-
   menu_shell->activate_time = 0;
   gtk_menu_popdown (GTK_MENU (menu_shell));
 
-  if (parent)
-    gtk_menu_shell_deactivate (parent);
+  if (menu_shell->parent_menu_shell)
+    gtk_menu_shell_deactivate (GTK_MENU_SHELL (menu_shell->parent_menu_shell));
 }
 
 

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index b57eacbef6e01a5633c1d6effd64598495816472..e56fff9a5893905c85d372728a9febe5c95fd297 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -93,32 +93,39 @@ static GHashTable *arg_info_ht = NULL;
 static const char *user_data_key = "user_data";
 
 
+#ifdef G_ENABLE_DEBUG
 static gint obj_count = 0;
-static GSList *living_objs = NULL;
-
-
+static GHashTable *living_objs_ht = NULL;
+static void
+gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
+{
+  GtkObject *object;
+  
+  object = (GtkObject*) value;
+  g_print ("%p: %s ref_count=%d%s%s\n",
+          object,
+          gtk_type_name (GTK_OBJECT_TYPE (object)),
+          object->ref_count,
+          GTK_OBJECT_FLOATING (object) ? " (floating)" : "",
+          GTK_OBJECT_DESTROYED (object) ? " (destroyed)" : "");
+}
 static void
 gtk_object_debug (void)
 {
-  if (1)
-    {
-      GSList *node;
-      
-      printf ("living objects (%d):\n", g_slist_length (living_objs));
-      for (node = living_objs; node; node = node->next)
-       {
-         GtkObject *obj;
-         
-         obj = (GtkObject*) node->data;
-         printf ("%p: %s ref_count=%d%s%s\n",
-                 obj, gtk_type_name (GTK_OBJECT_TYPE (obj)),
-                 obj->ref_count,
-                 GTK_OBJECT_FLOATING (obj) ? " (floating)" : "",
-                 GTK_OBJECT_DESTROYED (obj) ? " (destroyed)" : "");
-       }
-    }
-  printf ("living objects count = %d\n", obj_count);
+  g_hash_table_foreach (living_objs_ht, gtk_object_debug_foreach, NULL);
+
+  g_print ("living objects count = %d\n", obj_count);
 }
+static guint
+gtk_object_pointer_hash (const gpointer v)
+{
+  gint i;
+
+  i = (gint) v;
+  
+  return i;
+}
+#endif /* G_ENABLE_DEBUG */
 
 /*****************************************
  * gtk_object_init_type:
@@ -237,7 +244,11 @@ gtk_object_init (GtkObject *object)
   if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
     {
       obj_count++;
-      living_objs = g_slist_prepend (living_objs, object);
+      
+      if (!living_objs_ht)
+       living_objs_ht = g_hash_table_new (gtk_object_pointer_hash, NULL);
+
+      g_hash_table_insert (living_objs_ht, object, object);
     }
 #endif /* G_ENABLE_DEBUG */
 }
@@ -1582,8 +1593,8 @@ gtk_object_unref (GtkObject *object)
 #ifdef G_ENABLE_DEBUG
       if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
        {
-         g_assert (g_slist_find (living_objs, object));
-         living_objs = g_slist_remove (living_objs, object);
+         g_assert (g_hash_table_lookup (living_objs_ht, object) == object);
+         g_hash_table_remove (living_objs_ht, object);
          obj_count--;
        }
 #endif /* G_ENABLE_DEBUG */      
@@ -1591,10 +1602,9 @@ gtk_object_unref (GtkObject *object)
     }
 }
 
-#ifdef G_ENABLE_DEBUG
 
+#ifdef G_ENABLE_DEBUG
 static GtkObject *gtk_trace_object = NULL;
-
 void
 gtk_trace_referencing (gpointer    *o,
                       const gchar *func,
@@ -1610,7 +1620,7 @@ gtk_trace_referencing (gpointer    *o,
       g_return_if_fail (object != NULL);
       g_return_if_fail (GTK_IS_OBJECT (object));
 
-      exists = (g_slist_find (living_objs, object) != NULL);
+      exists = g_hash_table_lookup (living_objs_ht, object) != NULL;
       
       if (exists &&
          (object == gtk_trace_object ||
@@ -1639,6 +1649,5 @@ gtk_trace_referencing (gpointer    *o,
   else
     gtk_object_unref (object);
 }
-
 #endif /* G_ENABLE_DEBUG */