← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~dbarth/xsplash/timeout-option into lp:xsplash

 

David Barth has proposed merging lp:~dbarth/xsplash/timeout-option into lp:xsplash.

Requested reviews:
    Cody Russell (bratsche)

Timeout option to ease testing. May be a bit outdated with the new signal stuff.
-- 
https://code.launchpad.net/~dbarth/xsplash/timeout-option/+merge/11895
Your team ayatana-commits is subscribed to branch lp:xsplash.
=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-09-08 16:11:32 +0000
+++ src/xsplash.c	2009-09-10 12:48:55 +0000
@@ -128,6 +128,7 @@
 static gboolean  is_composited    = FALSE;
 static gboolean  redirected       = FALSE;
 static GSList   *signal_list      = NULL;
+static guint     timeout          = 15;
 
 static GOptionEntry entries[] = {
   {
@@ -161,6 +162,11 @@
     "Whether to reverse throbber directions", NULL
   },
   {
+    "timeout", 'x', 0,
+    G_OPTION_ARG_NONE, &timeout,
+    "Timeout (in seconds - 15s by default) ", NULL
+  },
+  {
     "add-signal", 's', 0,
     G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xsplash_add_signal,
     "Add a signal to listen for.", NULL
@@ -898,9 +904,9 @@
                          "dbus-proxy", bus_proxy,
                          NULL);
 
-  g_timeout_add (15000,
-                 temporary_hack_for_initial_fade,
-                 server);
+  g_timeout_add_seconds (timeout,
+			 temporary_hack_for_initial_fade,
+			 server);
 
   gtk_main ();
 


Follow ups