libunity

Merge lp://qastaging/~macslow/libunity/libunity.fix-841902 into lp://qastaging/libunity

  1. libunity.fix-841902
  2. Merge into trunk
Proposed by Mirco Müller
Status: Rejected
Rejected by: Mikkel Kamstrup Erlandsen
Proposed branch: lp://qastaging/~macslow/libunity/libunity.fix-841902
Merge into: lp://qastaging/libunity
Diff against target: 66 lines (+23/-1)
2 files modified
src/unity-lens-filters.vala (+18/-1)
src/unity-scope-private.vala (+5/-0)
To merge this branch: bzr merge lp://qastaging/~macslow/libunity/libunity.fix-841902
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Michal Hruby (community) Approve
Review via email: mp+88031@code.qastaging.launchpad.net

Description of the change

Superseded by: https://code.launchpad.net/~kamstrup/libunity/libunity.fix-841902/+merge/88924

This is the first branch of the three parts that are needed to fix LP: #841902. It is now using a new derived CheckOptionFilter and new renderer.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Sorry; there's a merge conflict...

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

Merged with trunk again and fixed merge-conflicts.

Revision history for this message
Michal Hruby (mhr3) wrote :

Please move the new enum option to the end, otherwise we'd break ABI.

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

Fixed. Please review.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looking great!

review: Approve
Revision history for this message
Michal Hruby (mhr3) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/31/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/33/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Mirco there is a compilation error in this branch:

  unity-lens-filters.vala:366.13-366.54: error: Property `renderer_name' not found in `Unity.CheckOptionFilterCompact'
            renderer_name:"filter-checkoption-compact", visible:true,

review: Needs Fixing
Revision history for this message
Michal Hruby (mhr3) wrote :

Whoops, yea we turned the renderer-name into an enum (called just "renderer").

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

looks good

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/42/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Fixed the branch and pushed it to https://code.launchpad.net/~kamstrup/libunity/libunity.fix-841902/+merge/88924. Marking this branch superseded.

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