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

[Ken VanDine]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://s-jenkins:8080/job/signon-ui-ci/13/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=amd64/13/console
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=i386/13/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/13//rebuild/?

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

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

review: Approve

=== modified file 'src/main.cpp'
--- src/main.cpp	2012-09-25 06:12:49 +0000
+++ src/main.cpp	2013-02-01 17:19:31 +0000
@@ -51,8 +51,17 @@
             setLoggingLevel(value);
     }
 
-    int daemonTimeout =
-        environment.value(QLatin1String("SSOUI_DAEMON_TIMEOUT")).toInt();
+    /* default daemonTimeout to 30 */
+    int daemonTimeout = 30;
+
+    /* override daemonTimeout if SSOUI_DAEMON_TIMEOUT is set */
+    if (environment.contains(QLatin1String("SSOUI_DAEMON_TIMEOUT"))) {
+        bool isOk;
+        int value = environment.value(
+            QLatin1String("SSOUI_DAEMON_TIMEOUT")).toInt(&isOk);
+        if (isOk)
+            daemonTimeout = value;
+    }
 
     QSettings::setPath(QSettings::NativeFormat, QSettings::SystemScope,
                        QLatin1String("/etc"));