Merge lp:~ken-vandine/signon-ui/lp_1112680 into lp:signon-ui

Proposed by Ken VanDine on 2013-02-01
Status: Merged
Approved by: Alberto Mardegan on 2013-02-02
Approved revision: 77
Merged at revision: 77
Proposed branch: lp:~ken-vandine/signon-ui/lp_1112680
Merge into: lp:signon-ui
Diff against target: 23 lines (+11/-2)
1 file modified
src/main.cpp (+11/-2)
To merge this branch: bzr merge lp:~ken-vandine/signon-ui/lp_1112680
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2013-02-01 Approve on 2013-02-02
PS Jenkins bot (community) continuous-integration Approve on 2013-02-01
Review via email: mp+146177@code.launchpad.net

Commit message

Default daemonTimeout to 30, which can be overridden with SSOUI_DAEMON_TIMEOUT (LP: #1112680)

Description of the change

Default daemonTimeout to 30, which can be overridden with SSOUI_DAEMON_TIMEOUT (LP: #1112680)

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Thanks (I wouldn't mind having even a shorter timeout, actually)!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main.cpp'
2--- src/main.cpp 2012-09-25 06:12:49 +0000
3+++ src/main.cpp 2013-02-01 17:19:31 +0000
4@@ -51,8 +51,17 @@
5 setLoggingLevel(value);
6 }
7
8- int daemonTimeout =
9- environment.value(QLatin1String("SSOUI_DAEMON_TIMEOUT")).toInt();
10+ /* default daemonTimeout to 30 */
11+ int daemonTimeout = 30;
12+
13+ /* override daemonTimeout if SSOUI_DAEMON_TIMEOUT is set */
14+ if (environment.contains(QLatin1String("SSOUI_DAEMON_TIMEOUT"))) {
15+ bool isOk;
16+ int value = environment.value(
17+ QLatin1String("SSOUI_DAEMON_TIMEOUT")).toInt(&isOk);
18+ if (isOk)
19+ daemonTimeout = value;
20+ }
21
22 QSettings::setPath(QSettings::NativeFormat, QSettings::SystemScope,
23 QLatin1String("/etc"));

Subscribers

People subscribed via source and target branches

to all changes: