libbonobo r3519 - in trunk: . activation-server bonobo bonobo-activation

[kmaraas svn gnome org]

Author: kmaraas
Date: Thu Dec 11 12:13:45 2008
New Revision: 3519
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3519&view=rev

Log:
2008-12-11  Kjartan Maraas  <kmaraas gnome org>

	* activation-server/server.h:
	* bonobo-activation/bonobo-activation-private.h:
	* bonobo/bonobo-generic-factory.c:
	And remember to adjust the timeout constants accordingly.

Modified:
   trunk/ChangeLog
   trunk/activation-server/server.h
   trunk/bonobo-activation/bonobo-activation-private.h
   trunk/bonobo/bonobo-generic-factory.c

Modified: trunk/activation-server/server.h
==============================================================================
--- trunk/activation-server/server.h	(original)
+++ trunk/activation-server/server.h	Thu Dec 11 12:13:45 2008
@@ -16,7 +16,7 @@
  *    Time delay after all servers are de-registered / dead
  * before quitting the server. (ms)
  */
-#define SERVER_IDLE_QUIT_TIMEOUT 1000
+#define SERVER_IDLE_QUIT_TIMEOUT 1
 
 #define NAMING_CONTEXT_IID "OAFIID:Bonobo_CosNaming_NamingContext"
 #define EVENT_SOURCE_IID "OAFIID:Bonobo_Activation_EventSource"

Modified: trunk/bonobo-activation/bonobo-activation-private.h
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-private.h	(original)
+++ trunk/bonobo-activation/bonobo-activation-private.h	Thu Dec 11 12:13:45 2008
@@ -29,7 +29,7 @@
 #include <bonobo-activation/bonobo-activation-base-service.h>
 #include <bonobo-activation/Bonobo_ActivationContext.h>
 
-#define BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT 1000
+#define BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT 1
 
 extern GStaticRecMutex _bonobo_activation_guard;
 #define BONOBO_ACTIVATION_LOCK()   g_static_rec_mutex_lock   (&_bonobo_activation_guard)

Modified: trunk/bonobo/bonobo-generic-factory.c
==============================================================================
--- trunk/bonobo/bonobo-generic-factory.c	(original)
+++ trunk/bonobo/bonobo-generic-factory.c	Thu Dec 11 12:13:45 2008
@@ -28,8 +28,8 @@
 #include <bonobo/bonobo-debug.h>
 #include "bonobo-private.h"
 
-#define DEFAULT_LAST_UNREF_TIMEOUT 	2000
-#define STARTUP_TIMEOUT 		60000
+#define DEFAULT_LAST_UNREF_TIMEOUT 	2
+#define STARTUP_TIMEOUT 		60
 
 struct _BonoboGenericFactoryPrivate {
 	/* The function factory */