Merge lp:~paulliu/unity-scope-click/fix-error into lp:unity-scope-click

[Ying-Chun Liu]

Fix GVariant critical errors. (LP: 1234833)

Due to price=null causes the GLib critical errors, we fix it by not hint the price if it is null.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/95

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/101/rebuild

review: Approve (continuous-integration)

[lp:~paulliu/unity-scope-click/fix-error]

74. By Ying-Chun Liu on 2013-10-16

warning if id or title is null

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/96

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/102/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-14 16:14:33 +0000
+++ src/click-scope.vala	2013-10-16 13:44:41 +0000
@@ -352,9 +352,15 @@
     var dnd_uri = uri;
     var mimetype = "application/x-desktop";
     var metadata = new HashTable<string, Variant> (str_hash, str_equal);
+    if (app.app_id == null || app.title == null) {
+        warning ("app.app_id or app.title is null");
+        return;
+    }
     metadata.insert(METADATA_APP_ID, new GLib.Variant.string(app.app_id));
     metadata.insert(METADATA_TITLE, new GLib.Variant.string(app.title));
-    metadata.insert(METADATA_PRICE, new GLib.Variant.string(app.price));
+    if (app.price != null) {
+        metadata.insert(METADATA_PRICE, new GLib.Variant.string(app.price));
+    }
 
     var result = Unity.ScopeResult.create(uri, app.icon_url, category, Unity.ResultType.DEFAULT, mimetype, app.title, comment, dnd_uri, metadata);