diff options
| author | Tim Janik <timj@src.gnome.org> | 1998-05-11 15:30:05 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-05-11 15:30:05 +0000 |
| commit | ad137948b9a35d3e3a2e7323bda24cb12157e7d8 (patch) | |
| tree | adc4667cba585f6f9794314780f87a965d005a44 /gtk/gtkobject.c | |
| parent | e8df8ce17b22541b2cb4a4e00628e85f1df7441f (diff) | |
| download | gtk+-ad137948b9a35d3e3a2e7323bda24cb12157e7d8.tar.gz | |
compilation fixups
Diffstat (limited to 'gtk/gtkobject.c')
| -rw-r--r-- | gtk/gtkobject.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 00f9fddbaf..08f9c3460c 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -992,7 +992,6 @@ gtk_object_set_data_by_id_full (GtkObject *object, GtkDestroyNotify destroy) { GtkObjectData *odata; - GtkObjectData *prev; g_return_if_fail (object != NULL); g_return_if_fail (GTK_IS_OBJECT (object)); @@ -1001,6 +1000,8 @@ gtk_object_set_data_by_id_full (GtkObject *object, odata = object->object_data; if (!data) { + GtkObjectData *prev; + prev = NULL; while (odata) @@ -1022,6 +1023,10 @@ gtk_object_set_data_by_id_full (GtkObject *object, } else { + GtkObjectData *prev; + + prev = NULL; + while (odata) { if (odata->id == data_id) @@ -1045,8 +1050,9 @@ gtk_object_set_data_by_id_full (GtkObject *object, odata->destroy = destroy; return; } - - odata = odata->next; + + prev = odata; + odata = prev->next; } if (gtk_object_data_free_list) @@ -1520,14 +1526,16 @@ gtk_trace_referencing (GtkObject *object, guint line, gboolean do_ref) { - gboolean exists; - if (gtk_debug_flags & GTK_DEBUG_OBJECTS) { + gboolean exists = TRUE; + g_return_if_fail (object != NULL); g_return_if_fail (GTK_IS_OBJECT (object)); +#ifdef G_ENABLE_DEBUG exists = g_hash_table_lookup (living_objs_ht, object) != NULL; +#endif /* !G_ENABLE_DEBUG */ if (exists && (object == gtk_trace_object || |