Merge lp:~stolowski/unity-scopes-api/fix-user-agent-in-preview-rtm into lp:unity-scopes-api

[Paweł Stołowski]

Unmerged revisions

246. By Paweł Stołowski on 2014-11-04

Cherry picked the fix for invalid arguments to SSS preview query.

245. By Paweł Stołowski on 2014-11-04

Merged trunk.

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-09-25 07:38:01 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-11-04 16:20:13 +0000
@@ -412,8 +412,8 @@
                                                const uint widgets_api_version,
                                                VariantMap const& settings,
                                                std::string const& locale,
-                                               std::string const& user_agent_hdr,
-                                               std::string const& country)
+                                               std::string const& country,
+                                               std::string const& user_agent_hdr)
 {
     std::ostringstream preview_uri;
     preview_uri << base_url << c_preview_resource << "?";