ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  David Barth (dbarth)
Related merge proposals:
  https://code.launchpad.net/~dbarth/xsplash/timeout-option/+merge/11895
  proposed by: David Barth (dbarth)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 65 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: xsplash
timestamp: Wed 2009-09-16 11:10:10 -0500
message:
  merge lp:~dbarth/xsplash/timeout-option
modified:
  src/xsplash.c


--
lp:xsplash
https://code.launchpad.net/~xsplash-team/xsplash/trunk

Your team ayatana-commits is subscribed to branch lp:xsplash.
To unsubscribe from this branch go to https://code.launchpad.net/~xsplash-team/xsplash/trunk/+edit-subscription.

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-09-16 15:59:27 +0000
+++ src/xsplash.c	2009-09-16 16:10:10 +0000
@@ -130,6 +130,7 @@
 static gboolean  is_composited    = FALSE;
 static gboolean  redirected       = FALSE;
 static GSList   *signal_list      = NULL;
+static guint     timeout          = 15;
 
 static GOptionEntry entries[] = {
   {
@@ -168,6 +169,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
@@ -930,9 +936,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 ();