glib/libgobject/src/gobject.c
changeset 0 e4d67989cc36
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/glib/libgobject/src/gobject.c	Tue Feb 02 02:01:42 2010 +0200
@@ -0,0 +1,2385 @@
+/* GObject - GLib Type, Object, Parameter and Signal Library
+ * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
+ * Portions copyright (c) 2006 Nokia Corporation.  All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#include	"gobject.h"
+#include	"gobjectalias.h"
+#ifndef __SYMBIAN32__
+#include        <glib/gdatasetprivate.h>
+#else
+#include <gdatasetprivate.h>
+#endif /* __SYMBIAN32__ */
+/*
+ * MT safe with regards to reference counting.
+ */
+ #ifdef __SYMBIAN32__
+#include <glib_global.h>
+#include <gobject_wsd.h>
+#include <gobject_global.h>
+#endif /* __SYMBIAN32__ */
+
+#include	"gvaluecollector.h"
+#include	"gsignal.h"
+#include	"gparamspecs.h"
+#include	"gvaluetypes.h"
+#include	"gobjectnotifyqueue.c"
+#include	<string.h>
+#ifndef __SYMBIAN32__
+#include	<signal.h>
+#endif /* __SYMBIAN32__ */
+
+
+#define	PREALLOC_CPARAMS	(8)
+
+
+/* --- macros --- */
+#define PARAM_SPEC_PARAM_ID(pspec)		((pspec)->param_id)
+#define	PARAM_SPEC_SET_PARAM_ID(pspec, id)	((pspec)->param_id = (id))
+
+#define OBJECT_HAS_TOGGLE_REF_FLAG 0x1
+#define OBJECT_HAS_TOGGLE_REF(object) \
+    ((G_DATALIST_GET_FLAGS (&(object)->qdata) & OBJECT_HAS_TOGGLE_REF_FLAG) != 0)
+#define OBJECT_FLOATING_FLAG 0x2
+
+
+/* --- signals --- */
+enum {
+  NOTIFY,
+  LAST_SIGNAL
+};
+
+
+/* --- properties --- */
+enum {
+  PROP_NONE
+};
+
+
+/* --- prototypes --- */
+static void	g_object_base_class_init		(GObjectClass	*class);
+static void	g_object_base_class_finalize		(GObjectClass	*class);
+static void	g_object_do_class_init			(GObjectClass	*class);
+static void	g_object_init				(GObject	*object);
+static GObject*	g_object_constructor			(GType                  type,
+							 guint                  n_construct_properties,
+							 GObjectConstructParam *construct_params);
+static void	g_object_real_dispose			(GObject	*object);
+static void	g_object_finalize			(GObject	*object);
+static void	g_object_do_set_property		(GObject        *object,
+							 guint           property_id,
+							 const GValue   *value,
+							 GParamSpec     *pspec);
+static void	g_object_do_get_property		(GObject        *object,
+							 guint           property_id,
+							 GValue         *value,
+							 GParamSpec     *pspec);
+static void	g_value_object_init			(GValue		*value);
+static void	g_value_object_free_value		(GValue		*value);
+static void	g_value_object_copy_value		(const GValue	*src_value,
+							 GValue		*dest_value);
+static void	g_value_object_transform_value		(const GValue	*src_value,
+							 GValue		*dest_value);
+static gpointer g_value_object_peek_pointer             (const GValue   *value);
+static gchar*	g_value_object_collect_value		(GValue		*value,
+							 guint           n_collect_values,
+							 GTypeCValue    *collect_values,
+							 guint           collect_flags);
+static gchar*	g_value_object_lcopy_value		(const GValue	*value,
+							 guint           n_collect_values,
+							 GTypeCValue    *collect_values,
+							 guint           collect_flags);
+static void	g_object_dispatch_properties_changed	(GObject	*object,
+							 guint		 n_pspecs,
+							 GParamSpec    **pspecs);
+static inline void         object_get_property		(GObject        *object,
+							 GParamSpec     *pspec,
+							 GValue         *value);
+static inline void	   object_set_property		(GObject        *object,
+							 GParamSpec     *pspec,
+							 const GValue   *value,
+							 GObjectNotifyQueue *nqueue);
+#if (EMULATOR)							 
+guint               object_floating_flag_handler (GObject        *object,
+                                                         gint            job);
+#else
+static guint               object_floating_flag_handler (GObject        *object,
+                                                         gint            job);
+#endif /* EMULATOR */
+static void object_interface_check_properties           (gpointer        func_data,
+							 gpointer        g_iface);
+
+
+/* --- variables --- */
+#if EMULATOR
+
+PLS(quark_closure_array,gobject,GQuark)
+PLS(quark_weak_refs,gobject,GQuark)
+PLS(quark_toggle_refs,gobject,GQuark)
+PLS(pspec_pool,gobject,GParamSpecPool *)
+PLS(property_notify_context,gobject,GObjectNotifyContext)
+PLS_ARRAY(gobject_signals,gobject,gulong)
+PLS_MACRO(construct_objects_lock,gobject,GStaticMutex)
+PLS(construct_objects,gobject,GSList *)
+PLS(floating_flag_handler,gobject,function_type)
+
+#define quark_closure_array (*FUNCTION_NAME(quark_closure_array,gobject)())
+#define quark_weak_refs (*FUNCTION_NAME(quark_weak_refs,gobject)())
+#define quark_toggle_refs (*FUNCTION_NAME(quark_toggle_refs,gobject)())
+#define pspec_pool (*FUNCTION_NAME(pspec_pool,gobject)())
+#define property_notify_context (*FUNCTION_NAME(property_notify_context,gobject)())
+#define gobject_signals (FUNCTION_NAME(gobject_signals,gobject)())
+#define g__construct_objects_lock_lock (*FUNCTION_NAME_MACRO(construct_objects_lock,gobject)())
+#define construct_objects (*FUNCTION_NAME(construct_objects,gobject)())
+#define floating_flag_handler (*FUNCTION_NAME(floating_flag_handler,gobject)())
+
+#else
+
+static GQuark	            quark_closure_array = 0;
+static GQuark	            quark_weak_refs = 0;
+static GQuark	            quark_toggle_refs = 0;
+static GParamSpecPool      *pspec_pool = NULL;
+static GObjectNotifyContext property_notify_context = { 0, };
+static gulong	            gobject_signals[LAST_SIGNAL] = { 0, };
+G_LOCK_DEFINE_STATIC (construct_objects_lock);
+static GSList *construct_objects = NULL;
+static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_handler;
+
+#endif /* EMULATOR */
+
+/* --- functions --- */
+#ifdef	G_ENABLE_DEBUG
+#define	IF_DEBUG(debug_type)	if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
+#if EMULATOR
+
+PLS_MACRO(debug_objects,gobject,GStaticMutex)
+PLS(g_trap_object_ref,gobject,volatile GObject *)
+PLS(debug_objects_count,gobject,guint)
+PLS(debug_objects_ht,gobject,GHashTable	*)
+
+#define g__debug_objects_lock (*FUNCTION_NAME_MACRO(debug_objects,gobject)())
+#define g_trap_object_ref (*FUNCTION_NAME(g_trap_object_ref,gobject)())
+#define debug_objects_count (*FUNCTION_NAME(debug_objects_count,gobject)())
+#define debug_objects_ht (*FUNCTION_NAME(debug_objects_ht,gobject)())
+
+
+#else
+
+G_LOCK_DEFINE_STATIC     (debug_objects);
+static volatile GObject *g_trap_object_ref = NULL;
+static guint		 debug_objects_count = 0;
+static GHashTable	*debug_objects_ht = NULL;
+#endif /* EMULATOR */
+static void
+debug_objects_foreach (gpointer key,
+		       gpointer value,
+		       gpointer user_data)
+{
+  GObject *object = value;
+
+  g_message ("[%p] stale %s\tref_count=%u",
+	     object,
+	     G_OBJECT_TYPE_NAME (object),
+	     object->ref_count);
+}
+static void
+debug_objects_atexit (void)
+{
+  IF_DEBUG (OBJECTS)
+    {
+      G_LOCK (debug_objects);
+      g_message ("stale GObjects: %u", debug_objects_count);
+      g_hash_table_foreach (debug_objects_ht, debug_objects_foreach, NULL);
+      G_UNLOCK (debug_objects);
+    }
+}
+#endif	/* G_ENABLE_DEBUG */
+
+#if EMULATOR
+
+PLS(initialized ,g_object_type_init,gboolean)
+PLS(info  ,g_object_type_init,GTypeInfo)
+
+#define initialized  (*FUNCTION_NAME(initialized ,g_object_type_init)())
+#define info  (*FUNCTION_NAME(info ,g_object_type_init)())
+
+const GTypeInfo gobject_info = {
+	sizeof (GObjectClass),
+	(GBaseInitFunc) g_object_base_class_init,
+	(GBaseFinalizeFunc) g_object_base_class_finalize,
+	(GClassInitFunc) g_object_do_class_init,
+	NULL	/* class_destroy */,
+	NULL	/* class_data */,
+	sizeof (GObject),
+	0		/* n_preallocs */,
+	(GInstanceInitFunc) g_object_init,
+	NULL,	/* value_table */
+};
+
+
+#endif /* EMULATOR */
+
+void
+g_object_type_init (void)
+{
+  #if !(EMULATOR)
+  static gboolean initialized = FALSE;
+  static GTypeInfo info = {
+    sizeof (GObjectClass),
+    (GBaseInitFunc) g_object_base_class_init,
+    (GBaseFinalizeFunc) g_object_base_class_finalize,
+    (GClassInitFunc) g_object_do_class_init,
+    NULL	/* class_destroy */,
+    NULL	/* class_data */,
+    sizeof (GObject),
+    0		/* n_preallocs */,
+    (GInstanceInitFunc) g_object_init,
+    NULL,	/* value_table */
+  };
+  #endif /* EMULATOR */
+  static const GTypeFundamentalInfo finfo = {
+    G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE,
+  };
+
+  static const GTypeValueTable value_table = {
+    g_value_object_init,	  /* value_init */
+    g_value_object_free_value,	  /* value_free */
+    g_value_object_copy_value,	  /* value_copy */
+    g_value_object_peek_pointer,  /* value_peek_pointer */
+    "p",			  /* collect_format */
+    g_value_object_collect_value, /* collect_value */
+    "p",			  /* lcopy_format */
+    g_value_object_lcopy_value,	  /* lcopy_value */
+  };
+  GType type;
+  
+  g_return_if_fail (initialized == FALSE);
+  initialized = TRUE;
+  
+  /* G_TYPE_OBJECT
+   */
+  info.value_table = &value_table;
+  type = g_type_register_fundamental (G_TYPE_OBJECT, g_intern_static_string ("GObject"), &info, &finfo, 0);
+  g_assert (type == G_TYPE_OBJECT);
+  g_value_register_transform_func (G_TYPE_OBJECT, G_TYPE_OBJECT, g_value_object_transform_value);
+  
+#ifdef	G_ENABLE_DEBUG
+  IF_DEBUG (OBJECTS)
+    {
+      debug_objects_ht = g_hash_table_new (g_direct_hash, NULL);
+      g_atexit (debug_objects_atexit);
+    }
+#endif	/* G_ENABLE_DEBUG */
+}
+
+#if EMULATOR
+#undef initialized
+#undef info
+#endif /* EMULATOR */
+
+static void
+g_object_base_class_init (GObjectClass *class)
+{
+  GObjectClass *pclass = g_type_class_peek_parent (class);
+
+  /* reset instance specific fields and methods that don't get inherited */
+  class->construct_properties = pclass ? g_slist_copy (pclass->construct_properties) : NULL;
+  class->get_property = NULL;
+  class->set_property = NULL;
+}
+
+static void
+g_object_base_class_finalize (GObjectClass *class)
+{
+  GList *list, *node;
+  
+  _g_signals_destroy (G_OBJECT_CLASS_TYPE (class));
+
+  g_slist_free (class->construct_properties);
+  class->construct_properties = NULL;
+  list = g_param_spec_pool_list_owned (pspec_pool, G_OBJECT_CLASS_TYPE (class));
+  for (node = list; node; node = node->next)
+    {
+      GParamSpec *pspec = node->data;
+      
+      g_param_spec_pool_remove (pspec_pool, pspec);
+      PARAM_SPEC_SET_PARAM_ID (pspec, 0);
+      g_param_spec_unref (pspec);
+    }
+  g_list_free (list);
+}
+
+static void
+g_object_notify_dispatcher (GObject     *object,
+			    guint        n_pspecs,
+			    GParamSpec **pspecs)
+{
+  G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, n_pspecs, pspecs);
+}
+
+static void
+g_object_do_class_init (GObjectClass *class)
+{
+  /* read the comment about typedef struct CArray; on why not to change this quark */
+  quark_closure_array = g_quark_from_static_string ("GObject-closure-array");
+
+  quark_weak_refs = g_quark_from_static_string ("GObject-weak-references");
+  quark_toggle_refs = g_quark_from_static_string ("GObject-toggle-references");
+  pspec_pool = g_param_spec_pool_new (TRUE);
+  property_notify_context.quark_notify_queue = g_quark_from_static_string ("GObject-notify-queue");
+  property_notify_context.dispatcher = g_object_notify_dispatcher;
+  
+  class->constructor = g_object_constructor;
+  class->set_property = g_object_do_set_property;
+  class->get_property = g_object_do_get_property;
+  class->dispose = g_object_real_dispose;
+  class->finalize = g_object_finalize;
+  class->dispatch_properties_changed = g_object_dispatch_properties_changed;
+  class->notify = NULL;
+
+  gobject_signals[NOTIFY] =
+    g_signal_new (g_intern_static_string ("notify"),
+		  G_TYPE_FROM_CLASS (class),
+		  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (GObjectClass, notify),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__PARAM,
+		  G_TYPE_NONE,
+		  1, G_TYPE_PARAM);
+
+  /* Install a check function that we'll use to verify that classes that
+   * implement an interface implement all properties for that interface
+   */
+  g_type_add_interface_check (NULL, object_interface_check_properties);
+}
+
+static void
+install_property_internal (GType       g_type,
+			   guint       property_id,
+			   GParamSpec *pspec)
+{
+  if (g_param_spec_pool_lookup (pspec_pool, pspec->name, g_type, FALSE))
+    {
+      g_warning ("When installing property: type `%s' already has a property named `%s'",
+		 g_type_name (g_type),
+		 pspec->name);
+      return;
+    }
+
+  g_param_spec_ref (pspec);
+  g_param_spec_sink (pspec);
+  PARAM_SPEC_SET_PARAM_ID (pspec, property_id);
+  g_param_spec_pool_insert (pspec_pool, pspec, g_type);
+}
+
+EXPORT_C void
+g_object_class_install_property (GObjectClass *class,
+				 guint	       property_id,
+				 GParamSpec   *pspec)
+{
+  g_return_if_fail (G_IS_OBJECT_CLASS (class));
+  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+  if (pspec->flags & G_PARAM_WRITABLE)
+    g_return_if_fail (class->set_property != NULL);
+  if (pspec->flags & G_PARAM_READABLE)
+    g_return_if_fail (class->get_property != NULL);
+  g_return_if_fail (property_id > 0);
+  g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0);	/* paranoid */
+  if (pspec->flags & G_PARAM_CONSTRUCT)
+    g_return_if_fail ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) == 0);
+  if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
+    g_return_if_fail (pspec->flags & G_PARAM_WRITABLE);
+
+  install_property_internal (G_OBJECT_CLASS_TYPE (class), property_id, pspec);
+
+  if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
+    class->construct_properties = g_slist_prepend (class->construct_properties, pspec);
+
+  /* for property overrides of construct poperties, we have to get rid
+   * of the overidden inherited construct property
+   */
+  pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, g_type_parent (G_OBJECT_CLASS_TYPE (class)), TRUE);
+  if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
+    class->construct_properties = g_slist_remove (class->construct_properties, pspec);
+}
+
+EXPORT_C void
+g_object_interface_install_property (gpointer      g_iface,
+				     GParamSpec   *pspec)
+{
+  GTypeInterface *iface_class = g_iface;
+	
+  g_return_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type));
+  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+  g_return_if_fail (!G_IS_PARAM_SPEC_OVERRIDE (pspec)); /* paranoid */
+  g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0);	/* paranoid */
+		    
+  install_property_internal (iface_class->g_type, 0, pspec);
+}
+
+EXPORT_C GParamSpec*
+g_object_class_find_property (GObjectClass *class,
+			      const gchar  *property_name)
+{
+  GParamSpec *pspec;
+  GParamSpec *redirect;
+	
+  g_return_val_if_fail (G_IS_OBJECT_CLASS (class), NULL);
+  g_return_val_if_fail (property_name != NULL, NULL);
+  
+  pspec = g_param_spec_pool_lookup (pspec_pool,
+				    property_name,
+				    G_OBJECT_CLASS_TYPE (class),
+				    TRUE);
+  if (pspec)
+    {
+      redirect = g_param_spec_get_redirect_target (pspec);
+      if (redirect)
+	return redirect;
+      else
+	return pspec;
+    }
+  else
+    return NULL;
+}
+
+EXPORT_C GParamSpec*
+g_object_interface_find_property (gpointer      g_iface,
+				  const gchar  *property_name)
+{
+  GTypeInterface *iface_class = g_iface;
+	
+  g_return_val_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type), NULL);
+  g_return_val_if_fail (property_name != NULL, NULL);
+  
+  return g_param_spec_pool_lookup (pspec_pool,
+				   property_name,
+				   iface_class->g_type,
+				   FALSE);
+}
+
+EXPORT_C void
+g_object_class_override_property (GObjectClass *oclass,
+				  guint         property_id,
+				  const gchar  *name)
+{
+  GParamSpec *overridden = NULL;
+  GParamSpec *new;
+  GType parent_type;
+  
+  g_return_if_fail (G_IS_OBJECT_CLASS (oclass));
+  g_return_if_fail (property_id > 0);
+  g_return_if_fail (name != NULL);
+
+  /* Find the overridden property; first check parent types
+   */
+  parent_type = g_type_parent (G_OBJECT_CLASS_TYPE (oclass));
+  if (parent_type != G_TYPE_NONE)
+    overridden = g_param_spec_pool_lookup (pspec_pool,
+					   name,
+					   parent_type,
+					   TRUE);
+  if (!overridden)
+    {
+      GType *ifaces;
+      guint n_ifaces;
+      
+      /* Now check interfaces
+       */
+      ifaces = g_type_interfaces (G_OBJECT_CLASS_TYPE (oclass), &n_ifaces);
+      while (n_ifaces-- && !overridden)
+	{
+	  overridden = g_param_spec_pool_lookup (pspec_pool,
+						 name,
+						 ifaces[n_ifaces],
+						 FALSE);
+	}
+      
+      g_free (ifaces);
+    }
+
+  if (!overridden)
+    {
+      g_warning ("%s: Can't find property to override for '%s::%s'",
+		 G_STRFUNC, G_OBJECT_CLASS_NAME (oclass), name);
+      return;
+    }
+
+  new = g_param_spec_override (name, overridden);
+  g_object_class_install_property (oclass, property_id, new);
+}
+
+EXPORT_C GParamSpec** /* free result */
+g_object_class_list_properties (GObjectClass *class,
+				guint        *n_properties_p)
+{
+  GParamSpec **pspecs;
+  guint n;
+
+  g_return_val_if_fail (G_IS_OBJECT_CLASS (class), NULL);
+
+  pspecs = g_param_spec_pool_list (pspec_pool,
+				   G_OBJECT_CLASS_TYPE (class),
+				   &n);
+  if (n_properties_p)
+    *n_properties_p = n;
+
+  return pspecs;
+}
+
+EXPORT_C GParamSpec** /* free result */
+g_object_interface_list_properties (gpointer      g_iface,
+				    guint        *n_properties_p)
+{
+  GTypeInterface *iface_class = g_iface;
+  GParamSpec **pspecs;
+  guint n;
+
+  g_return_val_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type), NULL);
+
+  pspecs = g_param_spec_pool_list (pspec_pool,
+				   iface_class->g_type,
+				   &n);
+  if (n_properties_p)
+    *n_properties_p = n;
+
+  return pspecs;
+}
+
+static void
+g_object_init (GObject *object)
+{
+  object->ref_count = 1;
+  g_datalist_init (&object->qdata);
+  
+  /* freeze object's notification queue, g_object_newv() preserves pairedness */
+  g_object_notify_queue_freeze (object, &property_notify_context);
+
+  /* allow construct-only properties to be set */
+  G_LOCK (construct_objects_lock);
+  construct_objects = g_slist_prepend (construct_objects, object);
+  G_UNLOCK (construct_objects_lock);
+  
+#ifdef	G_ENABLE_DEBUG
+  IF_DEBUG (OBJECTS)
+    {
+      G_LOCK (debug_objects);
+      debug_objects_count++;
+      g_hash_table_insert (debug_objects_ht, object, object);
+      G_UNLOCK (debug_objects);
+    }
+#endif	/* G_ENABLE_DEBUG */
+}
+
+static void
+g_object_do_set_property (GObject      *object,
+			  guint         property_id,
+			  const GValue *value,
+			  GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+g_object_do_get_property (GObject     *object,
+			  guint        property_id,
+			  GValue      *value,
+			  GParamSpec  *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+g_object_real_dispose (GObject *object)
+{
+  g_signal_handlers_destroy (object);
+  g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
+  g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
+}
+
+static void
+g_object_finalize (GObject *object)
+{
+  g_datalist_clear (&object->qdata);
+  
+#ifdef	G_ENABLE_DEBUG
+  IF_DEBUG (OBJECTS)
+    {
+      G_LOCK (debug_objects);
+      g_assert (g_hash_table_lookup (debug_objects_ht, object) == object);
+      g_hash_table_remove (debug_objects_ht, object);
+      debug_objects_count--;
+      G_UNLOCK (debug_objects);
+    }
+#endif	/* G_ENABLE_DEBUG */
+}
+
+
+static void
+g_object_dispatch_properties_changed (GObject     *object,
+				      guint        n_pspecs,
+				      GParamSpec **pspecs)
+{
+  guint i;
+
+  for (i = 0; i < n_pspecs; i++)
+    g_signal_emit (object, gobject_signals[NOTIFY], g_quark_from_string (pspecs[i]->name), pspecs[i]);
+}
+
+EXPORT_C void
+g_object_run_dispose (GObject *object)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count > 0);
+
+  g_object_ref (object);
+  G_OBJECT_GET_CLASS (object)->dispose (object);
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_freeze_notify (GObject *object)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+
+  if (g_atomic_int_get (&object->ref_count) == 0)
+    return;
+
+  g_object_ref (object);
+  g_object_notify_queue_freeze (object, &property_notify_context);
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_notify (GObject     *object,
+		 const gchar *property_name)
+{
+  GParamSpec *pspec;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (property_name != NULL);
+  if (g_atomic_int_get (&object->ref_count) == 0)
+    return;
+  
+  g_object_ref (object);
+  /* We don't need to get the redirect target
+   * (by, e.g. calling g_object_class_find_property())
+   * because g_object_notify_queue_add() does that
+   */
+  pspec = g_param_spec_pool_lookup (pspec_pool,
+				    property_name,
+				    G_OBJECT_TYPE (object),
+				    TRUE);
+
+  if (!pspec)
+    g_warning ("%s: object class `%s' has no property named `%s'",
+	       G_STRFUNC,
+	       G_OBJECT_TYPE_NAME (object),
+	       property_name);
+  else
+    {
+      GObjectNotifyQueue *nqueue;
+      
+      nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
+      g_object_notify_queue_add (object, nqueue, pspec);
+      g_object_notify_queue_thaw (object, nqueue);
+    }
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_thaw_notify (GObject *object)
+{
+  GObjectNotifyQueue *nqueue;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  if (g_atomic_int_get (&object->ref_count) == 0)
+    return;
+  
+  g_object_ref (object);
+  nqueue = g_object_notify_queue_from_object (object, &property_notify_context);
+  if (!nqueue || !nqueue->freeze_count)
+    g_warning ("%s: property-changed notification for %s(%p) is not frozen",
+	       G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
+  else
+    g_object_notify_queue_thaw (object, nqueue);
+  g_object_unref (object);
+}
+
+static inline void
+object_get_property (GObject     *object,
+		     GParamSpec  *pspec,
+		     GValue      *value)
+{
+  GObjectClass *class = g_type_class_peek (pspec->owner_type);
+  guint param_id = PARAM_SPEC_PARAM_ID (pspec);
+  GParamSpec *redirect;
+
+  redirect = g_param_spec_get_redirect_target (pspec);
+  if (redirect)
+    pspec = redirect;    
+  
+  class->get_property (object, param_id, value, pspec);
+}
+
+static inline void
+object_set_property (GObject             *object,
+		     GParamSpec          *pspec,
+		     const GValue        *value,
+		     GObjectNotifyQueue  *nqueue)
+{
+  GValue tmp_value = { 0, };
+  GObjectClass *class = g_type_class_peek (pspec->owner_type);
+  guint param_id = PARAM_SPEC_PARAM_ID (pspec);
+  GParamSpec *redirect;
+
+  redirect = g_param_spec_get_redirect_target (pspec);
+  if (redirect)
+    pspec = redirect;
+
+  /* provide a copy to work from, convert (if necessary) and validate */
+  g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+  if (!g_value_transform (value, &tmp_value))
+    g_warning ("unable to set property `%s' of type `%s' from value of type `%s'",
+	       pspec->name,
+	       g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+	       G_VALUE_TYPE_NAME (value));
+  else if (g_param_value_validate (pspec, &tmp_value) && !(pspec->flags & G_PARAM_LAX_VALIDATION))
+    {
+      gchar *contents = g_strdup_value_contents (value);
+
+      g_warning ("value \"%s\" of type `%s' is invalid or out of range for property `%s' of type `%s'",
+		 contents,
+		 G_VALUE_TYPE_NAME (value),
+		 pspec->name,
+		 g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
+      g_free (contents);
+    }
+  else
+    {
+      class->set_property (object, param_id, &tmp_value, pspec);
+      g_object_notify_queue_add (object, nqueue, pspec);
+    }
+  g_value_unset (&tmp_value);
+}
+
+static void
+object_interface_check_properties (gpointer func_data,
+				   gpointer g_iface)
+{
+  GTypeInterface *iface_class = g_iface;
+  GObjectClass *class = g_type_class_peek (iface_class->g_instance_type);
+  GType iface_type = iface_class->g_type;
+  GParamSpec **pspecs;
+  guint n;
+
+  if (!G_IS_OBJECT_CLASS (class))
+    return;
+
+  pspecs = g_param_spec_pool_list (pspec_pool, iface_type, &n);
+
+  while (n--)
+    {
+      GParamSpec *class_pspec = g_param_spec_pool_lookup (pspec_pool,
+							  pspecs[n]->name,
+							  G_OBJECT_CLASS_TYPE (class),
+							  TRUE);
+      
+      if (!class_pspec)
+	{
+	  g_critical ("Object class %s doesn't implement property "
+		      "'%s' from interface '%s'",
+		      g_type_name (G_OBJECT_CLASS_TYPE (class)),
+		      pspecs[n]->name,
+		      g_type_name (iface_type));
+
+	  continue;
+	}
+
+      /* The implementation paramspec must have a less restrictive
+       * type than the interface parameter spec for set() and a
+       * more restrictive type for get(). We just require equality,
+       * rather than doing something more complicated checking
+       * the READABLE and WRITABLE flags. We also simplify here
+       * by only checking the value type, not the G_PARAM_SPEC_TYPE.
+       */
+      if (class_pspec &&
+	  !g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspecs[n]),
+			G_PARAM_SPEC_VALUE_TYPE (class_pspec)))
+	{
+	  g_critical ("Property '%s' on class '%s' has type '%s' "
+		      "which is different from the type '%s', "
+		      "of the property on interface '%s'\n",
+		      pspecs[n]->name,
+		      g_type_name (G_OBJECT_CLASS_TYPE (class)),
+		      g_type_name (G_PARAM_SPEC_VALUE_TYPE (class_pspec)),
+		      g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspecs[n])),
+		      g_type_name (iface_type));
+	}
+      
+#define SUBSET(a,b,mask) (((a) & ~(b) & (mask)) == 0)
+      
+      /* CONSTRUCT and CONSTRUCT_ONLY add restrictions.
+       * READABLE and WRITABLE remove restrictions. The implementation
+       * paramspec must have less restrictive flags.
+       */
+      if (class_pspec &&
+	  (!SUBSET (class_pspec->flags,
+		    pspecs[n]->flags,
+		    G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY) ||
+	   !SUBSET (pspecs[n]->flags,
+		    class_pspec->flags,
+		    G_PARAM_READABLE | G_PARAM_WRITABLE)))
+	{
+	  g_critical ("Flags for property '%s' on class '%s' "
+		      "are not compatible with the property on"
+		      "interface '%s'\n",
+		      pspecs[n]->name,
+		      g_type_name (G_OBJECT_CLASS_TYPE (class)),
+		      g_type_name (iface_type));
+	}
+#undef SUBSET	  
+    }
+  
+  g_free (pspecs);
+}
+
+EXPORT_C gpointer
+g_object_new (GType	   object_type,
+	      const gchar *first_property_name,
+	      ...)
+{
+  GObject *object;
+  va_list var_args;
+  
+  g_return_val_if_fail (G_TYPE_IS_OBJECT (object_type), NULL);
+  
+  va_start (var_args, first_property_name);
+  object = g_object_new_valist (object_type, first_property_name, var_args);
+  va_end (var_args);
+  
+  return object;
+}
+
+static gboolean
+object_in_construction (GObject *object)
+{
+  gboolean in_construction;
+  G_LOCK (construct_objects_lock);
+  in_construction = g_slist_find (construct_objects, object) != NULL;
+  G_UNLOCK (construct_objects_lock);
+  return in_construction;
+}
+
+EXPORT_C gpointer
+g_object_newv (GType       object_type,
+	       guint       n_parameters,
+	       GParameter *parameters)
+{
+  GObjectConstructParam *cparams, *oparams;
+  GObjectNotifyQueue *nqueue;
+  GObject *object;
+  GObjectClass *class, *unref_class = NULL;
+  GSList *slist;
+  guint n_total_cparams = 0, n_cparams = 0, n_oparams = 0, n_cvalues;
+  GValue *cvalues;
+  GList *clist = NULL;
+  guint i;
+
+  g_return_val_if_fail (G_TYPE_IS_OBJECT (object_type), NULL);
+
+  class = g_type_class_peek_static (object_type);
+  if (!class)
+    class = unref_class = g_type_class_ref (object_type);
+  for (slist = class->construct_properties; slist; slist = slist->next)
+    {
+      clist = g_list_prepend (clist, slist->data);
+      n_total_cparams += 1;
+    }
+
+  /* collect parameters, sort into construction and normal ones */
+  oparams = g_new (GObjectConstructParam, n_parameters);
+  cparams = g_new (GObjectConstructParam, n_total_cparams);
+  
+  for (i = 0; i < n_parameters; i++)
+    {
+      GValue *value = &parameters[i].value;
+      GParamSpec *pspec = g_param_spec_pool_lookup (pspec_pool,
+						    parameters[i].name,
+						    object_type,
+						    TRUE);
+      if (!pspec)
+	{
+	  g_warning ("%s: object class `%s' has no property named `%s'",
+		     G_STRFUNC,
+		     g_type_name (object_type),
+		     parameters[i].name);
+	  continue;
+	}
+      if (!(pspec->flags & G_PARAM_WRITABLE))
+	{
+	  g_warning ("%s: property `%s' of object class `%s' is not writable",
+		     G_STRFUNC,
+		     pspec->name,
+		     g_type_name (object_type));
+	  continue;
+	}
+      if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
+	{
+	  GList *list = g_list_find (clist, pspec);
+
+	  if (!list)
+	    {
+	      g_warning ("%s: construct property \"%s\" for object `%s' can't be set twice",
+                         G_STRFUNC, pspec->name, g_type_name (object_type));
+	      continue;
+	    }
+	  cparams[n_cparams].pspec = pspec;
+	  cparams[n_cparams].value = value;
+	  n_cparams++;
+	  if (!list->prev)
+	    clist = list->next;
+	  else
+	    list->prev->next = list->next;
+	  if (list->next)
+	    list->next->prev = list->prev;
+	  g_list_free_1 (list);
+	}
+      else
+	{
+	  oparams[n_oparams].pspec = pspec;
+	  oparams[n_oparams].value = value;
+	  n_oparams++;
+	}
+    }
+
+  /* set remaining construction properties to default values */
+  n_cvalues = n_total_cparams - n_cparams;
+  cvalues = g_new (GValue, n_cvalues);
+  while (clist)
+    {
+      GList *tmp = clist->next;
+      GParamSpec *pspec = clist->data;
+      GValue *value = cvalues + n_total_cparams - n_cparams - 1;
+
+      value->g_type = 0;
+      g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      g_param_value_set_default (pspec, value);
+
+      cparams[n_cparams].pspec = pspec;
+      cparams[n_cparams].value = value;
+      n_cparams++;
+
+      g_list_free_1 (clist);
+      clist = tmp;
+    }
+
+  /* construct object from construction parameters */
+  object = class->constructor (object_type, n_total_cparams, cparams);
+  G_LOCK (construct_objects_lock);
+  construct_objects = g_slist_remove (construct_objects, object);
+  G_UNLOCK (construct_objects_lock);
+
+  /* free construction values */
+  g_free (cparams);
+  while (n_cvalues--)
+    g_value_unset (cvalues + n_cvalues);
+  g_free (cvalues);
+  
+  /* release g_object_init() notification queue freeze_count */
+  nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
+  g_object_notify_queue_thaw (object, nqueue);
+  
+  /* set remaining properties */
+  for (i = 0; i < n_oparams; i++)
+    object_set_property (object, oparams[i].pspec, oparams[i].value, nqueue);
+  g_free (oparams);
+
+  if (unref_class)
+    g_type_class_unref (unref_class);
+
+  /* release our own freeze count and handle notifications */
+  g_object_notify_queue_thaw (object, nqueue);
+  
+  return object;
+}
+
+EXPORT_C GObject*
+g_object_new_valist (GType	  object_type,
+		     const gchar *first_property_name,
+		     va_list	  var_args)
+{
+  GObjectClass *class;
+  GParameter *params;
+  const gchar *name;
+  GObject *object;
+  guint n_params = 0, n_alloced_params = 16;
+  
+  g_return_val_if_fail (G_TYPE_IS_OBJECT (object_type), NULL);
+
+  if (!first_property_name)
+    return g_object_newv (object_type, 0, NULL);
+
+  class = g_type_class_ref (object_type);
+  params = g_new (GParameter, n_alloced_params);
+  name = first_property_name;
+  while (name)
+    {
+      gchar *error = NULL;
+      GParamSpec *pspec = g_param_spec_pool_lookup (pspec_pool,
+						    name,
+						    object_type,
+						    TRUE);
+      if (!pspec)
+	{
+	  g_warning ("%s: object class `%s' has no property named `%s'",
+		     G_STRFUNC,
+		     g_type_name (object_type),
+		     name);
+	  break;
+	}
+      if (n_params >= n_alloced_params)
+	{
+	  n_alloced_params += 16;
+	  params = g_renew (GParameter, params, n_alloced_params);
+	}
+      params[n_params].name = name;
+      params[n_params].value.g_type = 0;
+      g_value_init (&params[n_params].value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      G_VALUE_COLLECT (&params[n_params].value, var_args, 0, &error);
+      if (error)
+	{
+	  g_warning ("%s: %s", G_STRFUNC, error);
+	  g_free (error);
+          g_value_unset (&params[n_params].value);
+	  break;
+	}
+      n_params++;
+      name = va_arg (var_args, gchar*);
+    }
+
+  object = g_object_newv (object_type, n_params, params);
+
+  while (n_params--)
+    g_value_unset (&params[n_params].value);
+  g_free (params);
+
+  g_type_class_unref (class);
+
+  return object;
+}
+
+static GObject*
+g_object_constructor (GType                  type,
+		      guint                  n_construct_properties,
+		      GObjectConstructParam *construct_params)
+{
+  GObject *object;
+
+  /* create object */
+  object = (GObject*) g_type_create_instance (type);
+  
+  /* set construction parameters */
+  if (n_construct_properties)
+    {
+      GObjectNotifyQueue *nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
+      
+      /* set construct properties */
+      while (n_construct_properties--)
+	{
+	  GValue *value = construct_params->value;
+	  GParamSpec *pspec = construct_params->pspec;
+
+	  construct_params++;
+	  object_set_property (object, pspec, value, nqueue);
+	}
+      g_object_notify_queue_thaw (object, nqueue);
+      /* the notification queue is still frozen from g_object_init(), so
+       * we don't need to handle it here, g_object_newv() takes
+       * care of that
+       */
+    }
+
+  return object;
+}
+
+EXPORT_C void
+g_object_set_valist (GObject	 *object,
+		     const gchar *first_property_name,
+		     va_list	  var_args)
+{
+  GObjectNotifyQueue *nqueue;
+  const gchar *name;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  
+  g_object_ref (object);
+  nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
+  
+  name = first_property_name;
+  while (name)
+    {
+      GValue value = { 0, };
+      GParamSpec *pspec;
+      gchar *error = NULL;
+      
+      pspec = g_param_spec_pool_lookup (pspec_pool,
+					name,
+					G_OBJECT_TYPE (object),
+					TRUE);
+      if (!pspec)
+	{
+	  g_warning ("%s: object class `%s' has no property named `%s'",
+		     G_STRFUNC,
+		     G_OBJECT_TYPE_NAME (object),
+		     name);
+	  break;
+	}
+      if (!(pspec->flags & G_PARAM_WRITABLE))
+	{
+	  g_warning ("%s: property `%s' of object class `%s' is not writable",
+		     G_STRFUNC,
+		     pspec->name,
+		     G_OBJECT_TYPE_NAME (object));
+	  break;
+	}
+      if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) && !object_in_construction (object))
+        {
+          g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction",
+                     G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object));
+          break;
+        }
+
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      
+      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      if (error)
+	{
+	  g_warning ("%s: %s", G_STRFUNC, error);
+	  g_free (error);
+          g_value_unset (&value);
+	  break;
+	}
+      
+      object_set_property (object, pspec, &value, nqueue);
+      g_value_unset (&value);
+      
+      name = va_arg (var_args, gchar*);
+    }
+
+  g_object_notify_queue_thaw (object, nqueue);
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_get_valist (GObject	 *object,
+		     const gchar *first_property_name,
+		     va_list	  var_args)
+{
+  const gchar *name;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  
+  g_object_ref (object);
+  
+  name = first_property_name;
+  
+  while (name)
+    {
+      GValue value = { 0, };
+      GParamSpec *pspec;
+      gchar *error;
+      
+      pspec = g_param_spec_pool_lookup (pspec_pool,
+					name,
+					G_OBJECT_TYPE (object),
+					TRUE);
+      if (!pspec)
+	{
+	  g_warning ("%s: object class `%s' has no property named `%s'",
+		     G_STRFUNC,
+		     G_OBJECT_TYPE_NAME (object),
+		     name);
+	  break;
+	}
+      if (!(pspec->flags & G_PARAM_READABLE))
+	{
+	  g_warning ("%s: property `%s' of object class `%s' is not readable",
+		     G_STRFUNC,
+		     pspec->name,
+		     G_OBJECT_TYPE_NAME (object));
+	  break;
+	}
+      
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      
+      object_get_property (object, pspec, &value);
+      
+      G_VALUE_LCOPY (&value, var_args, 0, &error);
+      if (error)
+	{
+	  g_warning ("%s: %s", G_STRFUNC, error);
+	  g_free (error);
+	  g_value_unset (&value);
+	  break;
+	}
+      
+      g_value_unset (&value);
+      
+      name = va_arg (var_args, gchar*);
+    }
+  
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_set (gpointer     _object,
+	      const gchar *first_property_name,
+	      ...)
+{
+  GObject *object = _object;
+  va_list var_args;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  
+  va_start (var_args, first_property_name);
+  g_object_set_valist (object, first_property_name, var_args);
+  va_end (var_args);
+}
+
+EXPORT_C void
+g_object_get (gpointer     _object,
+	      const gchar *first_property_name,
+	      ...)
+{
+  GObject *object = _object;
+  va_list var_args;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  
+  va_start (var_args, first_property_name);
+  g_object_get_valist (object, first_property_name, var_args);
+  va_end (var_args);
+}
+
+EXPORT_C void
+g_object_set_property (GObject	    *object,
+		       const gchar  *property_name,
+		       const GValue *value)
+{
+  GObjectNotifyQueue *nqueue;
+  GParamSpec *pspec;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (property_name != NULL);
+  g_return_if_fail (G_IS_VALUE (value));
+  
+  g_object_ref (object);
+  nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
+  
+  pspec = g_param_spec_pool_lookup (pspec_pool,
+				    property_name,
+				    G_OBJECT_TYPE (object),
+				    TRUE);
+  if (!pspec)
+    g_warning ("%s: object class `%s' has no property named `%s'",
+	       G_STRFUNC,
+	       G_OBJECT_TYPE_NAME (object),
+	       property_name);
+  else if (!(pspec->flags & G_PARAM_WRITABLE))
+    g_warning ("%s: property `%s' of object class `%s' is not writable",
+               G_STRFUNC,
+               pspec->name,
+               G_OBJECT_TYPE_NAME (object));
+  else if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) && !object_in_construction (object))
+    g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction",
+               G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object));
+  else
+    object_set_property (object, pspec, value, nqueue);
+  
+  g_object_notify_queue_thaw (object, nqueue);
+  g_object_unref (object);
+}
+
+EXPORT_C void
+g_object_get_property (GObject	   *object,
+		       const gchar *property_name,
+		       GValue	   *value)
+{
+  GParamSpec *pspec;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (property_name != NULL);
+  g_return_if_fail (G_IS_VALUE (value));
+  
+  g_object_ref (object);
+  
+  pspec = g_param_spec_pool_lookup (pspec_pool,
+				    property_name,
+				    G_OBJECT_TYPE (object),
+				    TRUE);
+  if (!pspec)
+    g_warning ("%s: object class `%s' has no property named `%s'",
+	       G_STRFUNC,
+	       G_OBJECT_TYPE_NAME (object),
+	       property_name);
+  else if (!(pspec->flags & G_PARAM_READABLE))
+    g_warning ("%s: property `%s' of object class `%s' is not readable",
+               G_STRFUNC,
+               pspec->name,
+               G_OBJECT_TYPE_NAME (object));
+  else
+    {
+      GValue *prop_value, tmp_value = { 0, };
+      
+      /* auto-conversion of the callers value type
+       */
+      if (G_VALUE_TYPE (value) == G_PARAM_SPEC_VALUE_TYPE (pspec))
+	{
+	  g_value_reset (value);
+	  prop_value = value;
+	}
+      else if (!g_value_type_transformable (G_PARAM_SPEC_VALUE_TYPE (pspec), G_VALUE_TYPE (value)))
+	{
+	  g_warning ("%s: can't retrieve property `%s' of type `%s' as value of type `%s'",
+		     G_STRFUNC, pspec->name,
+		     g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+		     G_VALUE_TYPE_NAME (value));
+	  g_object_unref (object);
+	  return;
+	}
+      else
+	{
+	  g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+	  prop_value = &tmp_value;
+	}
+      object_get_property (object, pspec, prop_value);
+      if (prop_value != value)
+	{
+	  g_value_transform (prop_value, value);
+	  g_value_unset (&tmp_value);
+	}
+    }
+  
+  g_object_unref (object);
+}
+
+EXPORT_C gpointer
+g_object_connect (gpointer     _object,
+		  const gchar *signal_spec,
+		  ...)
+{
+  GObject *object = _object;
+  va_list var_args;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (object->ref_count > 0, object);
+
+  va_start (var_args, signal_spec);
+  while (signal_spec)
+    {
+      GCallback callback = va_arg (var_args, GCallback);
+      gpointer data = va_arg (var_args, gpointer);
+      gulong sid;
+
+      if (strncmp (signal_spec, "signal::", 8) == 0)
+	sid = g_signal_connect_data (object, signal_spec + 8,
+				     callback, data, NULL,
+				     0);
+      else if (strncmp (signal_spec, "object_signal::", 15) == 0 ||
+               strncmp (signal_spec, "object-signal::", 15) == 0)
+	sid = g_signal_connect_object (object, signal_spec + 15,
+				       callback, data,
+				       0);
+      else if (strncmp (signal_spec, "swapped_signal::", 16) == 0 ||
+               strncmp (signal_spec, "swapped-signal::", 16) == 0)
+	sid = g_signal_connect_data (object, signal_spec + 16,
+				     callback, data, NULL,
+				     G_CONNECT_SWAPPED);
+      else if (strncmp (signal_spec, "swapped_object_signal::", 23) == 0 ||
+               strncmp (signal_spec, "swapped-object-signal::", 23) == 0)
+	sid = g_signal_connect_object (object, signal_spec + 23,
+				       callback, data,
+				       G_CONNECT_SWAPPED);
+      else if (strncmp (signal_spec, "signal_after::", 14) == 0 ||
+               strncmp (signal_spec, "signal-after::", 14) == 0)
+	sid = g_signal_connect_data (object, signal_spec + 14,
+				     callback, data, NULL,
+				     G_CONNECT_AFTER);
+      else if (strncmp (signal_spec, "object_signal_after::", 21) == 0 ||
+               strncmp (signal_spec, "object-signal-after::", 21) == 0)
+	sid = g_signal_connect_object (object, signal_spec + 21,
+				       callback, data,
+				       G_CONNECT_AFTER);
+      else if (strncmp (signal_spec, "swapped_signal_after::", 22) == 0 ||
+               strncmp (signal_spec, "swapped-signal-after::", 22) == 0)
+	sid = g_signal_connect_data (object, signal_spec + 22,
+				     callback, data, NULL,
+				     G_CONNECT_SWAPPED | G_CONNECT_AFTER);
+      else if (strncmp (signal_spec, "swapped_object_signal_after::", 29) == 0 ||
+               strncmp (signal_spec, "swapped-object-signal-after::", 29) == 0)
+	sid = g_signal_connect_object (object, signal_spec + 29,
+				       callback, data,
+				       G_CONNECT_SWAPPED | G_CONNECT_AFTER);
+      else
+	{
+	  g_warning ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec);
+	  break;
+	}
+      signal_spec = va_arg (var_args, gchar*);
+    }
+  va_end (var_args);
+
+  return object;
+}
+
+EXPORT_C void
+g_object_disconnect (gpointer     _object,
+		     const gchar *signal_spec,
+		     ...)
+{
+  GObject *object = _object;
+  va_list var_args;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count > 0);
+
+  va_start (var_args, signal_spec);
+  while (signal_spec)
+    {
+      GCallback callback = va_arg (var_args, GCallback);
+      gpointer data = va_arg (var_args, gpointer);
+      guint sid = 0, detail = 0, mask = 0;
+
+      if (strncmp (signal_spec, "any_signal::", 12) == 0 ||
+          strncmp (signal_spec, "any-signal::", 12) == 0)
+	{
+	  signal_spec += 12;
+	  mask = G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA;
+	}
+      else if (strcmp (signal_spec, "any_signal") == 0 ||
+               strcmp (signal_spec, "any-signal") == 0)
+	{
+	  signal_spec += 10;
+	  mask = G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA;
+	}
+      else
+	{
+	  g_warning ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec);
+	  break;
+	}
+
+      if ((mask & G_SIGNAL_MATCH_ID) &&
+	  !g_signal_parse_name (signal_spec, G_OBJECT_TYPE (object), &sid, &detail, FALSE))
+	g_warning ("%s: invalid signal name \"%s\"", G_STRFUNC, signal_spec);
+      else if (!g_signal_handlers_disconnect_matched (object, mask | (detail ? G_SIGNAL_MATCH_DETAIL : 0),
+						      sid, detail,
+						      NULL, (gpointer)callback, data))
+	g_warning ("%s: signal handler %p(%p) is not connected", G_STRFUNC, callback, data);
+      signal_spec = va_arg (var_args, gchar*);
+    }
+  va_end (var_args);
+}
+
+typedef struct {
+  GObject *object;
+  guint n_weak_refs;
+  struct {
+    GWeakNotify notify;
+    gpointer    data;
+  } weak_refs[1];  /* flexible array */
+} WeakRefStack;
+
+static void
+weak_refs_notify (gpointer data)
+{
+  WeakRefStack *wstack = data;
+  guint i;
+
+  for (i = 0; i < wstack->n_weak_refs; i++)
+    wstack->weak_refs[i].notify (wstack->weak_refs[i].data, wstack->object);
+  g_free (wstack);
+}
+
+EXPORT_C void
+g_object_weak_ref (GObject    *object,
+		   GWeakNotify notify,
+		   gpointer    data)
+{
+  WeakRefStack *wstack;
+  guint i;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (notify != NULL);
+  g_return_if_fail (object->ref_count >= 1);
+
+  wstack = g_datalist_id_remove_no_notify (&object->qdata, quark_weak_refs);
+  if (wstack)
+    {
+      i = wstack->n_weak_refs++;
+      wstack = g_realloc (wstack, sizeof (*wstack) + sizeof (wstack->weak_refs[0]) * i);
+    }
+  else
+    {
+      wstack = g_renew (WeakRefStack, NULL, 1);
+      wstack->object = object;
+      wstack->n_weak_refs = 1;
+      i = 0;
+    }
+  wstack->weak_refs[i].notify = notify;
+  wstack->weak_refs[i].data = data;
+  g_datalist_id_set_data_full (&object->qdata, quark_weak_refs, wstack, weak_refs_notify);
+}
+
+EXPORT_C void
+g_object_weak_unref (GObject    *object,
+		     GWeakNotify notify,
+		     gpointer    data)
+{
+  WeakRefStack *wstack;
+  gboolean found_one = FALSE;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (notify != NULL);
+
+  wstack = g_datalist_id_get_data (&object->qdata, quark_weak_refs);
+  if (wstack)
+    {
+      guint i;
+
+      for (i = 0; i < wstack->n_weak_refs; i++)
+	if (wstack->weak_refs[i].notify == notify &&
+	    wstack->weak_refs[i].data == data)
+	  {
+	    found_one = TRUE;
+	    wstack->n_weak_refs -= 1;
+	    if (i != wstack->n_weak_refs)
+	      wstack->weak_refs[i] = wstack->weak_refs[wstack->n_weak_refs];
+
+	    break;
+	  }
+    }
+  if (!found_one)
+    g_warning ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data);
+}
+
+EXPORT_C void
+g_object_add_weak_pointer (GObject  *object, 
+                           gpointer *weak_pointer_location)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (weak_pointer_location != NULL);
+
+  g_object_weak_ref (object, 
+                     (GWeakNotify) g_nullify_pointer, 
+                     weak_pointer_location);
+}
+
+EXPORT_C void
+g_object_remove_weak_pointer (GObject  *object, 
+                              gpointer *weak_pointer_location)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (weak_pointer_location != NULL);
+
+  g_object_weak_unref (object, 
+                       (GWeakNotify) g_nullify_pointer, 
+                       weak_pointer_location);
+}
+
+#if EMULATOR
+guint
+object_floating_flag_handler (GObject        *object,
+                              gint            job)
+#else
+static guint
+object_floating_flag_handler (GObject        *object,
+                              gint            job)
+#endif /* EMULATOR */
+{
+  switch (job)
+    {
+      gpointer oldvalue;
+    case +1:    /* force floating if possible */
+      do
+        oldvalue = g_atomic_pointer_get (&object->qdata);
+      while (!g_atomic_pointer_compare_and_exchange ((void**) &object->qdata, oldvalue,
+                                                     (gpointer) ((gsize) oldvalue | OBJECT_FLOATING_FLAG)));
+      return (gsize) oldvalue & OBJECT_FLOATING_FLAG;
+    case -1:    /* sink if possible */
+      do
+        oldvalue = g_atomic_pointer_get (&object->qdata);
+      while (!g_atomic_pointer_compare_and_exchange ((void**) &object->qdata, oldvalue,
+                                                     (gpointer) ((gsize) oldvalue & ~(gsize) OBJECT_FLOATING_FLAG)));
+      return (gsize) oldvalue & OBJECT_FLOATING_FLAG;
+    default:    /* check floating */
+      return 0 != ((gsize) g_atomic_pointer_get (&object->qdata) & OBJECT_FLOATING_FLAG);
+    }
+}
+
+EXPORT_C gboolean
+g_object_is_floating (gpointer _object)
+{
+  GObject *object = _object;
+  g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
+  return floating_flag_handler (object, 0);
+}
+
+EXPORT_C gpointer
+g_object_ref_sink (gpointer _object)
+{
+  GObject *object = _object;
+  gboolean was_floating;
+  g_return_val_if_fail (G_IS_OBJECT (object), object);
+  g_return_val_if_fail (object->ref_count >= 1, object);
+  g_object_ref (object);
+  was_floating = floating_flag_handler (object, -1);
+  if (was_floating)
+    g_object_unref (object);
+  return object;
+}
+
+EXPORT_C void
+g_object_force_floating (GObject *object)
+{
+  gboolean was_floating;
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count >= 1);
+
+  was_floating = floating_flag_handler (object, +1);
+}
+
+typedef struct {
+  GObject *object;
+  guint n_toggle_refs;
+  struct {
+    GToggleNotify notify;
+    gpointer    data;
+  } toggle_refs[1];  /* flexible array */
+} ToggleRefStack;
+
+static void
+toggle_refs_notify (GObject *object,
+		    gboolean is_last_ref)
+{
+  ToggleRefStack *tstack = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
+
+  /* Reentrancy here is not as tricky as it seems, because a toggle reference
+   * will only be notified when there is exactly one of them.
+   */
+  g_assert (tstack->n_toggle_refs == 1);
+  tstack->toggle_refs[0].notify (tstack->toggle_refs[0].data, tstack->object, is_last_ref);
+}
+
+EXPORT_C void
+g_object_add_toggle_ref (GObject       *object,
+			 GToggleNotify  notify,
+			 gpointer       data)
+{
+  ToggleRefStack *tstack;
+  guint i;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (notify != NULL);
+  g_return_if_fail (object->ref_count >= 1);
+
+  g_object_ref (object);
+
+  tstack = g_datalist_id_remove_no_notify (&object->qdata, quark_toggle_refs);
+  if (tstack)
+    {
+      i = tstack->n_toggle_refs++;
+      /* allocate i = tstate->n_toggle_refs - 1 positions beyond the 1 declared
+       * in tstate->toggle_refs */
+      tstack = g_realloc (tstack, sizeof (*tstack) + sizeof (tstack->toggle_refs[0]) * i);
+    }
+  else
+    {
+      tstack = g_renew (ToggleRefStack, NULL, 1);
+      tstack->object = object;
+      tstack->n_toggle_refs = 1;
+      i = 0;
+    }
+
+  /* Set a flag for fast lookup after adding the first toggle reference */
+  if (tstack->n_toggle_refs == 1)
+    g_datalist_set_flags (&object->qdata, OBJECT_HAS_TOGGLE_REF_FLAG);
+  
+  tstack->toggle_refs[i].notify = notify;
+  tstack->toggle_refs[i].data = data;
+  g_datalist_id_set_data_full (&object->qdata, quark_toggle_refs, tstack,
+			       (GDestroyNotify)g_free);
+}
+ 
+EXPORT_C void
+g_object_remove_toggle_ref (GObject       *object,
+			    GToggleNotify  notify,
+			    gpointer       data)
+{
+  ToggleRefStack *tstack;
+  gboolean found_one = FALSE;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (notify != NULL);
+
+  tstack = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
+  if (tstack)
+    {
+      guint i;
+
+      for (i = 0; i < tstack->n_toggle_refs; i++)
+	if (tstack->toggle_refs[i].notify == notify &&
+	    tstack->toggle_refs[i].data == data)
+	  {
+	    found_one = TRUE;
+	    tstack->n_toggle_refs -= 1;
+	    if (i != tstack->n_toggle_refs)
+	      tstack->toggle_refs[i] = tstack->toggle_refs[tstack->n_toggle_refs];
+
+	    if (tstack->n_toggle_refs == 0)
+	      g_datalist_unset_flags (&object->qdata, OBJECT_HAS_TOGGLE_REF_FLAG);
+
+	    g_object_unref (object);
+	    
+	    break;
+	  }
+    }
+  
+  if (!found_one)
+    g_warning ("%s: couldn't find toggle ref %p(%p)", G_STRFUNC, notify, data);
+}
+
+EXPORT_C gpointer
+g_object_ref (gpointer _object)
+{
+  GObject *object = _object;
+  gint old_val;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (object->ref_count > 0, NULL);
+  
+#ifdef  G_ENABLE_DEBUG
+  if (g_trap_object_ref == object)
+    G_BREAKPOINT ();
+#endif  /* G_ENABLE_DEBUG */
+
+
+  old_val = g_atomic_int_exchange_and_add (FIX_CASTING(int *)&object->ref_count, 1);
+
+  if (old_val == 1 && OBJECT_HAS_TOGGLE_REF (object))
+    toggle_refs_notify (object, FALSE);
+  
+  return object;
+}
+
+EXPORT_C void
+g_object_unref (gpointer _object)
+{
+  GObject *object = _object;
+  gint old_ref;
+  gboolean is_zero;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (object->ref_count > 0);
+  
+#ifdef  G_ENABLE_DEBUG
+  if (g_trap_object_ref == object)
+    G_BREAKPOINT ();
+#endif  /* G_ENABLE_DEBUG */
+
+  /* here we want to atomically do: if (ref_count>1) { ref_count--; return; } */
+ retry_atomic_decrement1:
+  old_ref = g_atomic_int_get (&object->ref_count);
+  if (old_ref > 1)
+    {
+      if (!g_atomic_int_compare_and_exchange (FIX_CASTING(int *)&object->ref_count, old_ref, old_ref - 1)) 
+	goto retry_atomic_decrement1;
+
+      /* if we went from 2->1 we need to notify toggle refs if any */
+      if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object))
+	toggle_refs_notify (object, TRUE);
+    }
+  else
+    {
+      /* we are about tp remove the last reference */
+      G_OBJECT_GET_CLASS (object)->dispose (object);
+
+      /* may have been re-referenced meanwhile */
+    retry_atomic_decrement2:
+      old_ref = g_atomic_int_get (&object->ref_count);
+      if (old_ref > 1)
+        {
+          if (!g_atomic_int_compare_and_exchange (FIX_CASTING(int *)&object->ref_count, old_ref, old_ref - 1)) 
+	    goto retry_atomic_decrement2;
+
+          /* if we went from 2->1 we need to notify toggle refs if any */
+          if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object))
+	    toggle_refs_notify (object, TRUE);
+          
+	  return;
+	}
+      
+      /* we are still in the process of taking away the last ref */
+      g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
+      g_signal_handlers_destroy (object);
+      g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
+      
+      /* decrement the last reference */
+      is_zero = g_atomic_int_dec_and_test (FIX_CASTING(int *)&object->ref_count);
+      
+      /* may have been re-referenced meanwhile */
+      if (G_LIKELY (is_zero)) 
+	{
+          G_OBJECT_GET_CLASS (object)->finalize (object);
+#ifdef	G_ENABLE_DEBUG
+          IF_DEBUG (OBJECTS)
+	    {
+	      /* catch objects not chaining finalize handlers */
+	      G_LOCK (debug_objects);
+	      g_assert (g_hash_table_lookup (debug_objects_ht, object) == NULL);
+	      G_UNLOCK (debug_objects);
+	    }
+#endif	/* G_ENABLE_DEBUG */
+          g_type_free_instance ((GTypeInstance*) object);
+	}
+    }
+}
+
+EXPORT_C gpointer
+g_object_get_qdata (GObject *object,
+		    GQuark   quark)
+{
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  
+  return quark ? g_datalist_id_get_data (&object->qdata, quark) : NULL;
+}
+
+EXPORT_C void
+g_object_set_qdata (GObject *object,
+		    GQuark   quark,
+		    gpointer data)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (quark > 0);
+  
+  g_datalist_id_set_data (&object->qdata, quark, data);
+}
+
+EXPORT_C void
+g_object_set_qdata_full (GObject       *object,
+			 GQuark		quark,
+			 gpointer	data,
+			 GDestroyNotify destroy)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (quark > 0);
+  
+  g_datalist_id_set_data_full (&object->qdata, quark, data,
+			       data ? destroy : (GDestroyNotify) NULL);
+}
+
+EXPORT_C gpointer
+g_object_steal_qdata (GObject *object,
+		      GQuark   quark)
+{
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (quark > 0, NULL);
+  
+  return g_datalist_id_remove_no_notify (&object->qdata, quark);
+}
+
+EXPORT_C gpointer
+g_object_get_data (GObject     *object,
+                   const gchar *key)
+{
+  GQuark quark;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (key != NULL, NULL);
+
+  quark = g_quark_try_string (key);
+
+  return quark ? g_datalist_id_get_data (&object->qdata, quark) : NULL;
+}
+
+EXPORT_C void
+g_object_set_data (GObject     *object,
+                   const gchar *key,
+                   gpointer     data)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (key != NULL);
+
+  g_datalist_id_set_data (&object->qdata, g_quark_from_string (key), data);
+}
+
+EXPORT_C void
+g_object_set_data_full (GObject       *object,
+                        const gchar   *key,
+                        gpointer       data,
+                        GDestroyNotify destroy)
+{
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (key != NULL);
+
+  g_datalist_id_set_data_full (&object->qdata, g_quark_from_string (key), data,
+			       data ? destroy : (GDestroyNotify) NULL);
+}
+
+EXPORT_C gpointer
+g_object_steal_data (GObject     *object,
+                     const gchar *key)
+{
+  GQuark quark;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (key != NULL, NULL);
+
+  quark = g_quark_try_string (key);
+
+  return quark ? g_datalist_id_remove_no_notify (&object->qdata, quark) : NULL;
+}
+
+static void
+g_value_object_init (GValue *value)
+{
+  value->data[0].v_pointer = NULL;
+}
+
+static void
+g_value_object_free_value (GValue *value)
+{
+  if (value->data[0].v_pointer)
+    g_object_unref (value->data[0].v_pointer);
+}
+
+static void
+g_value_object_copy_value (const GValue *src_value,
+			   GValue	*dest_value)
+{
+  if (src_value->data[0].v_pointer)
+    dest_value->data[0].v_pointer = g_object_ref (src_value->data[0].v_pointer);
+  else
+    dest_value->data[0].v_pointer = NULL;
+}
+
+static void
+g_value_object_transform_value (const GValue *src_value,
+				GValue       *dest_value)
+{
+  if (src_value->data[0].v_pointer && g_type_is_a (G_OBJECT_TYPE (src_value->data[0].v_pointer), G_VALUE_TYPE (dest_value)))
+    dest_value->data[0].v_pointer = g_object_ref (src_value->data[0].v_pointer);
+  else
+    dest_value->data[0].v_pointer = NULL;
+}
+
+static gpointer
+g_value_object_peek_pointer (const GValue *value)
+{
+  return value->data[0].v_pointer;
+}
+
+static gchar*
+g_value_object_collect_value (GValue	  *value,
+			      guint        n_collect_values,
+			      GTypeCValue *collect_values,
+			      guint        collect_flags)
+{
+  if (collect_values[0].v_pointer)
+    {
+      GObject *object = collect_values[0].v_pointer;
+      
+      if (object->g_type_instance.g_class == NULL)
+	return g_strconcat ("invalid unclassed object pointer for value type `",
+			    G_VALUE_TYPE_NAME (value),
+			    "'",
+			    NULL);
+      else if (!g_value_type_compatible (G_OBJECT_TYPE (object), G_VALUE_TYPE (value)))
+	return g_strconcat ("invalid object type `",
+			    G_OBJECT_TYPE_NAME (object),
+			    "' for value type `",
+			    G_VALUE_TYPE_NAME (value),
+			    "'",
+			    NULL);
+      /* never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types */
+      value->data[0].v_pointer = g_object_ref (object);
+    }
+  else
+    value->data[0].v_pointer = NULL;
+  
+  return NULL;
+}
+
+static gchar*
+g_value_object_lcopy_value (const GValue *value,
+			    guint        n_collect_values,
+			    GTypeCValue *collect_values,
+			    guint        collect_flags)
+{
+  GObject **object_p = collect_values[0].v_pointer;
+  
+  if (!object_p)
+    return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+
+  if (!value->data[0].v_pointer)
+    *object_p = NULL;
+  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
+    *object_p = value->data[0].v_pointer;
+  else
+    *object_p = g_object_ref (value->data[0].v_pointer);
+  
+  return NULL;
+}
+
+EXPORT_C void
+g_value_set_object (GValue   *value,
+		    gpointer  v_object)
+{
+  GObject *old;
+	
+  g_return_if_fail (G_VALUE_HOLDS_OBJECT (value));
+
+  old = value->data[0].v_pointer;
+  
+  if (v_object)
+    {
+      g_return_if_fail (G_IS_OBJECT (v_object));
+      g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value)));
+
+      value->data[0].v_pointer = v_object;
+      g_object_ref (value->data[0].v_pointer);
+    }
+  else
+    value->data[0].v_pointer = NULL;
+  
+  if (old)
+    g_object_unref (old);
+}
+
+EXPORT_C void
+g_value_set_object_take_ownership (GValue  *value,
+				   gpointer v_object)
+{
+  g_value_take_object (value, v_object);
+}
+
+EXPORT_C void
+g_value_take_object (GValue  *value,
+		     gpointer v_object)
+{
+  g_return_if_fail (G_VALUE_HOLDS_OBJECT (value));
+
+  if (value->data[0].v_pointer)
+    {
+      g_object_unref (value->data[0].v_pointer);
+      value->data[0].v_pointer = NULL;
+    }
+
+  if (v_object)
+    {
+      g_return_if_fail (G_IS_OBJECT (v_object));
+      g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value)));
+
+      value->data[0].v_pointer = v_object; /* we take over the reference count */
+    }
+}
+
+EXPORT_C gpointer
+g_value_get_object (const GValue *value)
+{
+  g_return_val_if_fail (G_VALUE_HOLDS_OBJECT (value), NULL);
+  
+  return value->data[0].v_pointer;
+}
+
+EXPORT_C GObject*
+g_value_dup_object (const GValue *value)
+{
+  g_return_val_if_fail (G_VALUE_HOLDS_OBJECT (value), NULL);
+  
+  return value->data[0].v_pointer ? g_object_ref (value->data[0].v_pointer) : NULL;
+}
+
+EXPORT_C gulong
+g_signal_connect_object (gpointer      instance,
+			 const gchar  *detailed_signal,
+			 GCallback     c_handler,
+			 gpointer      gobject,
+			 GConnectFlags connect_flags)
+{
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), 0);
+  g_return_val_if_fail (detailed_signal != NULL, 0);
+  g_return_val_if_fail (c_handler != NULL, 0);
+
+  if (gobject)
+    {
+      GClosure *closure;
+
+      g_return_val_if_fail (G_IS_OBJECT (gobject), 0);
+
+      closure = ((connect_flags & G_CONNECT_SWAPPED) ? g_cclosure_new_object_swap : g_cclosure_new_object) (c_handler, gobject);
+
+      return g_signal_connect_closure (instance, detailed_signal, closure, connect_flags & G_CONNECT_AFTER);
+    }
+  else
+    return g_signal_connect_data (instance, detailed_signal, c_handler, NULL, NULL, connect_flags);
+}
+
+typedef struct {
+  GObject  *object;
+  guint     n_closures;
+  GClosure *closures[1]; /* flexible array */
+} CArray;
+/* don't change this structure without supplying an accessor for
+ * watched closures, e.g.:
+ * GSList* g_object_list_watched_closures (GObject *object)
+ * {
+ *   CArray *carray;
+ *   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+ *   carray = g_object_get_data (object, "GObject-closure-array");
+ *   if (carray)
+ *     {
+ *       GSList *slist = NULL;
+ *       guint i;
+ *       for (i = 0; i < carray->n_closures; i++)
+ *         slist = g_slist_prepend (slist, carray->closures[i]);
+ *       return slist;
+ *     }
+ *   return NULL;
+ * }
+ */
+
+static void
+object_remove_closure (gpointer  data,
+		       GClosure *closure)
+{
+  GObject *object = data;
+  CArray *carray = g_object_get_qdata (object, quark_closure_array);
+  guint i;
+  
+  for (i = 0; i < carray->n_closures; i++)
+    if (carray->closures[i] == closure)
+      {
+	carray->n_closures--;
+	if (i < carray->n_closures)
+	  carray->closures[i] = carray->closures[carray->n_closures];
+	return;
+      }
+  g_assert_not_reached ();
+}
+
+static void
+destroy_closure_array (gpointer data)
+{
+  CArray *carray = data;
+  GObject *object = carray->object;
+  guint i, n = carray->n_closures;
+  
+  for (i = 0; i < n; i++)
+    {
+      GClosure *closure = carray->closures[i];
+      
+      /* removing object_remove_closure() upfront is probably faster than
+       * letting it fiddle with quark_closure_array which is empty anyways
+       */
+      g_closure_remove_invalidate_notifier (closure, object, object_remove_closure);
+      g_closure_invalidate (closure);
+    }
+  g_free (carray);
+}
+
+EXPORT_C void
+g_object_watch_closure (GObject  *object,
+			GClosure *closure)
+{
+  CArray *carray;
+  guint i;
+  
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (closure != NULL);
+  g_return_if_fail (closure->is_invalid == FALSE);
+  g_return_if_fail (closure->in_marshal == FALSE);
+  g_return_if_fail (object->ref_count > 0);	/* this doesn't work on finalizing objects */
+  
+  g_closure_add_invalidate_notifier (closure, object, object_remove_closure);
+  g_closure_add_marshal_guards (closure,
+				object, (GClosureNotify) g_object_ref,
+				object, (GClosureNotify) g_object_unref);
+  carray = g_datalist_id_remove_no_notify (&object->qdata, quark_closure_array);
+  if (!carray)
+    {
+      carray = g_renew (CArray, NULL, 1);
+      carray->object = object;
+      carray->n_closures = 1;
+      i = 0;
+    }
+  else
+    {
+      i = carray->n_closures++;
+      carray = g_realloc (carray, sizeof (*carray) + sizeof (carray->closures[0]) * i);
+    }
+  carray->closures[i] = closure;
+  g_datalist_id_set_data_full (&object->qdata, quark_closure_array, carray, destroy_closure_array);
+}
+
+EXPORT_C GClosure*
+g_closure_new_object (guint    sizeof_closure,
+		      GObject *object)
+{
+  GClosure *closure;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (object->ref_count > 0, NULL);     /* this doesn't work on finalizing objects */
+
+  closure = g_closure_new_simple (sizeof_closure, object);
+  g_object_watch_closure (object, closure);
+
+  return closure;
+}
+
+EXPORT_C GClosure*
+g_cclosure_new_object (GCallback callback_func,
+		       GObject  *object)
+{
+  GClosure *closure;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (object->ref_count > 0, NULL);     /* this doesn't work on finalizing objects */
+  g_return_val_if_fail (callback_func != NULL, NULL);
+
+  closure = g_cclosure_new (callback_func, object, NULL);
+  g_object_watch_closure (object, closure);
+
+  return closure;
+}
+
+EXPORT_C GClosure*
+g_cclosure_new_object_swap (GCallback callback_func,
+			    GObject  *object)
+{
+  GClosure *closure;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (object->ref_count > 0, NULL);     /* this doesn't work on finalizing objects */
+  g_return_val_if_fail (callback_func != NULL, NULL);
+
+  closure = g_cclosure_new_swap (callback_func, object, NULL);
+  g_object_watch_closure (object, closure);
+
+  return closure;
+}
+
+gsize
+g_object_compat_control (gsize           what,
+                         gpointer        data)
+{
+  switch (what)
+    {
+      gpointer *pp;
+    case 1:     /* floating base type */
+      return G_TYPE_INITIALLY_UNOWNED;
+    case 2:     /* FIXME: remove this once GLib/Gtk+ break ABI again */
+      floating_flag_handler = (guint(*)(GObject*,gint)) data;
+      return 1;
+    case 3:     /* FIXME: remove this once GLib/Gtk+ break ABI again */
+      pp = data;
+      *pp = FIX_CASTING(void *)floating_flag_handler;
+      return 1;
+    default:
+      return 0;
+    }
+}
+
+#ifdef __SYMBIAN32__
+
+static void g_initially_unowned_init (GInitiallyUnowned *self); 
+static void g_initially_unowned_class_init (GInitiallyUnownedClass *klass); 
+
+#if EMULATOR
+
+PLS(g_initially_unowned_parent_class,gobject,gpointer)
+#define g_initially_unowned_parent_class (*FUNCTION_NAME(g_initially_unowned_parent_class,gobject)())
+
+#else
+
+static gpointer g_initially_unowned_parent_class = 0; 
+
+#endif /* EMULATOR */
+
+
+static void g_initially_unowned_class_intern_init (gpointer klass)
+{ 
+	g_initially_unowned_parent_class = g_type_class_peek_parent (klass); 
+	g_initially_unowned_class_init ((GInitiallyUnownedClass*) klass); 
+} 
+
+#if EMULATOR
+
+PLS(g_define_type_id,g_initially_unowned_get_type,GType)
+#define g_define_type_id (*FUNCTION_NAME(g_define_type_id,g_initially_unowned_get_type)())
+
+#endif /* EMULATOR */
+
+EXPORT_C GType g_initially_unowned_get_type (void) 
+{ 
+	#if !(EMULATOR)
+	static GType g_define_type_id = 0; 
+	#endif /* !(EMULATOR) */
+	if ((g_define_type_id == 0)) 
+	{ 
+		static const GTypeInfo g_define_type_info = { sizeof (GInitiallyUnownedClass), (GBaseInitFunc) 0, (GBaseFinalizeFunc) 0, (GClassInitFunc) g_initially_unowned_class_intern_init, (GClassFinalizeFunc) 0, 0, sizeof (GInitiallyUnowned), 0, (GInstanceInitFunc) g_initially_unowned_init, 0 }; 
+		g_define_type_id = g_type_register_static ( ((GType) ((20) << (2))), g_intern_static_string ("GInitiallyUnowned"), &g_define_type_info, (GTypeFlags) 0); 
+		{
+		 {} ; 
+		} 
+	} 
+		return g_define_type_id; 
+} ;
+
+#if EMULATOR
+#undef g_define_type_id
+#endif /* EMULATOR */
+
+#else
+
+G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT);
+
+#endif /* __SYMBIAN32__ */
+
+static void
+g_initially_unowned_init (GInitiallyUnowned *object)
+{
+  g_object_force_floating (object);
+}
+
+static void
+g_initially_unowned_class_init (GInitiallyUnownedClass *klass)
+{
+}
+
+#define __G_OBJECT_C__
+#include "gobjectaliasdef.c"