Merge lp://staging/~seb128/unity-control-center/shell-upstream-backports into lp://staging/unity-control-center

Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 12729
Merged at revision: 12734
Proposed branch: lp://staging/~seb128/unity-control-center/shell-upstream-backports
Merge into: lp://staging/unity-control-center
Diff against target: 495 lines (+296/-16)
8 files modified
debian/unity-control-center.install (+1/-0)
shell/Makefile.am (+6/-0)
shell/cc-shell-model.c (+5/-1)
shell/completions/unity-control-center.in (+56/-0)
shell/control-center.c (+8/-2)
shell/gnome-control-center.c (+209/-13)
shell/gnome-control-center.h (+3/-0)
shell/list-panel.sh (+8/-0)
To merge this branch: bzr merge lp://staging/~seb128/unity-control-center/shell-upstream-backports
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Robert Ancell Needs Fixing
PS Jenkins bot (community) continuous-integration Approve
Iain Lane Pending
Review via email: mp+207987@code.staging.launchpad.net

Commit message

shell: backport fixes from gnome-3-8. Those include some tweaks to the
command line options, improvements to the keyboard navigation in the icons
grid, and support for bash completion

Description of the change

shell: backport fixes from gnome-3-8. Those include some tweaks to the
command line options, improvements to the keyboard navigation in the icons
grid, and support for bash completion

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

(completions) In our case we don't have a hardware option.

87 + sound)
88 + command_list="applications effects hardware input outputs"
89 + ;;

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Otherwise looks good

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

> (completions) In our case we don't have a hardware option.
> ...
> Otherwise looks good

Indeed, I've fixed that, approving then

review: Approve
12729. By Sebastien Bacher

our sound panel doesn't have an hardware tab

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