Merge lp://qastaging/~mhr3/unity-scope-home/masters-in-scope-files into lp://qastaging/unity-scope-home

Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 120
Merged at revision: 119
Proposed branch: lp://qastaging/~mhr3/unity-scope-home/masters-in-scope-files
Merge into: lp://qastaging/unity-scope-home
Diff against target: 1001 lines (+452/-321)
23 files modified
configure.ac (+4/-3)
data/master-scopes/books.scope.in.in (+9/-0)
data/master-scopes/boxes.scope.in.in (+4/-0)
data/master-scopes/calendar.scope.in.in (+10/-0)
data/master-scopes/code.scope.in.in (+15/-0)
data/master-scopes/files.scope.in.in (+34/-0)
data/master-scopes/graphics.scope.in.in (+10/-0)
data/master-scopes/help.scope.in.in (+10/-0)
data/master-scopes/info.scope.in.in (+15/-0)
data/master-scopes/more_suggestions.scope.in.in (+5/-0)
data/master-scopes/music.scope.in.in (+33/-0)
data/master-scopes/news.scope.in.in (+15/-0)
data/master-scopes/notes.scope.in.in (+10/-0)
data/master-scopes/photos.scope.in.in (+31/-0)
data/master-scopes/recipes.scope.in.in (+5/-0)
data/master-scopes/reference.scope.in.in (+20/-0)
data/master-scopes/video.scope.in.in (+16/-0)
data/master-scopes/web.scope.in.in (+10/-0)
debian/control (+1/-1)
src/Makefile.am (+1/-0)
src/master-scopes.vala (+68/-316)
src/scope-definitions-parser.vala (+123/-0)
tests/unit/Makefile.am (+3/-1)
To merge this branch: bzr merge lp://qastaging/~mhr3/unity-scope-home/masters-in-scope-files
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+168439@code.qastaging.launchpad.net

Commit message

Remove the static declarations of all Master scopes and use the protocol library to parse everything from the .scope files.

Description of the change

Remove the static declarations of all Master scopes and use the protocol library to parse everything from the .scope files.

To post a comment you must log in.
116. By Michal Hruby

Use fallback icon for categories if not defined

117. By Michal Hruby

Bump libunity version requirement

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
118. By Michal Hruby

Don't hardcode strings if we don't have to

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
119. By Michal Hruby

Update debian control file

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
120. By Michal Hruby

Add gee dep when building unit tests

Revision history for this message
Paweł Stołowski (stolowski) wrote :

As discussed on IRC we'll need to rethink and revist 'global' category handling when we need to redefine them (e.g. for different renderers), but for now it works fine. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: