Merge lp://qastaging/~unity-team/unity/7.2.4 into lp://qastaging/unity/7.2
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3806 |
Proposed branch: | lp://qastaging/~unity-team/unity/7.2.4 |
Merge into: | lp://qastaging/unity/7.2 |
Diff against target: |
6023 lines (+2168/-709) 105 files modified
CMakeLists.txt (+1/-0) UnityCore/DBusIndicators.cpp (+11/-0) UnityCore/DBusIndicators.h (+1/-0) UnityCore/DesktopUtilities.cpp (+12/-0) UnityCore/DesktopUtilities.h (+1/-0) UnityCore/GLibDBusProxy.cpp (+100/-3) UnityCore/GLibDBusProxy.h (+6/-0) UnityCore/GLibWrapper-inl.h (+12/-0) UnityCore/GLibWrapper.h (+1/-0) UnityCore/GnomeSessionManager.cpp (+0/-1) UnityCore/Indicators.h (+1/-0) dash/FilterBasicButton.cpp (+6/-3) dash/previews/ActionButton.cpp (+5/-2) dash/previews/ErrorPreview.cpp (+1/-0) dash/previews/PaymentPreview.cpp (+3/-1) data/CMakeLists.txt (+1/-0) data/pam/CMakeLists.txt (+1/-0) data/pam/unity (+2/-0) debian/changelog (+59/-0) debian/rules (+1/-1) debian/unity.install (+1/-0) debian/unity.migrations (+1/-0) decorations/DecoratedWindow.cpp (+155/-64) decorations/DecorationsEdgeBorders.cpp (+32/-19) decorations/DecorationsForceQuitDialog.cpp (+17/-3) decorations/DecorationsManager.cpp (+17/-26) decorations/DecorationsPriv.h (+12/-3) decorations/DecorationsTitle.cpp (+1/-0) decorations/DecorationsWidgets.cpp (+13/-1) decorations/DecorationsWidgets.h (+5/-0) doc/unity.1 (+35/-10) hud/HudIconTextureSource.cpp (+0/-5) hud/HudIconTextureSource.h (+0/-1) launcher/ApplicationLauncherIcon.cpp (+2/-0) launcher/DesktopLauncherIcon.cpp (+13/-1) launcher/DesktopLauncherIcon.h (+2/-0) launcher/Launcher.cpp (+1/-3) launcher/LauncherIcon.cpp (+117/-104) launcher/LauncherIcon.h (+12/-8) launcher/MockLauncherIcon.h (+0/-5) launcher/SwitcherView.cpp (+9/-1) launcher/Tooltip.cpp (+5/-4) lockscreen/BackgroundSettings.cpp (+13/-11) lockscreen/BackgroundSettings.h (+0/-1) lockscreen/CMakeLists.txt (+2/-0) lockscreen/CofView.cpp (+15/-2) lockscreen/CofView.h (+3/-1) lockscreen/LockScreenAbstractShield.h (+14/-1) lockscreen/LockScreenController.cpp (+54/-14) lockscreen/LockScreenController.h (+12/-3) lockscreen/LockScreenPanel.cpp (+31/-2) lockscreen/LockScreenSettings.cpp (+2/-0) lockscreen/LockScreenSettings.h (+2/-1) lockscreen/LockScreenShield.cpp (+60/-29) lockscreen/LockScreenShield.h (+10/-3) lockscreen/LockScreenShieldFactory.cpp (+7/-2) lockscreen/LockScreenShieldFactory.h (+12/-2) lockscreen/ShutdownNotifier.cpp (+152/-0) lockscreen/ShutdownNotifier.h (+51/-0) lockscreen/SuspendNotifier.cpp (+153/-0) lockscreen/SuspendNotifier.h (+51/-0) lockscreen/UserAuthenticatorPam.cpp (+1/-2) lockscreen/UserPromptView.cpp (+96/-17) lockscreen/UserPromptView.h (+5/-4) panel/PanelIndicatorEntryView.cpp (+1/-1) panel/PanelMenuView.cpp (+83/-38) panel/PanelMenuView.h (+1/-1) plugins/unityshell/src/unityshell.cpp (+29/-35) plugins/unityshell/src/unityshell.h (+2/-2) services/panel-main.c (+8/-0) services/panel-service.c (+15/-0) services/panel-service.h (+2/-0) tests/CMakeLists.txt (+1/-1) tests/mock_indicators.h (+1/-0) tests/test_lockscreen_controller.cpp (+10/-2) tests/test_main_xless.cpp (+4/-5) tests/test_previews_music_payment.cpp (+1/-0) tests/test_text_input.cpp (+1/-0) tools/migration-scripts/03_unity_first_run_stamp_move (+35/-0) unity-shared/CompizUtils.cpp (+77/-58) unity-shared/CompizUtils.h (+36/-5) unity-shared/DashStyle.cpp (+8/-11) unity-shared/DecorationStyle.cpp (+2/-2) unity-shared/GnomeKeyGrabber.cpp (+9/-0) unity-shared/IconRenderer.cpp (+73/-43) unity-shared/IconRenderer.h (+0/-2) unity-shared/IconTexture.cpp (+1/-1) unity-shared/IconTextureSource.cpp (+37/-1) unity-shared/IconTextureSource.h (+10/-4) unity-shared/LayoutSystem.cpp (+28/-4) unity-shared/LayoutSystem.h (+2/-1) unity-shared/PluginAdapter.cpp (+39/-2) unity-shared/PluginAdapter.h (+3/-0) unity-shared/SearchBar.cpp (+18/-12) unity-shared/SearchBar.h (+9/-9) unity-shared/SearchBarSpinner.h (+0/-2) unity-shared/SpreadFilter.cpp (+3/-1) unity-shared/StandaloneWindowManager.h (+2/-0) unity-shared/TextInput.cpp (+138/-76) unity-shared/TextInput.h (+17/-19) unity-shared/UScreen.cpp (+26/-4) unity-shared/UScreen.h (+0/-1) unity-shared/UnitySettings.cpp (+9/-1) unity-shared/WindowManager.h (+5/-0) unity-shared/XWindowManager.cpp (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/7.2.4 |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Review via email: mp+244802@code.qastaging.launchpad.net |
Commit message
release 7.2.4
Description of the change
Backported fixes for Trusty SRU-4.
[ Andrea Azzarone ]
* Share lockscreen password between screens (lp: #1308540)
* Allow a distinct pam config file for greeter and for lock-screen.
(lp: #1305440)
* Add an arrow activator in the lockscreen. (lp: #1332509)
* Make sure GetScreenGeometry returns the correct value (lp: #1374785).
[ Brandon Schaefer ]
* fix tooltip for the "Show Desktop / Restore Windows" icon in the Alt-Tab
switcher (lp: #1237132)
* Use CONFIG instead of CACHE to store the first_run.stamp (lp: #1328677)
[ Eleni Maria Stea ]
* LayoutSystem: make sure the exposed open windows are displayed in the
preserved order (lp: #1349281).
[ handsome_feng ]
* added support for getting the distro name from /etc/os-release
(lp: #1329584)
[ Iain Lane ]
* When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME
gives us unprefixed keys sometimes (lp: #1302885).
[ Marco Trevisan (Treviño) ]
* make the Launcher icon count badge width depend on the text value width
and scaling (lp: #1353070) (lp: #1354498) (lp: #796527) (lp: #1066971)
(lp: #1361713)
* DecoratedWindow: make edges independent from borders and properly update
them on actions change (lp: #1276177), (lp: #1299741), (lp: #1301776),
(lp: #1324104), (lp: #1364225), (lp: #1373695)
* Lockscreen: scale the UI elements based on current monitor scaling
(lp: #1292218)
* UnityScreen: when filtering out windows in spread, make sure we unscale
them (lp: #1316265).
* PanelMenuView: ensure that proper window tiles and buttons are shown at
the right place (lp: #1384910) (lp: #1384958) (lp: #1385285)
* SearchBar, ActionButtons, IconRenderer: include the font scaling when
scaling textual items (lp: #1332947) (lp: #1361751) (lp: #1362162)
(lp: #1362346).
* ApplicationLaun
and the application window is about to be focused (lp: #1350331).
* SwitcherView: set progress on icon render args (lp: #1361679).
* LockScreenContr
before setting the session locked (lp: #1368427) (lp: #1371764).
[ Stephen M. Webb ]
* updated the unity(1) manpage to match the actual command (lp: #1059275)
* packaging version bump
Looks good!
There are some old fixes for bugs #1363534 and #1351591 that are not included here, but we might include them later.