Merge lp://staging/~unity-team/unity/7.2.2 into lp://staging/unity/7.2
Status: | Merged |
---|---|
Approved by: | Stephen M. Webb |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3798 |
Proposed branch: | lp://staging/~unity-team/unity/7.2.2 |
Merge into: | lp://staging/unity/7.2 |
Diff against target: |
3472 lines (+1152/-478) 54 files modified
UnityCore/GnomeSessionManager.cpp (+32/-0) UnityCore/GnomeSessionManagerImpl.h (+4/-0) UnityCore/SessionManager.h (+4/-0) dash/DashController.cpp (+3/-1) debian/changelog (+59/-0) hud/HudController.cpp (+1/-0) launcher/AbstractLauncherIcon.h (+3/-2) launcher/ApplicationLauncherIcon.cpp (+20/-19) launcher/ApplicationLauncherIcon.h (+0/-1) launcher/Launcher.cpp (+26/-10) launcher/LauncherIcon.cpp (+7/-3) launcher/LauncherIcon.h (+2/-1) launcher/SwitcherView.cpp (+54/-31) launcher/SwitcherView.h (+3/-4) launcher/TrashLauncherIcon.cpp (+1/-0) launcher/VolumeLauncherIcon.cpp (+1/-0) lockscreen/LockScreenAbstractShield.h (+0/-1) lockscreen/LockScreenController.cpp (+2/-3) lockscreen/LockScreenShield.cpp (+0/-6) lockscreen/LockScreenShield.h (+0/-1) lockscreen/UserPromptView.cpp (+8/-99) lockscreen/UserPromptView.h (+1/-13) panel/PanelIndicatorEntryView.cpp (+7/-0) plugins/unityshell/src/GesturalWindowSwitcher.cpp (+3/-0) plugins/unityshell/src/GesturalWindowSwitcher.h (+1/-0) plugins/unityshell/src/unityshell.cpp (+57/-50) plugins/unityshell/src/unityshell.h (+2/-0) po/POTFILES.in (+1/-0) po/unity.pot (+70/-3) shortcuts/ShortcutController.cpp (+4/-6) shortcuts/ShortcutView.cpp (+113/-48) shortcuts/ShortcutView.h (+9/-3) shutdown/SessionButton.cpp (+30/-5) shutdown/SessionButton.h (+5/-0) shutdown/SessionController.cpp (+2/-0) shutdown/SessionView.cpp (+68/-27) shutdown/SessionView.h (+5/-0) tests/test-gestures/LockScreenControllerMock.h (+43/-0) tests/test-gestures/sed_script_switcher (+2/-0) tests/test-gestures/unityshell_mock.h (+8/-1) tests/test_lockscreen_controller.cpp (+0/-1) tests/test_switcher_view.cpp (+1/-2) tests/test_unity_window_view.cpp (+9/-9) unity-shared/EMConverter.cpp (+2/-2) unity-shared/IMTextEntry.cpp (+7/-0) unity-shared/IMTextEntry.h (+2/-0) unity-shared/PluginAdapter.cpp (+43/-10) unity-shared/RawPixel.cpp (+1/-1) unity-shared/TextInput.cpp (+178/-4) unity-shared/TextInput.h (+19/-4) unity-shared/UnityWindowStyle.cpp (+135/-62) unity-shared/UnityWindowStyle.h (+35/-20) unity-shared/UnityWindowView.cpp (+53/-25) unity-shared/UnityWindowView.h (+6/-0) |
To merge this branch: | bzr merge lp://staging/~unity-team/unity/7.2.2 |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Review via email:
|
Commit message
Prepare for upstream micro-release 7.2.2 that includes fixes for the following bugs:
Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.
Bug #741869: Unity/compiz intercepts Super and Alt keypresses from grabbed windows like VMs.
Bug #754580: Cannot move tabs between multiple Firefox or Chromium windows while using Unity unless windows are both unmaximized, unminimized, and visible.
Bug #839728: Launcher - dragging a item on top of a launcher tile that is a valid drop receptacle in the Launcher should cause that launcher tile to glow
Bug #924840: Keyboard shortcuts overlay text too long
Bug #1281058: [UIFe] The system shutdowns when multiple accounts are open
Bug #1283775: Launcher: icon pips are not always updated properly
Bug #1304882: [Regression] Launcher doesn't reappear fully after hiding from DND
Bug #1305586: Lock screen is unusable when some windows have a keyboard/mouse grab
Bug #1307738: Lockscreen caps lock icon drawn under text entry, should be a white icon.
Bug #1308288: Lockscreen warning icon has no tooltip
Bug #1308323: Shutdown/
Bug #1308911: Clipboard contents are accessible within lockscreen
Bug #1309739: Unity launcher icon edge illumination is offset
Bug #1310200: Indicators disappear at the panel (clementine, dropbox, skype etc)
Bug #1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
Bug #1316005: Panel shadow appears over full screen applications w/ locally integrated menus enabled
Bug #1317348: Switcher (Alt-Tab) does not respect monitor-defined scaling factor
Bug #1317356: Shortcut hint does not respect monitor scaling factor
Bug #1317869: Keyboard shortcuts overlay does not show up when workspaces are enabled at 1366x768
Bug #1320438: Unity launcher auto hide fails on screen unlock using "Super+L"
Bug #1321043: [regression] lock screen bypass with touchpad
Description of the change
Prepare for upstream micro-release 7.2.2.
Looks fine to me, all the relevant fixes are in and the delta with trunk is now reduced ;)
There's just a comment (about the new translation, but I'm not sure if we're in time for changing it).