Merge lp://staging/~bbboson/ubuntu/utopic/unity-control-center/fix-for-1236612 into lp://staging/ubuntu/utopic/unity-control-center
Proposed by
Madper Xie
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~bbboson/ubuntu/utopic/unity-control-center/fix-for-1236612 |
| Merge into: | lp://staging/ubuntu/utopic/unity-control-center |
| Diff against target: |
842764 lines (+839305/-0) (has conflicts) 648 files modified
.bzr-builddeb/default.conf (+2/-0) AUTHORS (+1/-0) COPYING (+340/-0) ChangeLog (+2/-0) MAINTAINERS (+19/-0) Makefile.am (+49/-0) NEWS (+7371/-0) README (+53/-0) TODO (+105/-0) autogen.sh (+27/-0) configure.ac (+517/-0) debian/changelog (+363/-0) debian/compat (+1/-0) debian/control (+143/-0) debian/copyright (+26/-0) debian/libunity-control-center-dev.install (+3/-0) debian/libunity-control-center1.install (+1/-0) debian/libunity-control-center1.symbols (+31/-0) debian/rules (+23/-0) debian/source/format (+1/-0) debian/source_unity-control-center.py (+32/-0) debian/ucc-unity-launcher.py (+24/-0) debian/unity-control-center-dev.install (+1/-0) debian/unity-control-center.install (+12/-0) debian/unity-control-center.migrations (+1/-0) git.mk (+199/-0) m4/empty (+1/-0) man/Makefile.am (+19/-0) man/unity-control-center.xml (+308/-0) panels/Makefile.am (+33/-0) panels/appearance/Makefile.am (+91/-0) panels/appearance/appearance.ui (+1075/-0) panels/appearance/background-module.c (+40/-0) panels/appearance/bg-colors-source.c (+133/-0) panels/appearance/bg-colors-source.h (+71/-0) panels/appearance/bg-flickr-source.c (+168/-0) panels/appearance/bg-flickr-source.h (+74/-0) panels/appearance/bg-pictures-source.c (+590/-0) panels/appearance/bg-pictures-source.h (+86/-0) panels/appearance/bg-source.c (+129/-0) panels/appearance/bg-source.h (+75/-0) panels/appearance/bg-wallpapers-source.c (+201/-0) panels/appearance/bg-wallpapers-source.h (+76/-0) panels/appearance/cc-appearance-item.c (+951/-0) panels/appearance/cc-appearance-item.h (+103/-0) panels/appearance/cc-appearance-panel.c (+2099/-0) panels/appearance/cc-appearance-panel.h (+73/-0) panels/appearance/cc-appearance-xml.c (+672/-0) panels/appearance/cc-appearance-xml.h (+69/-0) panels/appearance/ucc-slideshow-emblem.svg (+104/-0) panels/appearance/ucc-slideshow-symbolic.svg (+70/-0) panels/appearance/unity-appearance-panel.desktop.in.in (+13/-0) panels/bluetooth/Makefile.am (+40/-0) panels/bluetooth/bluetooth.gresource.xml (+6/-0) panels/bluetooth/bluetooth.ui (+736/-0) panels/bluetooth/cc-bluetooth-panel.c (+946/-0) panels/bluetooth/cc-bluetooth-panel.h (+59/-0) panels/bluetooth/unity-bluetooth-panel.desktop.in.in (+11/-0) panels/color/Makefile.am (+36/-0) panels/color/cc-color-panel.c (+2694/-0) panels/color/cc-color-panel.h (+74/-0) panels/color/color-module.c (+42/-0) panels/color/color.ui (+630/-0) panels/color/icons/16x16/Makefile.am (+13/-0) panels/color/icons/22x22/Makefile.am (+13/-0) panels/color/icons/24x24/Makefile.am (+13/-0) panels/color/icons/256x256/Makefile.am (+13/-0) panels/color/icons/32x32/Makefile.am (+13/-0) panels/color/icons/48x48/Makefile.am (+13/-0) panels/color/icons/64x64/Makefile.am (+13/-0) panels/color/icons/Makefile.am (+20/-0) panels/color/icons/render-icons.py (+149/-0) panels/color/icons/scalable/Makefile.am (+13/-0) panels/color/icons/scalable/unity-color-panel.svg (+728/-0) panels/color/icons/src/unity-color-panel.svg (+1154/-0) panels/color/unity-color-panel.desktop.in.in (+13/-0) panels/common/Makefile.am (+45/-0) panels/common/cc-common-language.c (+707/-0) panels/common/cc-common-language.h (+59/-0) panels/common/cc-language-chooser.c (+344/-0) panels/common/cc-language-chooser.h (+38/-0) panels/common/gdm-languages.c (+1351/-0) panels/common/gdm-languages.h (+44/-0) panels/common/language-chooser.ui (+114/-0) panels/common/list-languages.c (+43/-0) panels/common/locarchive.h (+97/-0) panels/common/unity-control-center.rules (+8/-0) panels/datetime/Makefile.am (+58/-0) panels/datetime/com.canonical.controlcenter.datetime.policy.in (+21/-0) panels/datetime/datetime-dialog.ui (+864/-0) panels/datetime/datetime-prefs-locations.c (+681/-0) panels/datetime/datetime-prefs-locations.h (+35/-0) panels/datetime/datetime-prefs.c (+859/-0) panels/datetime/icons/scalable/unity-datetime-panel.svg (+861/-0) panels/datetime/settings-shared.h (+50/-0) panels/datetime/unity-datetime-panel.desktop.in.in (+12/-0) panels/datetime/utils.c (+468/-0) panels/datetime/utils.h (+66/-0) panels/display/Makefile.am (+71/-0) panels/display/TODO (+837/-0) panels/display/cc-display-panel.c (+3293/-0) panels/display/cc-display-panel.h (+74/-0) panels/display/cc-rr-labeler.c (+601/-0) panels/display/cc-rr-labeler.h (+64/-0) panels/display/display-capplet.ui (+566/-0) panels/display/display-module.c (+41/-0) panels/display/foo-marshal.list (+6/-0) panels/display/icons/24x24/unity-display-panel.svg (+55/-0) panels/display/icons/48x48/unity-display-panel.svg (+70/-0) panels/display/scrollarea.c (+1573/-0) panels/display/scrollarea.h (+127/-0) panels/display/unity-display-panel.desktop.in.in (+13/-0) panels/info/GnomeLogoVerticalMedium.svg (+134/-0) panels/info/Makefile.am (+70/-0) panels/info/cc-info-panel.c (+1949/-0) panels/info/cc-info-panel.h (+73/-0) panels/info/gsd-disk-space-helper.c (+124/-0) panels/info/gsd-disk-space-helper.h (+39/-0) panels/info/hostname-helper.c (+173/-0) panels/info/hostname-helper.h (+21/-0) panels/info/hostnames-test.txt (+11/-0) panels/info/info-module.c (+41/-0) panels/info/info.ui (+1162/-0) panels/info/logo-generator.vala (+47/-0) panels/info/searchingthedashlegalnotice.html (+1/-0) panels/info/test-hostname.c (+79/-0) panels/info/unity-info-panel.desktop.in.in (+15/-0) panels/keyboard/00-multimedia.xml.in (+25/-0) panels/keyboard/01-input-sources.xml.in (+12/-0) panels/keyboard/01-launchers.xml.in (+19/-0) panels/keyboard/01-screenshot.xml.in (+23/-0) panels/keyboard/01-system.xml.in (+9/-0) panels/keyboard/50-accessibility.xml.in (+20/-0) panels/keyboard/Makefile.am (+63/-0) panels/keyboard/cc-keyboard-item.c (+493/-0) panels/keyboard/cc-keyboard-item.h (+108/-0) panels/keyboard/cc-keyboard-option.c (+449/-0) panels/keyboard/cc-keyboard-option.h (+48/-0) panels/keyboard/cc-keyboard-panel.c (+211/-0) panels/keyboard/cc-keyboard-panel.h (+74/-0) panels/keyboard/gnome-keyboard-panel.h (+9/-0) panels/keyboard/gnome-keyboard-panel.ui (+897/-0) panels/keyboard/keyboard-general.c (+128/-0) panels/keyboard/keyboard-general.h (+26/-0) panels/keyboard/keyboard-module.c (+41/-0) panels/keyboard/keyboard-shortcuts.c (+1899/-0) panels/keyboard/keyboard-shortcuts.h (+27/-0) panels/keyboard/unity-keybindings.pc.in (+10/-0) panels/keyboard/unity-keyboard-panel.desktop.in.in (+13/-0) panels/keyboard/wm-common.c (+184/-0) panels/keyboard/wm-common.h (+17/-0) panels/mouse/Makefile.am (+62/-0) panels/mouse/cc-mouse-panel.c (+234/-0) panels/mouse/cc-mouse-panel.h (+74/-0) panels/mouse/gnome-mouse-properties.c (+309/-0) panels/mouse/gnome-mouse-properties.h (+30/-0) panels/mouse/gnome-mouse-properties.ui (+769/-0) panels/mouse/gnome-mouse-test.c (+371/-0) panels/mouse/gnome-mouse-test.h (+27/-0) panels/mouse/gnome-mouse-test.ui (+103/-0) panels/mouse/gsd-input-helper.c (+532/-0) panels/mouse/gsd-input-helper.h (+83/-0) panels/mouse/mouse-module.c (+41/-0) panels/mouse/scroll-test-gegl.svg (+1781/-0) panels/mouse/scroll-test.svg (+1960/-0) panels/mouse/test-gnome-mouse-test.c (+44/-0) panels/mouse/unity-mouse-panel.desktop.in.in (+13/-0) panels/network/Makefile.am (+73/-0) panels/network/cc-network-panel.c (+1225/-0) panels/network/cc-network-panel.h (+72/-0) panels/network/net-device-mobile.c (+572/-0) panels/network/net-device-mobile.h (+59/-0) panels/network/net-device-wifi.c (+2191/-0) panels/network/net-device-wifi.h (+58/-0) panels/network/net-device-wired.c (+259/-0) panels/network/net-device-wired.h (+58/-0) panels/network/net-device.c (+379/-0) panels/network/net-device.h (+62/-0) panels/network/net-object.c (+353/-0) panels/network/net-object.h (+94/-0) panels/network/net-proxy.c (+543/-0) panels/network/net-proxy.h (+59/-0) panels/network/net-vpn.c (+518/-0) panels/network/net-vpn.h (+61/-0) panels/network/network-dialogs.c (+550/-0) panels/network/network-dialogs.h (+43/-0) panels/network/network-mobile.ui (+378/-0) panels/network/network-module.c (+41/-0) panels/network/network-proxy.ui (+442/-0) panels/network/network-vpn.ui (+336/-0) panels/network/network-wifi.ui (+1087/-0) panels/network/network-wired.ui (+332/-0) panels/network/network.ui (+355/-0) panels/network/panel-cell-renderer-mode.c (+144/-0) panels/network/panel-cell-renderer-mode.h (+61/-0) panels/network/panel-cell-renderer-pixbuf.c (+82/-0) panels/network/panel-cell-renderer-pixbuf.h (+61/-0) panels/network/panel-cell-renderer-security.c (+153/-0) panels/network/panel-cell-renderer-security.h (+69/-0) panels/network/panel-cell-renderer-separator.c (+130/-0) panels/network/panel-cell-renderer-separator.h (+62/-0) panels/network/panel-cell-renderer-signal.c (+161/-0) panels/network/panel-cell-renderer-signal.h (+61/-0) panels/network/panel-cell-renderer-text.c (+82/-0) panels/network/panel-cell-renderer-text.h (+61/-0) panels/network/panel-common.c (+699/-0) panels/network/panel-common.h (+53/-0) panels/network/rfkill-glib.c (+299/-0) panels/network/rfkill-glib.h (+65/-0) panels/network/rfkill.h (+107/-0) panels/network/unity-network-panel.desktop.in.in (+13/-0) panels/power/Makefile.am (+36/-0) panels/power/cc-power-panel.c (+1162/-0) panels/power/cc-power-panel.h (+73/-0) panels/power/icons/24x24/Makefile.am (+14/-0) panels/power/icons/24x24/unity-power-panel.svg (+373/-0) panels/power/icons/48x48/Makefile.am (+14/-0) panels/power/icons/48x48/unity-power-panel.svg (+111/-0) panels/power/icons/Makefile.am (+22/-0) panels/power/power-module.c (+41/-0) panels/power/power.ui (+501/-0) panels/power/unity-power-panel.desktop.in.in (+13/-0) panels/printers/Makefile.am (+61/-0) panels/printers/cc-printers-panel.c (+3015/-0) panels/printers/cc-printers-panel.h (+72/-0) panels/printers/jobs-dialog.ui (+183/-0) panels/printers/new-printer-dialog.ui (+230/-0) panels/printers/options-dialog.ui (+182/-0) panels/printers/pp-cups.c (+125/-0) panels/printers/pp-cups.h (+71/-0) panels/printers/pp-host.c (+459/-0) panels/printers/pp-host.h (+82/-0) panels/printers/pp-ipp-option-widget.c (+605/-0) panels/printers/pp-ipp-option-widget.h (+70/-0) panels/printers/pp-jobs-dialog.c (+541/-0) panels/printers/pp-jobs-dialog.h (+41/-0) panels/printers/pp-maintenance-command.c (+329/-0) panels/printers/pp-maintenance-command.h (+69/-0) panels/printers/pp-new-printer-dialog.c (+1522/-0) panels/printers/pp-new-printer-dialog.h (+64/-0) panels/printers/pp-new-printer.c (+1442/-0) panels/printers/pp-new-printer.h (+66/-0) panels/printers/pp-options-dialog.c (+986/-0) panels/printers/pp-options-dialog.h (+41/-0) panels/printers/pp-ppd-option-widget.c (+626/-0) panels/printers/pp-ppd-option-widget.h (+63/-0) panels/printers/pp-ppd-selection-dialog.c (+444/-0) panels/printers/pp-ppd-selection-dialog.h (+44/-0) panels/printers/pp-utils.c (+3960/-0) panels/printers/pp-utils.h (+298/-0) panels/printers/ppd-selection-dialog.ui (+206/-0) panels/printers/printers-module.c (+39/-0) panels/printers/printers.ui (+619/-0) panels/printers/unity-printers-panel.desktop.in.in (+14/-0) panels/region/.indent.pro (+2/-0) panels/region/Makefile.am (+60/-0) panels/region/cc-region-keyboard-item.c (+493/-0) panels/region/cc-region-keyboard-item.h (+108/-0) panels/region/cc-region-panel.c (+213/-0) panels/region/cc-region-panel.h (+74/-0) panels/region/gnome-region-panel-formats.c (+423/-0) panels/region/gnome-region-panel-formats.h (+31/-0) panels/region/gnome-region-panel-input-chooser.ui (+157/-0) panels/region/gnome-region-panel-input.c (+1911/-0) panels/region/gnome-region-panel-input.h (+36/-0) panels/region/gnome-region-panel-lang.c (+243/-0) panels/region/gnome-region-panel-lang.h (+32/-0) panels/region/gnome-region-panel-system.c (+588/-0) panels/region/gnome-region-panel-system.h (+34/-0) panels/region/gnome-region-panel.ui (+1432/-0) panels/region/gtkentryaccel.c (+653/-0) panels/region/gtkentryaccel.h (+54/-0) panels/region/keyboard-shortcuts.c (+861/-0) panels/region/keyboard-shortcuts.h (+37/-0) panels/region/region-module.c (+41/-0) panels/region/unity-region-panel.desktop.in.in (+13/-0) panels/region/unity-region-panel.ui (+649/-0) panels/region/wm-common.c (+184/-0) panels/region/wm-common.h (+17/-0) panels/screen/Makefile.am (+33/-0) panels/screen/cc-screen-panel.c (+573/-0) panels/screen/cc-screen-panel.h (+73/-0) panels/screen/screen-module.c (+41/-0) panels/screen/screen.ui (+439/-0) panels/screen/unity-screen-panel.desktop.in.in (+13/-0) panels/sound/Makefile.am (+93/-0) panels/sound/cc-sound-panel.c (+141/-0) panels/sound/cc-sound-panel.h (+60/-0) panels/sound/data/Makefile.am (+42/-0) panels/sound/data/icons/16x16/Makefile.am (+4/-0) panels/sound/data/icons/16x16/apps/Makefile.am (+18/-0) panels/sound/data/icons/16x16/devices/Makefile.am (+18/-0) panels/sound/data/icons/16x16/devices/audio-headset.svg (+916/-0) panels/sound/data/icons/16x16/status/Makefile.am (+21/-0) panels/sound/data/icons/22x22/Makefile.am (+4/-0) panels/sound/data/icons/22x22/apps/Makefile.am (+18/-0) panels/sound/data/icons/22x22/status/Makefile.am (+21/-0) panels/sound/data/icons/24x24/Makefile.am (+4/-0) panels/sound/data/icons/24x24/apps/Makefile.am (+18/-0) panels/sound/data/icons/24x24/devices/Makefile.am (+18/-0) panels/sound/data/icons/24x24/devices/audio-headset.svg (+776/-0) panels/sound/data/icons/24x24/status/Makefile.am (+21/-0) panels/sound/data/icons/32x32/Makefile.am (+4/-0) panels/sound/data/icons/32x32/apps/Makefile.am (+18/-0) panels/sound/data/icons/32x32/devices/Makefile.am (+18/-0) panels/sound/data/icons/32x32/devices/audio-headset.svg (+964/-0) panels/sound/data/icons/32x32/status/Makefile.am (+21/-0) panels/sound/data/icons/48x48/Makefile.am (+4/-0) panels/sound/data/icons/48x48/apps/Makefile.am (+18/-0) panels/sound/data/icons/48x48/devices/Makefile.am (+18/-0) panels/sound/data/icons/48x48/devices/audio-headset.svg (+730/-0) panels/sound/data/icons/Makefile.am (+12/-0) panels/sound/data/icons/render-icon-theme.py (+169/-0) panels/sound/data/icons/scalable/Makefile.am (+4/-0) panels/sound/data/icons/scalable/devices/Makefile.am (+35/-0) panels/sound/data/icons/scalable/devices/audio-speaker-center-back-testing.svg (+539/-0) panels/sound/data/icons/scalable/devices/audio-speaker-center-back.svg (+506/-0) panels/sound/data/icons/scalable/devices/audio-speaker-center-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-center.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left-back-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left-back.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left-side-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left-side.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-left.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right-back-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right-back.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right-side-testing.svg (+537/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right-side.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right-testing.svg (+913/-0) panels/sound/data/icons/scalable/devices/audio-speaker-right.svg (+504/-0) panels/sound/data/icons/scalable/devices/audio-speaker-testing.svg (+913/-0) panels/sound/data/icons/scalable/devices/audio-subwoofer-testing.svg (+240/-0) panels/sound/data/icons/scalable/devices/audio-subwoofer.svg (+325/-0) panels/sound/data/icons/src/microphone-levels.svg (+11448/-0) panels/sound/data/symbolic-icons/Makefile.am (+10/-0) panels/sound/data/symbolic-icons/r.rb (+73/-0) panels/sound/data/symbolic-icons/scalable/Makefile.am (+3/-0) panels/sound/data/symbolic-icons/scalable/status/Makefile.am (+14/-0) panels/sound/data/symbolic-icons/scalable/status/audio-input-microphone-high-symbolic.svg (+37/-0) panels/sound/data/symbolic-icons/scalable/status/audio-input-microphone-low-symbolic.svg (+37/-0) panels/sound/data/symbolic-icons/scalable/status/audio-input-microphone-medium-symbolic.svg (+37/-0) panels/sound/data/symbolic-icons/scalable/status/audio-input-microphone-muted-symbolic.svg (+37/-0) panels/sound/data/symbolic-icons/src/gnome-media.svg (+990/-0) panels/sound/data/unity-sound-panel.desktop.in.in (+13/-0) panels/sound/gvc-balance-bar.c (+577/-0) panels/sound/gvc-balance-bar.h (+70/-0) panels/sound/gvc-channel-bar.c (+999/-0) panels/sound/gvc-channel-bar.h (+92/-0) panels/sound/gvc-channel-map-private.h (+39/-0) panels/sound/gvc-channel-map.c (+254/-0) panels/sound/gvc-channel-map.h (+73/-0) panels/sound/gvc-combo-box.c (+399/-0) panels/sound/gvc-combo-box.h (+67/-0) panels/sound/gvc-level-bar.c (+779/-0) panels/sound/gvc-level-bar.h (+75/-0) panels/sound/gvc-mixer-card-private.h (+35/-0) panels/sound/gvc-mixer-card.c (+570/-0) panels/sound/gvc-mixer-card.h (+101/-0) panels/sound/gvc-mixer-control-private.h (+35/-0) panels/sound/gvc-mixer-control.c (+3358/-0) panels/sound/gvc-mixer-control.h (+136/-0) panels/sound/gvc-mixer-dialog.c (+2285/-0) panels/sound/gvc-mixer-dialog.h (+56/-0) panels/sound/gvc-mixer-event-role.c (+235/-0) panels/sound/gvc-mixer-event-role.h (+57/-0) panels/sound/gvc-mixer-sink-input.c (+166/-0) panels/sound/gvc-mixer-sink-input.h (+57/-0) panels/sound/gvc-mixer-sink.c (+196/-0) panels/sound/gvc-mixer-sink.h (+57/-0) panels/sound/gvc-mixer-source-output.c (+121/-0) panels/sound/gvc-mixer-source-output.h (+57/-0) panels/sound/gvc-mixer-source.c (+196/-0) panels/sound/gvc-mixer-source.h (+57/-0) panels/sound/gvc-mixer-stream-private.h (+34/-0) panels/sound/gvc-mixer-stream.c (+1006/-0) panels/sound/gvc-mixer-stream.h (+131/-0) panels/sound/gvc-mixer-ui-device.c (+663/-0) panels/sound/gvc-mixer-ui-device.h (+82/-0) panels/sound/gvc-pulseaudio-fake.h (+34/-0) panels/sound/gvc-sound-theme-chooser.c (+834/-0) panels/sound/gvc-sound-theme-chooser.h (+54/-0) panels/sound/gvc-speaker-test.c (+478/-0) panels/sound/gvc-speaker-test.h (+57/-0) panels/sound/sound-theme-file-utils.c (+305/-0) panels/sound/sound-theme-file-utils.h (+37/-0) panels/universal-access/Makefile.am (+39/-0) panels/universal-access/cc-marshal.c (+41/-0) panels/universal-access/cc-marshal.h (+15/-0) panels/universal-access/cc-ua-panel.c (+749/-0) panels/universal-access/cc-ua-panel.h (+75/-0) panels/universal-access/uap.ui (+2577/-0) panels/universal-access/unity-universal-access-panel.desktop.in.in (+13/-0) panels/universal-access/universal-access-module.c (+42/-0) panels/universal-access/zoom-options.c (+649/-0) panels/universal-access/zoom-options.h (+75/-0) panels/universal-access/zoom-options.ui (+1225/-0) panels/user-accounts/Makefile.am (+128/-0) panels/user-accounts/com.canonical.controlcenter.user-accounts.policy.in (+21/-0) panels/user-accounts/data/Makefile.am (+18/-0) panels/user-accounts/data/account-dialog.ui (+607/-0) panels/user-accounts/data/account-fingerprint.ui (+278/-0) panels/user-accounts/data/history-dialog.ui (+175/-0) panels/user-accounts/data/icons/left-index-finger.svg (+177/-0) panels/user-accounts/data/icons/left-little-finger.svg (+180/-0) panels/user-accounts/data/icons/left-middle-finger.svg (+180/-0) panels/user-accounts/data/icons/left-ring-finger.svg (+180/-0) panels/user-accounts/data/icons/left-thumb.svg (+180/-0) panels/user-accounts/data/icons/print_error.svg (+525/-0) panels/user-accounts/data/icons/print_ok.svg (+310/-0) panels/user-accounts/data/icons/right-index-finger.svg (+179/-0) panels/user-accounts/data/icons/right-little-finger.svg (+182/-0) panels/user-accounts/data/icons/right-middle-finger.svg (+182/-0) panels/user-accounts/data/icons/right-ring-finger.svg (+182/-0) panels/user-accounts/data/icons/right-thumb.svg (+182/-0) panels/user-accounts/data/org.freedesktop.realmd.xml (+666/-0) panels/user-accounts/data/password-dialog.ui (+529/-0) panels/user-accounts/data/photo-dialog.ui (+305/-0) panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in (+13/-0) panels/user-accounts/data/user-accounts-dialog.ui (+568/-0) panels/user-accounts/fingerprint-strings.h (+111/-0) panels/user-accounts/frob-account-dialog.c (+61/-0) panels/user-accounts/pw-utils.c (+127/-0) panels/user-accounts/pw-utils.h (+31/-0) panels/user-accounts/run-passwd.c (+770/-0) panels/user-accounts/run-passwd.h (+58/-0) panels/user-accounts/um-account-dialog.c (+1281/-0) panels/user-accounts/um-account-dialog.h (+49/-0) panels/user-accounts/um-account-type.c (+41/-0) panels/user-accounts/um-account-type.h (+36/-0) panels/user-accounts/um-crop-area.c (+818/-0) panels/user-accounts/um-crop-area.h (+65/-0) panels/user-accounts/um-editable-button.c (+429/-0) panels/user-accounts/um-editable-button.h (+73/-0) panels/user-accounts/um-editable-combo.c (+464/-0) panels/user-accounts/um-editable-combo.h (+77/-0) panels/user-accounts/um-fingerprint-dialog.c (+774/-0) panels/user-accounts/um-fingerprint-dialog.h (+28/-0) panels/user-accounts/um-history-dialog.c (+387/-0) panels/user-accounts/um-history-dialog.h (+41/-0) panels/user-accounts/um-password-dialog.c (+826/-0) panels/user-accounts/um-password-dialog.h (+43/-0) panels/user-accounts/um-photo-dialog.c (+716/-0) panels/user-accounts/um-photo-dialog.h (+39/-0) panels/user-accounts/um-realm-manager.c (+904/-0) panels/user-accounts/um-realm-manager.h (+107/-0) panels/user-accounts/um-user-module.c (+48/-0) panels/user-accounts/um-user-panel.c (+1569/-0) panels/user-accounts/um-user-panel.h (+57/-0) panels/user-accounts/um-utils.c (+1102/-0) panels/user-accounts/um-utils.h (+90/-0) panels/user-accounts/user-accounts.gresource.xml (+23/-0) panels/wacom/Makefile.am (+89/-0) panels/wacom/button-mapping.ui (+155/-0) panels/wacom/calibrator/COPYING (+27/-0) panels/wacom/calibrator/Makefile.am (+34/-0) panels/wacom/calibrator/calibrator.c (+175/-0) panels/wacom/calibrator/calibrator.h (+101/-0) panels/wacom/calibrator/gui_gtk.c (+579/-0) panels/wacom/calibrator/gui_gtk.h (+56/-0) panels/wacom/calibrator/main.c (+418/-0) panels/wacom/cc-wacom-mapping-panel.c (+366/-0) panels/wacom/cc-wacom-mapping-panel.h (+77/-0) panels/wacom/cc-wacom-nav-button.c (+263/-0) panels/wacom/cc-wacom-nav-button.h (+73/-0) panels/wacom/cc-wacom-page.c (+1411/-0) panels/wacom/cc-wacom-page.h (+88/-0) panels/wacom/cc-wacom-panel.c (+406/-0) panels/wacom/cc-wacom-panel.h (+77/-0) panels/wacom/cc-wacom-stylus-page.c (+507/-0) panels/wacom/cc-wacom-stylus-page.h (+81/-0) panels/wacom/gnome-wacom-properties.ui (+407/-0) panels/wacom/gsd-enums.h (+7/-0) panels/wacom/gsd-input-helper.c (+565/-0) panels/wacom/gsd-input-helper.h (+86/-0) panels/wacom/gsd-wacom-device.c (+2185/-0) panels/wacom/gsd-wacom-device.h (+202/-0) panels/wacom/test-wacom.c (+103/-0) panels/wacom/unity-wacom-panel.desktop.in.in (+13/-0) panels/wacom/wacom-module.c (+41/-0) panels/wacom/wacom-stylus-airbrush.svg (+94/-0) panels/wacom/wacom-stylus-art-pen.svg (+127/-0) panels/wacom/wacom-stylus-classic.svg (+103/-0) panels/wacom/wacom-stylus-inking.svg (+87/-0) panels/wacom/wacom-stylus-page.ui (+351/-0) panels/wacom/wacom-stylus.svg (+124/-0) panels/wacom/wacom-tablet-cintiq.svg (+83/-0) panels/wacom/wacom-tablet-pc.svg (+77/-0) panels/wacom/wacom-tablet.svg (+81/-0) panels/wacom/wacom.gresource.xml (+16/-0) po/LINGUAS (+124/-0) po/POTFILES.in (+138/-0) po/POTFILES.skip (+23/-0) po/README.translators (+10/-0) po/af.po (+5387/-0) po/am.po (+5131/-0) po/ar.po (+5464/-0) po/as.po (+5454/-0) po/ast.po (+5466/-0) po/az.po (+5129/-0) po/be.po (+5478/-0) po/be@latin.po (+5153/-0) po/bg.po (+5503/-0) po/bn.po (+5441/-0) po/bn_IN.po (+7256/-0) po/bo.po (+5321/-0) po/br.po (+5234/-0) po/bs.po (+5469/-0) po/ca.po (+5471/-0) po/ca@valencia.po (+5470/-0) po/ckb.po (+5124/-0) po/crh.po (+5949/-0) po/cs.po (+5490/-0) po/csb.po (+5125/-0) po/cy.po (+5145/-0) po/da.po (+5508/-0) po/de.po (+5526/-0) po/dv.po (+5140/-0) po/dz.po (+5139/-0) po/el.po (+5534/-0) po/en.po (+5124/-0) po/en@shaw.po (+5142/-0) po/en_AU.po (+5444/-0) po/en_CA.po (+5305/-0) po/en_GB.po (+5447/-0) po/eo.po (+5398/-0) po/es.po (+5485/-0) po/et.po (+5470/-0) po/eu.po (+5463/-0) po/fa.po (+5458/-0) po/fi.po (+5481/-0) po/fo.po (+5190/-0) po/fr.po (+5520/-0) po/frp.po (+5149/-0) po/fy.po (+5315/-0) po/ga.po (+5287/-0) po/gd.po (+5528/-0) po/gl.po (+5472/-0) po/gu.po (+5473/-0) po/gv.po (+5125/-0) po/he.po (+5424/-0) po/hi.po (+5523/-0) po/hr.po (+5406/-0) po/hu.po (+5471/-0) po/hy.po (+5154/-0) po/id.po (+5448/-0) po/is.po (+5176/-0) po/it.po (+5548/-0) po/ja.po (+5486/-0) po/jv.po (+5124/-0) po/ka.po (+5182/-0) po/kab.po (+5124/-0) po/kk.po (+5210/-0) po/km.po (+5407/-0) po/kn.po (+5475/-0) po/ko.po (+5454/-0) po/ku.po (+5199/-0) po/ky.po (+5337/-0) po/lb.po (+5219/-0) po/lo.po (+5124/-0) po/lt.po (+5486/-0) po/lv.po (+5500/-0) po/mai.po (+5134/-0) po/mg.po (+5132/-0) po/mhr.po (+5130/-0) po/mi.po (+5166/-0) po/mk.po (+5421/-0) po/ml.po (+5443/-0) po/mn.po (+5132/-0) po/mr.po (+5431/-0) po/ms.po (+5454/-0) po/my.po (+5300/-0) po/nb.po (+5453/-0) po/nds.po (+5131/-0) po/ne.po (+5136/-0) po/nl.po (+5527/-0) po/nn.po (+5388/-0) po/no.po (+5126/-0) po/nso.po (+5128/-0) po/oc.po (+5470/-0) po/or.po (+5437/-0) po/pa.po (+5446/-0) po/pl.po (+5496/-0) po/ps.po (+5124/-0) po/pt.po (+5461/-0) po/pt_BR.po (+5497/-0) po/qu.po (+5124/-0) po/ro.po (+5443/-0) po/ru.po (+5497/-0) po/rw.po (+5155/-0) po/sd.po (+5330/-0) po/se.po (+5192/-0) po/shn.po (+5124/-0) po/si.po (+5248/-0) po/sk.po (+5562/-0) po/sl.po (+5486/-0) po/sq.po (+5470/-0) po/sr.po (+5481/-0) po/sr@Latn.po (+5138/-0) po/sr@latin.po (+5481/-0) po/sv.po (+5425/-0) po/ta.po (+5440/-0) po/te.po (+5410/-0) po/tg.po (+5467/-0) po/th.po (+5404/-0) po/tr.po (+5454/-0) po/ug.po (+5443/-0) po/uk.po (+5461/-0) po/ur.po (+5124/-0) po/uz.po (+5345/-0) po/uz@cyrillic.po (+5130/-0) po/vi.po (+5459/-0) po/wa.po (+5133/-0) po/xh.po (+5130/-0) po/zh_CN.po (+5433/-0) po/zh_HK.po (+5417/-0) po/zh_TW.po (+5416/-0) po/zu.po (+5131/-0) shell/Makefile.am (+114/-0) shell/TODO (+7/-0) shell/cc-editable-entry.c (+638/-0) shell/cc-editable-entry.h (+84/-0) shell/cc-panel.c (+286/-0) shell/cc-panel.h (+100/-0) shell/cc-shell-category-view.c (+221/-0) shell/cc-shell-category-view.h (+76/-0) shell/cc-shell-item-view.c (+218/-0) shell/cc-shell-item-view.h (+74/-0) shell/cc-shell-log.c (+65/-0) shell/cc-shell-log.h (+33/-0) shell/cc-shell-marshal.list (+2/-0) shell/cc-shell-model.c (+218/-0) shell/cc-shell-model.h (+90/-0) shell/cc-shell-nav-bar.c (+150/-0) shell/cc-shell-nav-bar.h (+76/-0) shell/cc-shell.c (+256/-0) shell/cc-shell.h (+112/-0) shell/completions/unity-control-center.in (+56/-0) shell/control-center.c (+348/-0) shell/gnome-control-center.c (+1664/-0) shell/gnome-control-center.h (+82/-0) shell/libunity-control-center.pc.in (+12/-0) shell/list-panel.sh (+8/-0) shell/shell.ui (+149/-0) shell/unity-control-center.desktop.in.in (+10/-0) shell/unitycc.directory.in (+5/-0) shell/unitycc.menu.in (+104/-0) update-from-gsd.sh (+26/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file MAINTAINERS. Moved existing file to MAINTAINERS.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file autogen.sh. Moved existing file to autogen.sh.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file git.mk. Moved existing file to git.mk.moved. Conflict adding file m4. Moved existing file to m4.moved. Conflict adding file man. Moved existing file to man.moved. Conflict adding file panels. Moved existing file to panels.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file shell. Moved existing file to shell.moved. Conflict adding file update-from-gsd.sh. Moved existing file to update-from-gsd.sh.moved. |
| To merge this branch: | bzr merge lp://staging/~bbboson/ubuntu/utopic/unity-control-center/fix-for-1236612 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Needs Fixing | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 12785. By Madper Xie
-
sound: fix potential memory corruption.(LP: #1236612)
- 12784. By PS Jenkins bot
-
Releasing 14.10.0+
14.10.20140702. 1-0ubuntu1 - 12783. By Robert Ancell
-
Add symbols that were added in revision 12731
- 12782. By Iain Lane
-
[appearance] Fix a g_object_unref on a GSettingsSchema to be g_settings_
schema_ unref Fixes: 1335438 - 12781. By PS Jenkins bot
-
Releasing 14.10.0+
14.10.20140604- 0ubuntu1 - 12780. By Eric Chaskes
-
Updated um-password-
dialog. c to removed users to change password mode to regular when locking the account Fixes: 1314886 - 12779. By Robert Ancell
-
Build depend on libkrb5-dev - fixes FTBFS Fixes: 1324538
- 12778. By Dimitri John Ledkov
-
releasing package unity-control-
center version 14.10.0+ 14.10.20140424- 0ubuntu1 - 12777. By Dimitri John Ledkov
-
Update system information logo for Utopic Unicorn.
- 12776. By PS Jenkins bot
-
Releasing 14.04.3+
14.04.20140410- 0ubuntu1
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please propose this against lp:unity-control-center which is the upstream branch for this project.