Merge lp://qastaging/~cjcurran/indicator-sound/voip-input-item into lp://qastaging/~indicator-applet-developers/indicator-sound/trunk_3
Proposed by
Conor Curran
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 202 | ||||||||
| Proposed branch: | lp://qastaging/~cjcurran/indicator-sound/voip-input-item | ||||||||
| Merge into: | lp://qastaging/~indicator-applet-developers/indicator-sound/trunk_3 | ||||||||
| Diff against target: |
1537 lines (+1044/-44) 18 files modified
src/Makefile.am (+5/-1) src/active-sink.c (+61/-5) src/active-sink.h (+19/-6) src/common-defs.h (+5/-1) src/indicator-sound.c (+62/-4) src/music-player-bridge.vala (+5/-3) src/mute-menu-item.c (+1/-0) src/player-item.vala (+1/-2) src/pulseaudio-mgr.c (+190/-19) src/pulseaudio-mgr.h (+2/-0) src/settings-manager.vala (+2/-0) src/sound-service-dbus.c (+6/-2) src/sound-service-dbus.h (+2/-1) src/sound-service.c (+2/-0) src/voip-input-menu-item.c (+277/-0) src/voip-input-menu-item.h (+70/-0) src/voip-input-widget.c (+279/-0) src/voip-input-widget.h (+55/-0) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~cjcurran/indicator-sound/voip-input-item | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
- big Voip input menu item feature added
- little keyboard shortcut feature removal
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Don't see anything odd. Looks good.