libbonobo r3496 - in trunk: . bonobo tests

[tml svn gnome org]

Author: tml
Date: Thu Sep 11 15:19:15 2008
New Revision: 3496
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3496&view=rev

Log:
2008-09-11  Tor Lillqvist  <tml novell com>

	* bonobo/bonobo-generic-factory.h (BONOBO_ACTIVATION_FACTORY)
	(BONOBO_ACTIVATION_FACTORY_TIMEOUT)
	* tests/*.c (main): Call
	g_thread_init(NULL) here. It is the right thing to do, and in the
	future ORBit2 might enforce this, see bug #547885.



Modified:
   trunk/ChangeLog
   trunk/bonobo/bonobo-generic-factory.h
   trunk/tests/test-event-source.c
   trunk/tests/test-generic-factory.c
   trunk/tests/test-main-loop.c
   trunk/tests/test-moniker.c
   trunk/tests/test-object.c
   trunk/tests/test-properties-client.c
   trunk/tests/test-properties-server.c
   trunk/tests/test-storage-mem.c
   trunk/tests/test-stream-mem.c

Modified: trunk/bonobo/bonobo-generic-factory.h
==============================================================================
--- trunk/bonobo/bonobo-generic-factory.h	(original)
+++ trunk/bonobo/bonobo-generic-factory.h	Thu Sep 11 15:19:15 2008
@@ -91,6 +91,8 @@
 #define BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data)	\
 int main (int argc, char *argv [])						\
 {										\
+	g_thread_init (NULL);							\
+										\
 	BONOBO_FACTORY_INIT (descr, version, &argc, argv);			\
 									        \
 	return bonobo_generic_factory_main (oafiid, callback, data);		\
@@ -99,6 +101,8 @@
 #define BONOBO_ACTIVATION_FACTORY_TIMEOUT(oafiid, descr, version, callback, data, quit_timeout)	\
 int main (int argc, char *argv [])								\
 {												\
+	g_thread_init (NULL);									\
+												\
 	BONOBO_FACTORY_INIT (descr, version, &argc, argv);					\
 												\
 	return bonobo_generic_factory_main_timeout (oafiid, callback, data, quit_timeout);	\

Modified: trunk/tests/test-event-source.c
==============================================================================
--- trunk/tests/test-event-source.c	(original)
+++ trunk/tests/test-event-source.c	Thu Sep 11 15:19:15 2008
@@ -81,6 +81,8 @@
 int
 main (int argc, char **argv)
 {
+        g_thread_init (NULL);
+
 	if (!bonobo_init (&argc, argv))
 		g_error ("Cannot init bonobo");
 	

Modified: trunk/tests/test-generic-factory.c
==============================================================================
--- trunk/tests/test-generic-factory.c	(original)
+++ trunk/tests/test-generic-factory.c	Thu Sep 11 15:19:15 2008
@@ -60,6 +60,7 @@
 int
 main (int argc, char **argv)
 {
+	g_thread_init (NULL);
 	if (!bonobo_init (&argc, argv))
 		g_error ("Cannot init bonobo");
 	g_idle_add (run_tests, NULL);

Modified: trunk/tests/test-main-loop.c
==============================================================================
--- trunk/tests/test-main-loop.c	(original)
+++ trunk/tests/test-main-loop.c	Thu Sep 11 15:19:15 2008
@@ -24,6 +24,7 @@
 int
 main (int argc, char **argv)
 {
+	g_thread_init (NULL);
 	if (!bonobo_init (&argc, argv))
 		g_error ("Cannot init bonobo");
 	g_idle_add (run_tests, NULL);

Modified: trunk/tests/test-moniker.c
==============================================================================
--- trunk/tests/test-moniker.c	(original)
+++ trunk/tests/test-moniker.c	Thu Sep 11 15:19:15 2008
@@ -80,6 +80,8 @@
 int
 main (int argc, char *argv [])
 {
+        g_thread_init (NULL);
+
 	free (malloc (8));
 
 	if (!bonobo_init (NULL, NULL))

Modified: trunk/tests/test-object.c
==============================================================================
--- trunk/tests/test-object.c	(original)
+++ trunk/tests/test-object.c	Thu Sep 11 15:19:15 2008
@@ -48,6 +48,8 @@
 	Bonobo_Unknown    ref;
 	CORBA_Environment *ev, real_ev;
 
+        g_thread_init (NULL);
+
 	free (malloc (8));
 
 	if (bonobo_init (&argc, argv) == FALSE)

Modified: trunk/tests/test-properties-client.c
==============================================================================
--- trunk/tests/test-properties-client.c	(original)
+++ trunk/tests/test-properties-client.c	Thu Sep 11 15:19:15 2008
@@ -197,6 +197,8 @@
 	CORBA_ORB orb;
 	CORBA_exception_init (&ev);
 
+        g_thread_init (NULL);
+
 	if (!bonobo_init (&argc, argv))
 		g_error ("Could not initialize Bonobo");
 

Modified: trunk/tests/test-properties-server.c
==============================================================================
--- trunk/tests/test-properties-server.c	(original)
+++ trunk/tests/test-properties-server.c	Thu Sep 11 15:19:15 2008
@@ -261,6 +261,8 @@
 {
 	BonoboObject *context;
 
+        g_thread_init (NULL);
+
 	if (!bonobo_init (&argc, argv))
 		g_error ("Could not initialize Bonobo");
 

Modified: trunk/tests/test-storage-mem.c
==============================================================================
--- trunk/tests/test-storage-mem.c	(original)
+++ trunk/tests/test-storage-mem.c	Thu Sep 11 15:19:15 2008
@@ -18,6 +18,8 @@
 	int                           num_ok = 0;
 	int                           num_tests = 0;
 	
+        g_thread_init (NULL);
+
 	ev = &real_ev;
 	
 	if (!bonobo_init (&argc, argv))

Modified: trunk/tests/test-stream-mem.c
==============================================================================
--- trunk/tests/test-stream-mem.c	(original)
+++ trunk/tests/test-stream-mem.c	Thu Sep 11 15:19:15 2008
@@ -54,6 +54,8 @@
 	BonoboStream *memstream;
 	guint8       *buffer;
 
+        g_thread_init (NULL);
+
 	free (malloc (8));
 	
 	if (!bonobo_init (&argc, argv))