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

[kmaraas svn gnome org]

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

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

	* activation-server/object-directory-corba.c: (check_quit):
	* bonobo-activation/bonobo-activation-init.c:
	(bonobo_activation_postinit):
	* bonobo/bonobo-generic-factory.c: (last_unref_cb),
	(bonobo_generic_factory_main_timeout):
	Use g_timeout_add_seconds and friends in a few places.

Modified:
   trunk/ChangeLog
   trunk/activation-server/object-directory-corba.c
   trunk/bonobo-activation/bonobo-activation-init.c
   trunk/bonobo/bonobo-generic-factory.c

Modified: trunk/activation-server/object-directory-corba.c
==============================================================================
--- trunk/activation-server/object-directory-corba.c	(original)
+++ trunk/activation-server/object-directory-corba.c	Thu Dec 11 12:02:37 2008
@@ -602,7 +602,7 @@
 
         if (od->n_active_servers <= RESIDUAL_SERVERS &&
             activation_clients_is_empty_scan ())
-                od->no_servers_timeout = g_timeout_add (
+                od->no_servers_timeout = g_timeout_add_seconds (
                         SERVER_IDLE_QUIT_TIMEOUT, quit_server_timeout, NULL);
 
 	od->time_active_changed = time (NULL);

Modified: trunk/bonobo-activation/bonobo-activation-init.c
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-init.c	(original)
+++ trunk/bonobo-activation/bonobo-activation-init.c	Thu Dec 11 12:02:37 2008
@@ -465,10 +465,10 @@
 #endif
 
         if (bonobo_activation_activate_iid)
-                g_timeout_add_full (G_PRIORITY_LOW,
-                                    BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT,
-                                    bonobo_activation_timeout_reg_check,
-                                    NULL, NULL);
+                g_timeout_add_full_seconds (G_PRIORITY_LOW,
+                                            BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT,
+                                            bonobo_activation_timeout_reg_check,
+                                            NULL, NULL);
         else
                 bonobo_activation_timeout_reg_check_set (FALSE);
 

Modified: trunk/bonobo/bonobo-generic-factory.c
==============================================================================
--- trunk/bonobo/bonobo-generic-factory.c	(original)
+++ trunk/bonobo/bonobo-generic-factory.c	Thu Dec 11 12:02:37 2008
@@ -345,7 +345,7 @@
 		return;
 	}
 	g_return_if_fail (!factory->priv->last_unref_timeout_id);
-	factory->priv->last_unref_timeout_id = g_timeout_add
+	factory->priv->last_unref_timeout_id = g_timeout_add_seconds
 		(factory->priv->last_unref_timeout, last_unref_timeout, factory);
 }
 
@@ -405,7 +405,7 @@
 
 		  /* Create timeout here so if we haven't created anything
 		   * within a few minutes we just quit */
-		factory->priv->startup_timeout_id = g_timeout_add
+		factory->priv->startup_timeout_id = g_timeout_add_seconds
 			(STARTUP_TIMEOUT, startup_timeout, factory);
 
 		bonobo_main ();