xsplash

Merge lp://qastaging/~dbarth/xsplash/timeout-option into lp://qastaging/xsplash

  1. timeout-option
  2. Merge into trunk
Proposed by David Barth
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~dbarth/xsplash/timeout-option
Merge into: lp://qastaging/xsplash
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~dbarth/xsplash/timeout-option
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+11895@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

Timeout option to ease testing. May be a bit outdated with the new signal stuff.

Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xsplash.c'
2--- src/xsplash.c 2009-09-08 16:11:32 +0000
3+++ src/xsplash.c 2009-09-10 12:48:55 +0000
4@@ -128,6 +128,7 @@
5 static gboolean is_composited = FALSE;
6 static gboolean redirected = FALSE;
7 static GSList *signal_list = NULL;
8+static guint timeout = 15;
9
10 static GOptionEntry entries[] = {
11 {
12@@ -161,6 +162,11 @@
13 "Whether to reverse throbber directions", NULL
14 },
15 {
16+ "timeout", 'x', 0,
17+ G_OPTION_ARG_NONE, &timeout,
18+ "Timeout (in seconds - 15s by default) ", NULL
19+ },
20+ {
21 "add-signal", 's', 0,
22 G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xsplash_add_signal,
23 "Add a signal to listen for.", NULL
24@@ -898,9 +904,9 @@
25 "dbus-proxy", bus_proxy,
26 NULL);
27
28- g_timeout_add (15000,
29- temporary_hack_for_initial_fade,
30- server);
31+ g_timeout_add_seconds (timeout,
32+ temporary_hack_for_initial_fade,
33+ server);
34
35 gtk_main ();
36

Subscribers

People subscribed via source and target branches