Set the application start-up timeout to 5 seconds by default

The application timeout is now implemented in 2.4 but is not settable.
Instead, there is a default of 5 seconds, so the default should be
consistent in 2.5.
Also, document the default values.

diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index 7b7346a..d6ffc7a 100644 (file)
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -39,7 +39,7 @@ static void handle_get_items (DBusPendingCall *pending, void *user_data);
 static DBusConnection *bus = NULL;
 static GHashTable *live_refs = NULL;
 static gint method_call_timeout = 800;
-static gint app_startup_time = 1000;
+static gint app_startup_time = 5000;
 
 GMainLoop *atspi_main_loop;
 gboolean atspi_no_cache;
@@ -1477,6 +1477,9 @@ atspi_get_a11y_bus (void)
  *  timeout exceptions if an application is likely to block for an extended
  *  period of time on initialization. -1 can be passed to disable this
  *  behavior.
+ *
+ * By default, the normal timeout is set to 800 ms, and the application startup
+ * timeout is set to 5 seconds.
  */
 void
 atspi_set_timeout (gint val, gint startup_time)