diff -Naurp glib-base/configure.in glib-tests/configure.in
--- glib-base/configure.in	2005-07-08 12:57:37.000000000 +0200
+++ glib-tests/configure.in	2005-07-08 13:18:07.000000000 +0200
@@ -2731,6 +2731,7 @@ docs/reference/gobject/Makefile
 docs/reference/gobject/version.xml
 tests/Makefile
 tests/gobject/Makefile
+tests/refcount/Makefile
 m4macros/Makefile
 ])
 
diff -Naurp glib-base/tests/Makefile.am glib-tests/tests/Makefile.am
--- glib-base/tests/Makefile.am	2005-07-08 12:57:41.000000000 +0200
+++ glib-tests/tests/Makefile.am	2005-07-08 13:17:50.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS=gobject
+SUBDIRS=gobject refcount
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
 
diff -Naurp glib-base/tests/refcount/Makefile.am glib-tests/tests/refcount/Makefile.am
--- glib-base/tests/refcount/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ glib-tests/tests/refcount/Makefile.am	2005-01-27 13:48:03.000000000 +0100
@@ -0,0 +1,32 @@
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/glib			\
+	-I$(top_srcdir)/gmodule			\
+	$(GLIB_DEBUG_FLAGS)
+
+libglib = $(top_builddir)/glib/libglib-2.0.la
+libgthread = $(top_builddir)/gthread/libgthread-2.0.la
+libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
+libgobject = $(top_builddir)/gobject/libgobject-2.0.la
+
+LDADD = $(libgobject) $(libgthread)
+
+test_programs =					\
+	signal1					\
+	signal2					\
+	signal3					\
+	objects					\
+	objects2
+
+signal1_SOURCES = signals.c
+signal1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS)
+signal2_SOURCES = signals.c
+signal2_CFLAGS = -DTESTNUM=2 $(AM_CFLAGS)
+signal3_SOURCES = signals.c
+signal3_CFLAGS = -DTESTNUM=3 $(AM_CFLAGS)
+
+check_PROGRAMS = $(test_programs)
+
+TESTS = $(test_programs)
+TESTS_ENVIRONMENT = srcdir=$(srcdir) \
+	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
diff -Naurp glib-base/tests/refcount/objects.c glib-tests/tests/refcount/objects.c
--- glib-base/tests/refcount/objects.c	1970-01-01 01:00:00.000000000 +0100
+++ glib-tests/tests/refcount/objects.c	2005-01-27 13:29:35.000000000 +0100
@@ -0,0 +1,155 @@
+#include <unistd.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_TYPE_TEST               (g_test_get_type ())
+#define G_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define G_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define G_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define G_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define G_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+
+typedef struct _GTest GTest;
+typedef struct _GTestClass GTestClass;
+
+struct _GTest
+{
+  GObject object;
+};
+
+struct _GTestClass
+{
+  GObjectClass parent_class;
+};
+
+static GType g_test_get_type (void);
+static gboolean stopping;
+
+static void g_test_class_init (GTestClass * klass);
+static void g_test_init (GTest * test);
+static void g_test_dispose (GObject * object);
+
+static GObjectClass *parent_class = NULL;
+
+static GType
+g_test_get_type (void)
+{
+  static GType test_type = 0;
+
+  if (!test_type) {
+    static const GTypeInfo test_info = {
+      sizeof (GTestClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) g_test_class_init,
+      NULL,
+      NULL,
+      sizeof (GTest),
+      0,
+      (GInstanceInitFunc) g_test_init,
+      NULL
+    };
+
+    test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
+        &test_info, 0);
+  }
+  return test_type;
+}
+
+static void
+g_test_class_init (GTestClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  gobject_class->dispose = g_test_dispose;
+}
+
+static void
+g_test_init (GTest * test)
+{
+  g_print ("init %p\n", test);
+}
+
+static void
+g_test_dispose (GObject * object)
+{
+  GTest *test;
+
+  test = G_TEST (object);
+
+  g_print ("dispose %p!\n", object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+g_test_do_refcount (GTest * test)
+{
+  g_object_ref (test); 
+  g_object_unref (test); 
+}
+
+static gpointer
+run_thread (GTest * test)
+{
+  gint i = 0;
+
+  while (!stopping) {
+    g_test_do_refcount (test);
+    if ((i++ % 100000) == 0) {
+      g_print (".");
+      g_usleep (1);             /* context switch */
+    }
+  }
+
+  return NULL;
+}
+
+int
+main (int argc, char **argv)
+{
+  gint i;
+  GTest *test1, *test2;
+  GArray *test_threads;
+
+  g_thread_init (NULL);
+  g_type_init ();
+
+  test1 = g_object_new (G_TYPE_TEST, NULL);
+  test2 = g_object_new (G_TYPE_TEST, NULL);
+
+  test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
+
+  stopping = FALSE;
+
+  for (i = 0; i < 20; i++) {
+    GThread *thread;
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test1, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test2, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+  }
+  sleep (5);
+
+  stopping = TRUE;
+
+  g_print ("\nstopping\n");
+
+  /* join all threads */
+  for (i = 0; i < 40; i++) {
+    GThread *thread;
+
+    thread = g_array_index (test_threads, GThread *, i);
+    g_thread_join (thread);
+  }
+
+  g_print ("stopped\n");
+
+  return 0;
+}
diff -Naurp glib-base/tests/refcount/objects2.c glib-tests/tests/refcount/objects2.c
--- glib-base/tests/refcount/objects2.c	1970-01-01 01:00:00.000000000 +0100
+++ glib-tests/tests/refcount/objects2.c	2005-01-27 13:47:47.000000000 +0100
@@ -0,0 +1,111 @@
+#include <unistd.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_TYPE_TEST               (g_test_get_type ())
+#define G_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define G_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define G_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define G_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define G_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+
+typedef struct _GTest GTest;
+typedef struct _GTestClass GTestClass;
+
+struct _GTest
+{
+  GObject object;
+};
+
+struct _GTestClass
+{
+  GObjectClass parent_class;
+};
+
+static GType g_test_get_type (void);
+
+static void g_test_class_init (GTestClass * klass);
+static void g_test_init (GTest * test);
+static void g_test_dispose (GObject * object);
+
+static GObjectClass *parent_class = NULL;
+
+static GType
+g_test_get_type (void)
+{
+  static GType test_type = 0;
+
+  if (!test_type) {
+    static const GTypeInfo test_info = {
+      sizeof (GTestClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) g_test_class_init,
+      NULL,
+      NULL,
+      sizeof (GTest),
+      0,
+      (GInstanceInitFunc) g_test_init,
+      NULL
+    };
+
+    test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
+        &test_info, 0);
+  }
+  return test_type;
+}
+
+static void
+g_test_class_init (GTestClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  gobject_class->dispose = g_test_dispose;
+}
+
+static void
+g_test_init (GTest * test)
+{
+  g_print ("init %p\n", test);
+}
+
+static void
+g_test_dispose (GObject * object)
+{
+  GTest *test;
+
+  test = G_TEST (object);
+
+  g_print ("dispose %p!\n", object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+g_test_do_refcount (GTest * test)
+{
+  g_object_ref (test); 
+  g_object_unref (test); 
+}
+
+int
+main (int argc, char **argv)
+{
+  gint i;
+  GTest *test;
+
+  g_thread_init (NULL);
+  g_type_init ();
+
+  test = g_object_new (G_TYPE_TEST, NULL);
+
+  for (i=0; i<100000000; i++) {
+    g_test_do_refcount (test);
+  }
+
+  return 0;
+}
diff -Naurp glib-base/tests/refcount/signals.c glib-tests/tests/refcount/signals.c
--- glib-base/tests/refcount/signals.c	1970-01-01 01:00:00.000000000 +0100
+++ glib-tests/tests/refcount/signals.c	2005-02-08 18:41:11.000000000 +0100
@@ -0,0 +1,281 @@
+#include <unistd.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_TYPE_TEST               (g_test_get_type ())
+#define G_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define G_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define G_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define G_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define G_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+
+static GRand *rand;
+
+typedef struct _GTest GTest;
+typedef struct _GTestClass GTestClass;
+
+struct _GTest
+{
+  GObject object;
+
+  gint value;
+};
+
+struct _GTestClass
+{
+  GObjectClass parent_class;
+
+  void (*test_signal1) (GTest * test, gint an_int);
+  void (*test_signal2) (GTest * test, gint an_int);
+};
+
+static GType g_test_get_type (void);
+static gboolean stopping;
+
+/* Element signals and args */
+enum
+{
+  TEST_SIGNAL1,
+  TEST_SIGNAL2,
+  /* add more above */
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0,
+  ARG_TEST_PROP
+};
+
+static void g_test_class_init (GTestClass * klass);
+static void g_test_init (GTest * test);
+static void g_test_dispose (GObject * object);
+
+static void signal2_handler (GTest * test, gint anint);
+
+static void g_test_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void g_test_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GObjectClass *parent_class = NULL;
+
+static guint g_test_signals[LAST_SIGNAL] = { 0 };
+
+static GType
+g_test_get_type (void)
+{
+  static GType test_type = 0;
+
+  if (!test_type) {
+    static const GTypeInfo test_info = {
+      sizeof (GTestClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) g_test_class_init,
+      NULL,
+      NULL,
+      sizeof (GTest),
+      0,
+      (GInstanceInitFunc) g_test_init,
+      NULL
+    };
+
+    rand = g_rand_new();
+
+    test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
+        &test_info, 0);
+  }
+  return test_type;
+}
+
+static void
+g_test_class_init (GTestClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
+
+  gobject_class->dispose = g_test_dispose;
+  gobject_class->set_property = g_test_set_property;
+  gobject_class->get_property = g_test_get_property;
+
+  g_test_signals[TEST_SIGNAL1] =
+      g_signal_new ("test-signal1", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal1), NULL,
+      NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+  g_test_signals[TEST_SIGNAL2] =
+      g_signal_new ("test-signal2", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal2), NULL,
+      NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TEST_PROP,
+      g_param_spec_int ("test-prop", "Test Prop", "Test property",
+          0, 1, 0, G_PARAM_READWRITE));
+
+  klass->test_signal2 = signal2_handler;
+}
+
+static void
+g_test_init (GTest * test)
+{
+  g_print ("init %p\n", test);
+
+  test->value = 0;
+}
+
+static void
+g_test_dispose (GObject * object)
+{
+  GTest *test;
+
+  test = G_TEST (object);
+
+  g_print ("dispose %p!\n", object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+g_test_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GTest *test;
+
+  test = G_TEST (object);
+
+  switch (prop_id) {
+    case ARG_TEST_PROP:
+      test->value = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+g_test_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GTest *test;
+
+  test = G_TEST (object);
+
+  switch (prop_id) {
+    case ARG_TEST_PROP:
+      g_value_set_int (value, test->value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+g_test_do_signal1 (GTest * test)
+{
+  g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL1], 0, 0);
+}
+
+static void
+signal2_handler (GTest * test, gint anint)
+{
+}
+
+static void
+g_test_do_signal2 (GTest * test)
+{
+  g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL2], 0, 0);
+}
+
+static void
+g_test_do_prop (GTest * test)
+{
+  test->value = g_rand_int (rand);
+  g_object_notify (G_OBJECT (test), "test-prop");
+}
+
+static gpointer
+run_thread (GTest * test)
+{
+  gint i = 0;
+
+  while (!stopping) {
+    if (TESTNUM == 1)
+      g_test_do_signal1 (test);
+    if (TESTNUM == 2)
+      g_test_do_signal2 (test);
+    if (TESTNUM == 3)
+      g_test_do_prop (test);
+    if ((i++ % 100000) == 0) {
+      g_print (".");
+      g_usleep (1);             /* context switch */
+    }
+  }
+
+  return NULL;
+}
+
+static void
+notify (GObject *object, GParamSpec *spec, gpointer user_data)
+{
+  gint value;
+
+  g_object_get (object, "test-prop", &value, NULL);
+  //g_print ("+ %d", value);
+}
+
+int
+main (int argc, char **argv)
+{
+  gint i;
+  GTest *test1, *test2;
+  GArray *test_threads;
+
+  g_thread_init (NULL);
+  g_type_init ();
+
+  test1 = g_object_new (G_TYPE_TEST, NULL);
+  test2 = g_object_new (G_TYPE_TEST, NULL);
+
+  g_signal_connect (test1, "notify::test-prop", notify, NULL);
+  g_signal_connect (test1, "test-signal1", notify, NULL);
+  g_signal_connect (test1, "test-signal2", notify, NULL);
+
+  test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
+
+  stopping = FALSE;
+
+  for (i = 0; i < 20; i++) {
+    GThread *thread;
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test1, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test2, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+  }
+  sleep (5);
+
+  stopping = TRUE;
+
+  g_print ("\nstopping\n");
+
+  /* join all threads */
+  for (i = 0; i < 40; i++) {
+    GThread *thread;
+
+    thread = g_array_index (test_threads, GThread *, i);
+    g_thread_join (thread);
+  }
+
+  g_print ("stopped\n");
+
+  return 0;
+}
