Unity

Merge lp://qastaging/~gordallott/unity/fix-wrong-gvariant-format into lp://qastaging/unity

  1. fix-wrong-gvariant-format
  2. Merge into trunk
Proposed by Gord Allott
Status: Merged
Approved by: Thomi Richards
Approved revision: no longer in the source branch.
Merged at revision: 2207
Proposed branch: lp://qastaging/~gordallott/unity/fix-wrong-gvariant-format
Merge into: lp://qastaging/unity
Diff against target: 22 lines (+10/-2)
1 file modified
plugins/unityshell/src/unityshell.cpp (+10/-2)
To merge this branch: bzr merge lp://qastaging/~gordallott/unity/fix-wrong-gvariant-format
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Unity Team Pending
Review via email: mp+99976@code.qastaging.launchpad.net

Commit message

Corrects a callback to use the established variant for UBUS_OVERLAY_SHOWN

Description of the change

Quick fix for an issue mhr3 noticed, using the wrong variant type in a callback, no test.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

This used to spit an error to the console and no longer does with this branch, so that's good enough test for me.

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

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/unityshell.cpp

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/569/console reported an error when processing this lp:~gordallott/unity/fix-wrong-gvariant-format branch.
Not merging it.

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/572/console reported an error when processing this lp:~gordallott/unity/fix-wrong-gvariant-format branch.
Not merging it.

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.