Merge lp://staging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox into lp://staging/unity-control-center

Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 12741
Merged at revision: 12742
Proposed branch: lp://staging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox
Merge into: lp://staging/unity-control-center
Diff against target: 79 lines (+14/-5)
1 file modified
panels/sound/gvc-mixer-dialog.c (+14/-5)
To merge this branch: bzr merge lp://staging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209027@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-03-03.

Commit message

Add "Show sound volume in the menu bar" check box

Description of the change

Add "Show sound volume in the menu bar" check box

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks!

Small question, "Rename indicator_settings to sound_settings" ... should you clean out "GSettings *indicator_settings;"?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:12741
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~larsu/unity-control-center/add-sound-indicator-visible-checkbox/+merge/209027/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/60/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

> Small question, "Rename indicator_settings to sound_settings" ... should you
> clean out "GSettings *indicator_settings;"?

I do, don't I? It's not an added line in this diff because it shows the two commits together, but you can see it in the context:

66 g_clear_object (&dialog->priv->indicator_settings);

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

Yeah, sorry, monday morning, I didn't properly read the changes ... looks good to me ;-)

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Luke made some a11y fixes, which landed while that merge was up for review, could you rebase on current trunk and resolve the conflict?

review: Needs Fixing
12742. By Lars Karlitski

Merge trunk

Revision history for this message
Lars Karlitski (larsu) wrote :

> Luke made some a11y fixes, which landed while that merge was up for review,
> could you rebase on current trunk and resolve the conflict?

Of course. Merged trunk in r12742.

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