Merge lp:~unity-team/unity-scopes-shell/catch-no-search-hint into lp:unity-scopes-shell

[Michal Hruby]

Don't let the exception from search_hint() kill unity.

Don't let the exception from search_hint() kill unity.

[Albert Astals Cid (aacid)]

Makes sense and fixes the crash i was having.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/163/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/60/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/catch-no-search-hint]

112. By Michal Hruby on 2014-07-31

Merge trunk

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-07-25 15:30:02 +0000
+++ src/Unity/scope.cpp	2014-07-31 11:01:32 +0000
@@ -608,7 +608,16 @@
 
 QString Scope::searchHint() const
 {
-    return QString::fromStdString(m_scopeMetadata ? m_scopeMetadata->search_hint() : "");
+    std::string search_hint;
+    try {
+        if (m_scopeMetadata) {
+            search_hint = m_scopeMetadata->search_hint();
+        }
+    } catch (...) {
+        // throws if the value isn't set, safe to ignore
+    }
+
+    return QString::fromStdString(search_hint);
 }
 
 bool Scope::searchInProgress() const

=== modified file 'tests/data/mock-scope-ttl/mock-scope-ttl.ini.in'
--- tests/data/mock-scope-ttl/mock-scope-ttl.ini.in	2014-05-15 08:21:45 +0000
+++ tests/data/mock-scope-ttl/mock-scope-ttl.ini.in	2014-07-31 11:01:32 +0000
@@ -1,9 +1,6 @@
 [ScopeConfig]
 DisplayName = mock-ttl.DisplayName
 Description = mock-ttl.Description
-Art = /mock-ttl.Art
 Icon = /mock-ttl.Icon
-SearchHint = mock-ttl.SearchHint
-HotKey = mock-ttl.HotKey
 Author = mock-ttl.Author
 ResultsTtlType = Small

=== modified file 'tests/resultstest.cpp'
--- tests/resultstest.cpp	2014-07-18 16:35:52 +0000
+++ tests/resultstest.cpp	2014-07-31 11:01:32 +0000
@@ -189,9 +189,18 @@
         QCOMPARE(headerCustomizations["background"], QVariant("color://black"));
         QCOMPARE(customizations["shape-images"], QVariant(false));
 
+        QCOMPARE(m_scope->isActive(), false);
+        m_scope->setActive(true);
         QCOMPARE(m_scope->isActive(), true);
-        m_scope->setActive(false);
-        QCOMPARE(m_scope->isActive(), false);
+
+        QCOMPARE(m_scope_ttl->id(), QString("mock-scope-ttl"));
+        QCOMPARE(m_scope_ttl->name(), QString("mock-ttl.DisplayName"));
+        QCOMPARE(m_scope_ttl->iconHint(), QString("/mock-ttl.Icon"));
+        QCOMPARE(m_scope_ttl->description(), QString("mock-ttl.Description"));
+        QCOMPARE(m_scope_ttl->searchHint(), QString());
+        QCOMPARE(m_scope_ttl->shortcut(), QString());
+        QCOMPARE(m_scope_ttl->visible(), true);
+        QCOMPARE(m_scope_ttl->searchQuery(), QString());
     }
 
     void testCategoryQuery()