Merge lp:~marcustomlinson/unity-scopes-shell/oa_ui_policy into lp:unity-scopes-shell

[Marcus Tomlinson]

Set UNITY_SCOPES_OA_UI_POLICY on entry to Scope::loginToAccount()

[Paweł Stołowski (stolowski)]

+ setenv("UNITY_SCOPES_OA_UI_POLICY", "1", 1);

Could you please add a comment explaining what it does and why?

review: Needs Fixing

[lp:~marcustomlinson/unity-scopes-shell/oa_ui_policy]

176. By Marcus Tomlinson on 2014-12-10

replace = 0

177. By Marcus Tomlinson on 2014-12-10

Added a comment

[Marcus Tomlinson (marcustomlinson)]

> + setenv("UNITY_SCOPES_OA_UI_POLICY", "1", 1);
>
> Could you please add a comment explaining what it does and why?

Done

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-11-19 15:12:52 +0000
+++ src/Unity/scope.cpp	2014-12-10 09:55:06 +0000
@@ -1242,6 +1242,10 @@
 
 bool Scope::loginToAccount(QString const& service_name, QString const& service_type, QString const& provider_name)
 {
+    // Set the UNITY_SCOPES_OA_UI_POLICY environment variable here so that OnlineAccountClient knows we're
+    // calling it from the shell (hence it will use the default UI policy when talking to libsignon).
+    setenv("UNITY_SCOPES_OA_UI_POLICY", "1", 0);
+
     bool service_enabled = false;
     {
         // Check if at least one account has the specified service enabled