Merge lp:~davidc3/unity-scope-manpages/odd-glib-null-crash into lp:unity-scope-manpages

[David Callé]

- Remove references to provider credits
- Build results properly
- Add "man" keyword

- Remove references to provider credits
- Build results properly
- Add "man" keyword

 * 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? : N/A

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~davidc3/unity-scope-manpages/odd-glib-null-crash]

39. By David Callé on 2014-03-21

Nicer results building

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~davidc3/unity-scope-manpages/odd-glib-null-crash]

40. By David Callé on 2014-03-21

Add man keyword

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/unity-scope-manpages-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-manpages-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-manpages-trusty-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-manpages-trusty-i386-ci/3

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

LGTM.

review: Approve

=== modified file 'data/manpages.scope.in'
--- data/manpages.scope.in	2013-07-08 07:47:25 +0000
+++ data/manpages.scope.in	2014-03-21 10:40:15 +0000
@@ -2,7 +2,7 @@
 DBusName=com.canonical.Unity.Scope.Development.Manpages
 DBusPath=/com/canonical/unity/scope/development/manpages
 Icon=/usr/share/icons/unity-icon-theme/places/svg/service-manpages.svg
-_Keywords=manpages;
+_Keywords=manpages;man;
 RequiredMetadata=
 OptionalMetadata=
 Loader=/usr/share/unity-scopes/manpages/unity_manpages_daemon.py

=== modified file 'src/unity_manpages_daemon.py'
--- src/unity_manpages_daemon.py	2013-05-14 07:36:19 +0000
+++ src/unity_manpages_daemon.py	2014-03-21 10:40:15 +0000
@@ -34,7 +34,6 @@
 
 SEARCH_HINT = _('Search Manpages')
 NO_RESULTS_HINT = _('Sorry, there are no Manpages that match your search.')
-PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
 PROVIDER_ICON = SVG_DIR + 'service-manpages.svg'
 DEFAULT_RESULT_ICON = SVG_DIR + 'service-manpages.svg'
@@ -136,21 +135,9 @@
                     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)
+            print (error)
 
 
 class Scope(Unity.AbstractScope):
@@ -168,8 +155,6 @@
         if EXTRA_METADATA:
             for m in EXTRA_METADATA:
                 schema.add_field(m['id'], m['type'], m['field'])
-        #FIXME should be REQUIRED for credits
-        schema.add_field('provider_credits', 's', Unity.SchemaFieldType.OPTIONAL)
         return schema
 
     def do_get_categories(self):