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

Proposed by David Callé on 2014-03-21
Status: Merged
Approved by: Michal Hruby on 2014-03-24
Approved revision: 40
Merged at revision: 38
Proposed branch: lp:~davidc3/unity-scope-manpages/odd-glib-null-crash
Merge into: lp:unity-scope-manpages
Diff against target: 57 lines (+3/-18)
2 files modified
data/manpages.scope.in (+1/-1)
src/unity_manpages_daemon.py (+2/-17)
To merge this branch: bzr merge lp:~davidc3/unity-scope-manpages/odd-glib-null-crash
Reviewer Review Type Date Requested Status
Michal Hruby (community) 2014-03-21 Approve on 2014-03-24
PS Jenkins bot continuous-integration Approve on 2014-03-21
Review via email: mp+212104@code.launchpad.net

Commit message

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

Description of the change

- 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

To post a comment you must log in.
39. By David Callé on 2014-03-21

Nicer results building

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

Add man keyword

Michal Hruby (mhr3) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/manpages.scope.in'
2--- data/manpages.scope.in 2013-07-08 07:47:25 +0000
3+++ data/manpages.scope.in 2014-03-21 10:40:15 +0000
4@@ -2,7 +2,7 @@
5 DBusName=com.canonical.Unity.Scope.Development.Manpages
6 DBusPath=/com/canonical/unity/scope/development/manpages
7 Icon=/usr/share/icons/unity-icon-theme/places/svg/service-manpages.svg
8-_Keywords=manpages;
9+_Keywords=manpages;man;
10 RequiredMetadata=
11 OptionalMetadata=
12 Loader=/usr/share/unity-scopes/manpages/unity_manpages_daemon.py
13
14=== modified file 'src/unity_manpages_daemon.py'
15--- src/unity_manpages_daemon.py 2013-05-14 07:36:19 +0000
16+++ src/unity_manpages_daemon.py 2014-03-21 10:40:15 +0000
17@@ -34,7 +34,6 @@
18
19 SEARCH_HINT = _('Search Manpages')
20 NO_RESULTS_HINT = _('Sorry, there are no Manpages that match your search.')
21-PROVIDER_CREDITS = _('')
22 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
23 PROVIDER_ICON = SVG_DIR + 'service-manpages.svg'
24 DEFAULT_RESULT_ICON = SVG_DIR + 'service-manpages.svg'
25@@ -136,21 +135,9 @@
26 i['comment'] = ''
27 if not 'dnd_uri' in i or not i['dnd_uri'] or i['dnd_uri'] == '':
28 i['dnd_uri'] = i['uri']
29- i['metadata'] = {}
30- if EXTRA_METADATA:
31- for e in i:
32- for m in EXTRA_METADATA:
33- if m['id'] == e:
34- i['metadata'][e] = i[e]
35- i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
36- result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
37- i['category'], i['result_type'],
38- str(i['mimetype']), str(i['title']),
39- str(i['comment']), str(i['dnd_uri']),
40- i['metadata'])
41- result_set.add_result(result)
42+ result_set.add_result(**i)
43 except Exception as error:
44- print(error)
45+ print (error)
46
47
48 class Scope(Unity.AbstractScope):
49@@ -168,8 +155,6 @@
50 if EXTRA_METADATA:
51 for m in EXTRA_METADATA:
52 schema.add_field(m['id'], m['type'], m['field'])
53- #FIXME should be REQUIRED for credits
54- schema.add_field('provider_credits', 's', Unity.SchemaFieldType.OPTIONAL)
55 return schema
56
57 def do_get_categories(self):

Subscribers

People subscribed via source and target branches

to all changes: