Merge lp://qastaging/~unity-team/unity-scope-home/master-scopes into lp://qastaging/unity-scope-home

Proposed by Paweł Stołowski
Status: Superseded
Proposed branch: lp://qastaging/~unity-team/unity-scope-home/master-scopes
Merge into: lp://qastaging/unity-scope-home
Diff against target: 2543 lines (+1607/-413)
23 files modified
configure.ac (+8/-0)
data/Makefile.am (+11/-1)
data/home.scope.in.in (+3/-6)
data/master-scopes/files.scope.in.in (+12/-0)
data/master-scopes/info.scope.in.in (+12/-0)
data/master-scopes/more_suggestions.scope.in.in (+12/-0)
data/master-scopes/music.scope.in.in (+12/-0)
data/master-scopes/news.scope.in.in (+12/-0)
data/master-scopes/reference.scope.in.in (+12/-0)
data/master-scopes/video.scope.in.in (+12/-0)
debian/control (+1/-1)
src/Makefile.am (+3/-0)
src/category-manager.vala (+297/-26)
src/master-scopes.vala (+219/-0)
src/scope-manager.vala (+6/-0)
src/scope.vala (+355/-325)
src/smart-scopes-default-parser.vala (+76/-0)
src/smart-scopes-interface.vala (+16/-3)
src/smart-scopes-more-suggestions-parser.vala (+168/-0)
src/smart-scopes-parse.vala (+67/-21)
src/smart-scopes-search.vala (+7/-5)
tests/unit/Makefile.am (+3/-0)
tests/unit/test-home-scope.vala (+283/-25)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity-scope-home/master-scopes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+153383@code.qastaging.launchpad.net

Commit message

Create master scopes in home scope. Bumped required libunity version.

Description of the change

Create master scopes in home scope. Bumped required libunity version.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
84. By Paweł Stołowski

Fixed icon setting when creating master scopes.

85. By Paweł Stołowski

Run scope discovery in main loop on startup rather than doing it async. This is to fix race
with exporting the scope on the dbus.

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)
86. By Michal Hruby

Fix scope directory

87. By Michal Hruby

Merge trunk

88. By Michal Hruby

Fix music scope title

89. By Michal Hruby

Fix music scope type

90. By Michal Hruby

Fix missing space

91. By Paweł Stołowski

Improved filter behaviour (still has bugs though).

92. By Michal Hruby

Fix warnings about invalid variants

Unmerged revisions

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: