Merge lp:~davidc3/unity-scope-devhelp/glib-bindings-crash into lp:unity-scope-devhelp

[David Callé]

Don't crash Unity bindings when building results.

- Don't crash Unity bindings when building results.
- Add dev, help and doc keywords

Test plan : https://wiki.ubuntu.com/Process/Merges/TestPlan/unity-scope-devhelp

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa? Yes
 * Has your component "TestPlan” been executed successfully on desktop? Yes
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP? N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP? N/A
 * What components might get impacted by your changes? None
 * Have you requested review by the teams of these owning components? N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/unity-scope-devhelp-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-devhelp-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-devhelp-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-devhelp-trusty-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-devhelp-ci/7/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looking good. +1

review: Approve

=== modified file 'data/devhelp.scope.in'
--- data/devhelp.scope.in	2013-07-16 13:02:05 +0000
+++ data/devhelp.scope.in	2014-03-28 08:55:21 +0000
@@ -3,7 +3,7 @@
 DBusPath=/com/canonical/unity/scope/developer/devhelp
 Icon=
 QueryBinary=devhelp
-_Keywords=devhelp;
+_Keywords=devhelp;dev;help;doc;
 RequiredMetadata=
 OptionalMetadata=
 Loader=/usr/share/unity-scopes/devhelp/unity_devhelp_daemon.py
 
=== modified file 'src/unity_devhelp_daemon.py'
--- src/unity_devhelp_daemon.py	2013-04-22 12:43:19 +0000
+++ src/unity_devhelp_daemon.py	2014-03-28 08:55:21 +0000
@@ -205,19 +205,7 @@
                     i['comment'] = ''
                 if not 'dnd_uri' in i or not i['dnd_uri'] or i['dnd_uri'] == '':
                     i['dnd_uri'] = i['uri']
-                i['metadata'] = {}
-                if EXTRA_METADATA:
-                    for e in i:
-                        for m in EXTRA_METADATA:
-                            if m['id'] == e:
-                                i['metadata'][e] = i[e]
-                i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
+                result_set.add_result(**i)
         except Exception as error:
             print(error)