Merge lp:~mhr3/unity-scopes-shell/fix-1314702 into lp:unity-scopes-shell

[Michal Hruby]

Pass correct locale and form factor to scopes.

Pass correct locale and form factor to scopes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:87
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/96/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-amd64-ci/96
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-armhf-ci/96
        deb: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-i386-ci/96

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/96/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Looks good to me

review: Approve

=== modified file 'src/Unity/previewstack.cpp'
--- src/Unity/previewstack.cpp	2014-03-25 16:34:26 +0000
+++ src/Unity/previewstack.cpp	2014-04-30 17:16:21 +0000
@@ -27,6 +27,7 @@
 #include "utils.h"
 
 // Qt
+#include <QLocale>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
@@ -120,7 +121,8 @@
     try {
         auto proxy = m_previewedResult->target_scope_proxy();
 
-        scopes::ActionMetadata metadata("C", "phone"); //FIXME
+        QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : "phone");
+        scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
         if (!extra_data.is_null()) {
             metadata.set_scope_data(extra_data);
         }
@@ -132,7 +134,6 @@
         if (prev_listener) prev_listener->invalidate();
         m_listeners[m_activePreview] = wl;
 
-        // FIXME: don't block
         m_lastPreviewQuery = proxy->preview(*(m_previewedResult.get()), metadata, listener);
     } catch (std::exception& e) {
         qWarning("Caught an error from preview(): %s", e.what());
@@ -160,7 +161,8 @@
 
     try {
         auto proxy = m_previewedResult->target_scope_proxy();
-        scopes::ActionMetadata metadata("C", "phone"); //FIXME
+        QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : "phone");
+        scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
         metadata.set_scope_data(qVariantToScopeVariant(data));
 
         if (m_lastActivation) {

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-04-08 10:06:42 +0000
+++ src/Unity/scope.cpp	2014-04-30 17:16:21 +0000
@@ -41,6 +41,7 @@
 #include <QScopedPointer>
 #include <QFileInfo>
 #include <QDir>
+#include <QLocale>
 
 #include <libintl.h>
 
@@ -326,7 +327,7 @@
     }
 
     if (m_proxy) {
-        scopes::SearchMetadata meta("C", m_formFactor.toStdString()); //FIXME
+        scopes::SearchMetadata meta(QLocale::system().name().toStdString(), m_formFactor.toStdString());
         if (m_settings) {
             QVariant remoteSearch(m_settings->get("remote-content-search"));
             if (remoteSearch.toString() == QString("none")) {
@@ -510,7 +511,7 @@
         try {
             auto proxy = result->target_scope_proxy();
             // FIXME: don't block
-            unity::scopes::ActionMetadata metadata("C", m_formFactor.toStdString()); //FIXME
+            unity::scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), m_formFactor.toStdString());
             m_lastActivation.reset(new ActivationReceiver(this, result));
             proxy->activate(*(result.get()), metadata, m_lastActivation);
         } catch (std::exception& e) {