← Back to team overview

ayatana-commits team mailing list archive

[Branch ~xsplash-team/xsplash/trunk] Rev 73: Merge lp:~bratsche/xsplash/timeout-option-fix. Fixes #438236.

 

Merge authors:
  Cody Russell (bratsche)
Related merge proposals:
  https://code.launchpad.net/~bratsche/xsplash/timeout-option-fix/+merge/12532
  proposed by: Cody Russell (bratsche)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 73 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: xsplash
timestamp: Mon 2009-09-28 14:02:35 -0500
message:
  Merge lp:~bratsche/xsplash/timeout-option-fix.  Fixes #438236.
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-26 19:23:26 +0000
+++ src/xsplash.c	2009-09-28 16:30:02 +0000
@@ -170,7 +170,7 @@
   },
   {
     "timeout", 'x', 0,
-    G_OPTION_ARG_NONE, &timeout,
+    G_OPTION_ARG_INT, &timeout,
     "Timeout (in seconds - 15s by default) ", NULL
   },
   {