Index: tests/refcount/properties3.c
===================================================================
--- tests/refcount/properties3.c	(revision 0)
+++ tests/refcount/properties3.c	(revision 0)
@@ -0,0 +1,246 @@
+#include <unistd.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_TYPE_TEST               (my_test_get_type ())
+#define MY_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define MY_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define MY_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define MY_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define MY_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+
+enum {
+  PROP_0,
+  PROP_DUMMY
+};
+
+typedef struct _GTest GTest;
+typedef struct _GTestClass GTestClass;
+
+struct _GTest
+{
+  GObject object;
+  gint id;
+  gint dummy;
+
+  gint count;
+  gint setcount;
+};
+
+struct _GTestClass
+{
+  GObjectClass parent_class;
+};
+
+static GType my_test_get_type (void);
+static volatile gboolean stopping;
+
+static void my_test_class_init (GTestClass * klass);
+static void my_test_init (GTest * test);
+static void my_test_dispose (GObject * object);
+static void my_test_get_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec);
+static void my_test_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec);
+
+static GObjectClass *parent_class = NULL;
+
+static GType
+my_test_get_type (void)
+{
+  static GType test_type = 0;
+
+  if (!test_type) {
+    static const GTypeInfo test_info = {
+      sizeof (GTestClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) my_test_class_init,
+      NULL,
+      NULL,
+      sizeof (GTest),
+      0,
+      (GInstanceInitFunc) my_test_init,
+      NULL
+    };
+
+    test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", &test_info, 0);
+  }
+  return test_type;
+}
+
+static void
+my_test_class_init (GTestClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  gobject_class->dispose = my_test_dispose;
+  gobject_class->get_property = my_test_get_property;
+  gobject_class->set_property = my_test_set_property;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_DUMMY,
+				   g_param_spec_int ("dummy",
+						     NULL, 
+						     NULL,
+						     0, G_MAXINT, 0,
+						     G_PARAM_READWRITE));
+}
+
+static void
+my_test_init (GTest * test)
+{
+  static guint static_id = 1;
+  test->id = static_id++;
+}
+
+static void
+my_test_dispose (GObject * object)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void 
+my_test_get_property (GObject    *object,
+                      guint       prop_id,
+                      GValue     *value,
+                      GParamSpec *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  switch (prop_id)
+    {
+    case PROP_DUMMY:
+      g_value_set_int (value, g_atomic_int_get (&test->dummy));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void 
+my_test_set_property (GObject      *object,
+                      guint         prop_id,
+                      const GValue *value,
+                      GParamSpec   *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  switch (prop_id)
+    {
+    case PROP_DUMMY:
+      g_atomic_int_set (&test->dummy, g_value_get_int (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+dummy_notify (GObject    *object,
+              GParamSpec *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  g_atomic_int_inc (&test->count);
+}
+
+static void
+my_test_do_property (GTest * test)
+{
+  gint dummy;
+
+  g_atomic_int_inc (&test->setcount);
+
+  g_object_get (test, "dummy", &dummy, NULL);
+  g_object_set (test, "dummy", dummy + 1, NULL);
+}
+
+static gpointer
+run_thread (GTest * test)
+{
+  gint i = 1;
+  
+  while (!stopping) {
+    my_test_do_property (test);
+    if ((i++ % 10000) == 0)
+      {
+        g_print (".%c", 'a' + test->id);
+        g_thread_yield(); /* force context switch */
+      }
+  }
+
+  return NULL;
+}
+
+int
+main (int argc, char **argv)
+{
+  gint i;
+  GTest *test;
+  GArray *test_threads;
+  const gint n_threads = 5;
+
+  g_thread_init (NULL);
+
+  g_print ("START: %s\n", argv[0]);
+  g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal (G_LOG_FATAL_MASK));
+  g_type_init ();
+
+  test = g_object_new (G_TYPE_TEST, NULL);
+
+  g_assert (test->count == test->dummy);
+  g_signal_connect (test, "notify::dummy", G_CALLBACK (dummy_notify), NULL);
+    
+  test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
+
+  stopping = FALSE;
+
+  for (i = 0; i < n_threads; i++) {
+    GThread *thread;
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+  }
+  g_usleep (30000000);
+
+  stopping = TRUE;
+  g_print ("\nstopping\n");
+
+  /* join all threads */
+  for (i = 0; i < n_threads; i++) {
+    GThread *thread;
+
+    thread = g_array_index (test_threads, GThread *, i);
+    g_thread_join (thread);
+  }
+
+  g_print ("stopped\n");
+
+  g_print ("%d %d\n", test->setcount, test->count);
+
+  g_array_free (test_threads, TRUE);
+  g_object_unref (test);
+
+  return 0;
+}
Index: tests/refcount/Makefile.am
===================================================================
--- tests/refcount/Makefile.am	(revision 8014)
+++ tests/refcount/Makefile.am	(working copy)
@@ -19,6 +19,7 @@
 	objects2				\
 	properties				\
 	properties2				\
+	properties3				\
 	signal1					\
 	signal2					\
 	signal3
Index: gobject/gobjectnotifyqueue.c
===================================================================
--- gobject/gobjectnotifyqueue.c	(revision 8014)
+++ gobject/gobjectnotifyqueue.c	(working copy)
@@ -38,7 +38,7 @@
 /* --- structures --- */
 struct _GObjectNotifyContext
 {
-  GQuark                       quark_notify_queue;
+  GStaticPrivate               key_notify_queue;
   GObjectNotifyQueueDispatcher dispatcher;
   GTrashStack                 *_nqueue_trash; /* unused */
 };
@@ -70,14 +70,15 @@
 {
   GObjectNotifyQueue *nqueue;
 
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
+  nqueue = g_static_private_get (&context->key_notify_queue);
   if (!nqueue)
     {
       nqueue = (void*) g_list_alloc ();
       memset (nqueue, 0, sizeof (*nqueue));
       nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
+
+      g_static_private_set (&context->key_notify_queue, nqueue,
+		            g_object_notify_queue_free);
     }
 
   g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
@@ -119,7 +120,7 @@
 
       pspecs[n_pspecs++] = pspec;
     }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
+  g_static_private_set (&context->key_notify_queue, NULL, NULL);
 
   if (n_pspecs)
     context->dispatcher (object, n_pspecs, pspecs);
@@ -162,7 +163,7 @@
 g_object_notify_queue_from_object (GObject              *object,
 				   GObjectNotifyContext *context)
 {
-  return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
+  return g_static_private_get (&context->key_notify_queue);
 }
 
 
Index: gobject/gobject.c
===================================================================
--- gobject/gobject.c	(revision 8014)
+++ gobject/gobject.c	(working copy)
@@ -182,7 +182,7 @@
 static GQuark	            quark_weak_refs = 0;
 static GQuark	            quark_toggle_refs = 0;
 static GParamSpecPool      *pspec_pool = NULL;
-static GObjectNotifyContext property_notify_context = { 0, };
+static GObjectNotifyContext property_notify_context = { G_STATIC_PRIVATE_INIT, };
 static gulong	            gobject_signals[LAST_SIGNAL] = { 0, };
 static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_handler;
 G_LOCK_DEFINE_STATIC (construction_mutex);
@@ -321,7 +321,6 @@
   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;
