Merge lp:~unity-team/unity/7.2.2 into lp:unity

[Christopher Townsend]

Prepare for upstream micro-release 7.2.2. Fixes 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/reboot/login/logout dialogs not scaled after toggling UI scale Edit
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

Prepare for upstream micro-release 7.2.2.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-18 13:07:37 +0000
+++ CMakeLists.txt	2014-07-01 15:43:33 +0000
@@ -9,8 +9,13 @@
 #
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
+<<<<<<< TREE
 set (UNITY_MINOR 3)
 set (UNITY_MICRO 0)
+=======
+set (UNITY_MINOR 2)
+set (UNITY_MICRO 1)
+>>>>>>> MERGE-SOURCE
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")
 
=== modified file 'ChangeLog'
--- ChangeLog	2014-06-18 14:37:16 +0000
+++ ChangeLog	2014-07-01 15:43:33 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2014-06-18  Stephen M. Webb  <[e-mail]>
 
 	bump upstream to 7.3.0
@@ -1648,6 +1649,1167 @@
 	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
 	unless they don't provide, for sure, a full decoration.
 
+=======
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: updated with additional lockscreen changes
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1317276
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers on arm64 Ubuntu package builds
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers for arm64 arch, it seems to cause random ICEs
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	lockscreen/LockScreenAccelerators.h: added required header for std:vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added missing header for std::vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1312749
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Set the max width, so our static text wraps. So we don't end up rendering text out of the view area.
+
[phone]  Jonas Schwabe
+
+	* Set the max width, so the static text wraps (and doesn't go out of the view!)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1307748
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: GetPropertyValue should return a proper value only if we've a valid array
+	
+	Improve debugging messages and fix leaks.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1221673
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1313280
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+	
+	Some code cleanup, factorizing similar code.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Mergin with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/lockscreen-keys-disable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Get the Hud initialization event if unity is locked
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: if the screen is grabbed when showing the Hud, wait for ungrab for a couple of seconds
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: don't try to show Dash/Hud if the screen is grabbed
+	
+	Also move the dash opening out from LauncherController, and get rid of UBus
+	as first initialization source, that can only slow things down here.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashController: return a bool in ShowDash, wait for ungrab for 2 seconds maximum
+	
+	Now if the screen is grabbed, we just wait a couple of seconds the ungrab-event.
+	If that happens in such timeframe then we show the dash, otherwise we ignore the request.
+	
+	Also return a bool weather we've shown the dash or not.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: notify grab also when the screen is not grabbed but we got a NotifyWhileGrabbed event
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1251193
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range. Fixes: 1251193
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1291461
+
[phone]  William Hua  <[e-mail]>
+
+	added proper support for modifier-only shortcuts on the lock screen
+
[phone]  William Hua  <[e-mail]>
+
+	Treat Meta modifier as Alt.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor revisions.
+
[phone]  William Hua  <[e-mail]>
+
+	Destroy accelerator controller between locks.
+
[phone]  William Hua  <[e-mail]>
+
+	Remove gotos.
+
[phone]  William Hua  <[e-mail]>
+
+	Make a separate controller just for accelerators.
+
[phone]  William Hua  <[e-mail]>
+
+	Rip everything out and start anew.
+
[phone]  William Hua  <[e-mail]>
+
+	Add proper support for modifier-only shortcuts on the lock screen.
+
[phone]  Marc Deslauriers  <[e-mail]>
+
+	debian/changelog: sync with distro
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu hasn't actually been shown
+	
+	In addition, if the menu is not visible after the first popup call, try to show a menu
+	without keyboard focus. This will make possible to see menus also when there's a key-grab
+	(although they will be without keyboard support).
+	
+	Finally, reset the menu state, if that failed.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: if a menu is opened, and the screen is not grabbed, give the grab back to the Shield.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: cleanup the menu popup code, avoid unnecessary calls to gtk_widget_is_visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: if the menu is not visible, try to show a menu without keyboard focus
+	
+	This will make possible to see menus also when there's a key-grab.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu has not actually been shown
+	
+	And also reset the menu state, if that failed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+	
+	Also, make sure that the lockscreen views are treated as "always-on-front" windows by nux
+	(and this applies to both visibility and events).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestSessionController: verify correctly the new Hide method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the primary shield as the always on front window when another basewindow hides
+	
+	That window might have set itself as the always on front window, so we should restore our role
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: set the dialog as the nux always on front view
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: delete the views when hidden, we don't need to keep them around
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: make sure we reset all the unity views before locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: also send the terminate action to Alt pressure on lock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle all the unity (and thus the Gnome) key bindings when locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: don't try to regrab again if we've been just requested to ungrab
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: wait for the next ungrab-event if we can't grab when panel is not active anymore
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the blank window or the primary shield as the always-on-front window
+	
+	In this way nux won't draw anything above it, nor will pass events to the underneath windows
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140423-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args. Fixes: 1291362
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too. Fixes: 1308850
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use prompt_lock_requested signal.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140416-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate twice the same entry! Fixes: 1308572
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor change.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix ident.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate two times the same entry!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+	
+	This makes unity to relocks if it was locked before crashing... Fixes: 1308572
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Save lock file stamp in $XDG_RUNTIME_DIR, cleanup it on destroy
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetUserRuntimeDirectory to fetch $XDG_RUNTIME_DIR
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetCacheDirectory, to fetch and create an unity cache dir
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140414.1-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog. Fixes: 1281825, 1307524
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly. Fixes: 1288789
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Security issue: Gestures on the lock screen allow to peek inside running applications.
+	As with keyboard input, gestures should be blocked while the screen is locked. Fixes: 1303041, 1306973
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Stop hiding the launchers parent window for now as it breaks urgent icon wiggling and hint shadow.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Don't queue up drawing if the gestures are ignored.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make the lockscreen_controller accessible to other classes and don't allow 4 finger gestures in the lock screen.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Should not even try to show the switcher if the screen is locked.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Forgot a variable
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Also, don't hide the launcher window if expo or scale are active.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Really shouldn't hide the launcher window if the dash is open.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140411-0ubuntu1
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_. Fixes: 1306417
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410.1-0ubuntu1
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound buttons and input source switching under lock screen. 
+
[phone]  William Hua  <[e-mail]>
+
+	Clean up.
+
[phone]  William Hua  <[e-mail]>
+
+	Fix merge errors.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor changes.
+
[phone]  William Hua  <[e-mail]>
+
+	Merge trunk.
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound and input source shortcuts on lock screen.
+
[phone]  CI bot  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	It fixes the quicklist menu appearance. Fixes: 1298859
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed quicklist scaling
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When we detect caps lock, or caps lock is pressed, render a warning icon to show its on. Fixes: 1291737
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Make sure we update the caps lock detector when we change primary sheilds
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Get rid of magic numbers, have to get the width of the cached
+	spin icon width, so we can place the warning icon in the right spot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Check if caps is on each time we make a new Prompt, as it can change
+	when authenticating, and we need to know.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Detect if caps lock is on, and check if caps lock is pressed.
+	If so, then render a warning icon.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	If the dash has not been opened before, a 4 finger tap will result in a dash with no selected scope.
+	Instead, set up the window and view of the dash by sending DASH_ABOUT_TO_SHOW (same happens when hovering the mouse pointer over the BFB icon)
+	and open the home scope. Fixes: 1303468
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	UnityGestureTarget.cpp: Remove spaces
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	4 finger tap: Set up the dash window and its view, show the home scope afterwards.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Launcher: Show and hide the launcher window OnDragUpdate() to fix the gesture animations Fixes: 1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Only hide/unhide launcher window if autohide mode is on.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Actually, Hide/Un-Hide launcher window in OnDragUpdate.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Un-hide launcher window when dragging out using 4 finger gesture: https://bugs.launchpad.net/unity/+bug/1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Alt-Tab has always respected the alt-tab-bias-viewport setting, but the 3-finger gesture to switch between windows has not, even though it does the same thing.
+	They should behave the same way depending on the CCSM setting. Fixes: 1303060
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make 3 finger window switch gesture respect the alt-tab-bias-viewport setting by moving the check to SetUpAndShowSwitcher.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests. Fixes: 1297842
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge, PanelMenuView: perform proper WM action on clicks, based on user settings Fixes: 1283849
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use generic actions based on WM settings for double,middle and right clicks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add methods to {Horizontally,Vertically}Maximize a window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add window shading methods
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: perform proper WM action on clicks, based on user settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add WindowManagerAction to get WM click options
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/right-left-click-maximize-fix
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410-0ubuntu1
+
[phone]  CI bot  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen. Fixes: 1292154
+
[phone]  CI bot  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+	
+	This allows to just use the fallback gnome-screensaver lockscreen if we need to use it. Fixes: 1303712
+
[phone]  CI bot  <[e-mail]>
+
+	GnomeSessionManager: impelement gnome session dbus interface and a fader to blank the screen Fixes: 1291088, 1292041, 1292078, 1292446, 1292451
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: fire screensaver_post_lock_timeout_ when the view is fully visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: if it's impossible to lock a session, start the screensaver on lock
+	
+	This is what most of apps expect, and thus we do that. Although it's not really that coherent.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add ScreenSaver{Activate,Deactivate} and relevant signals and export them
+	
+	Update LockScreenController and dbus apis to match this
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: remove some racy code, avoid to emit multiple signals
+	
+	And fix pre-lock blank window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: increase the lockscreen timeout wait to be bigger to a frame duration
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: export PromptLock method on the dbus
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BackgroundSettings: don't create new panel style instances, use the actual instance
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: get rid of the old active_ bool variable, that caused undefined behavior
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: even more cleanup, move blank window grabbing to own function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: we need to paint also the decorations of the windows, when in lock-mode
+	
+	Othewise their texture won't be rebuilt and this will lead to wrong textures.
+	Also, we don't need to damage the screen when lock opacity changes as it's done by nux.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: also hide BlankWindow on mouse and keyboard down events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: show a blank window unless we don't have the lockscreen ready on prompt requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: add support for "PromptLock"
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use prompt lockscreen on logind lock requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add support to PromptLockScreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add PromptLockScreen method and signal, to require a fast lock (with no fading)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~sjakthol/unity/fix-1292154
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Don't cache the value and watch for changes. Check the setting every time instead.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: make sure whe hide the blank window on unlock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~laney/unity/g-s-replace
+	
+	Remves the ugly killall
+
[phone]  Iain Lane  <[e-mail]>
+
+	Take over as the owner of the gnome-screensaver interface, if necessary.
+
[phone]  Iain Lane  <[e-mail]>
+
+	Allow skipping of the tests with DEB_BUILD_OPTIONS=nocheck
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add ShowBlankWindow method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityShell: ops, remove wrong change
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: start the screensaver after few seconds that the user has locked his session, if there's no more interaction
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: emit a signal when we receive a keyboard input
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: immediately start the screensaver on SetActive dbus call
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add request_activate signal that is emitted on remote activation request
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: some cleanup, and HideBlankWindow on simulate user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: keep track of dbus_manager and reset screensaver on simulate-user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: implement SimulateUserActivity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use a nux property for active state
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: don't animate when locking the screen on suspend or screensaver
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: we can lock the screen if the GS setting is disabled
+	
+	Also rename the setting to be more understandable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: always call LockScreen of SessionManager as it has some checks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: damage the screen when the lockscreen opacity changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use a ROProperty for opacity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only try to lock if locking is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use timeout seconds for lock delay
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only use one window to blank the screen, it's not needed to have one per monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: move OnPresenceStatusChanged into a function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: lock the screen on suspend if ubuntu is configured to do so
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Uscreen: emit suspending signal on PrepareForSleep
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use direction to set the animation value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ExternalGschema: add missing external settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: also use legacy lockscreen if screen reader is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add some comments
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use async calls
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: call gnome-screensaver to lock the screen if we use a legacy lockscreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: add use_fallback option, that is on if OSK is active
+	
+	This is to workaround on screen keyboard issues
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Add GS schemas to external list
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use enum class PresenceStatus instead of magic numbers
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove magic numbers.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not implement SimulateUserActivity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Update tests.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Start cleaning lockscreen code.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix. Code style is still WIP.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Lock the screen after a delay.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the first settings.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Initial commit to implement g-s dbus interface in unity.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140404-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: add a new "sheet style" dialog that is shown when a window hangs
+	
+	Listen to compiz toolkit events and prompt a dialog that allows to force-quit an
+	hanging application. Fixes: 698031, 1299061, 1299080
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure that the dialog is not deletable by WM
+	
+	For this to be safe we need also to ignore the delete events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	POTFILES: include DecorationsForceQuitDialog.cpp
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: let's do one line things!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure we hide the dialog before we killed the parent window
+	
+	It must be hidden before than the parent, in case the window is not really killed,
+	it will be shown anyway later.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: avoid warnings on close, due to finalized close button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: emit close_request signal on close and "Wait" button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add close_request signal and destroy window when it  gets called
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add missing call to UpdateForceQuitDialogPosition
+	
+	Maybe it was removed due to a shelved change...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: implement actual window killing by using both XKillClient and kill -9
+	
+	Yeah, now
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use proper class names (mostly for theming)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use themed button textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set the dialog pid/hostname to match the ones of the parent window
+	
+	In this way we don't confuse BAMF about the ownership of the dialog.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: use the same window class of the real parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: keep the dialog centered on parent window when its geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager.cpp: show a forcequit dialog when we get a toolkitActionForceQuitDialog ClientMessage
+	
+	These events are triggered directly by compiz, so we only have to catch them!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add ShowForceQuitDialog method to show a forcequit dialog on given window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set dialog X time to match the one of the close event
+	
+	In this way we correctly handle the focus-stealing prevention
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: set shape area to ignore input events outside the actual dialog
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set parent window as its actual parent X-side, and center on it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: fix label strings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: obey to style for shadows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add first basic gtk implementation of the force-quit dialog
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen. Fixes: 1104236
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview.  This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140403-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click Fixes: 1301459
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have a valid screen ptr Fixes: 1291243
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have screen ptr valid
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsDataPool: add static Reset method that allows to reset our textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes Fixes: 1024101
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented Fixes: 1301394
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator from services/panel-service.c 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator.so (lp: #1300916)
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916) Fixes: 1300916
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140402-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	bump to release 7.2.0 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control: fix some style warnings in package description
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: fix syntax to silence a lintian warning
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control(Standards-Version): bump to 3.9.5 (no changes)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	release 7.2.0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use launcher width, scale on HiDPI, match also application names
+	
+	Launcher Width is now considered in setting the offset of the scale filter (fixes
+	padding when launcher is in autohide mode).
+	The search bar is correctly scaled when in HiDPI mode.
+	We use ApplicationManager and thus BAMF to match windows by their name or app name. Fixes: 1281297, 1282001, 1300763, 1300842
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use casefold instead that tolower as it's meant for equalty checks as we do here
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: implement our own to_lower_copy that works with utf8
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: match the scaled windows based on the SpreadFilter matches
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: compute a list of filtered windows using both window and application name
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: take in consideration the launcher width when setting the spread offset
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter :Scale the internal searchbar to match DPI settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: fix crash when trying to update the show filter scale in a filterless-search bar
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title Fixes: 1296866
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: add "panel-title" class to the panel style context when drawing title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelStyle: return a Style context with different widget path in GetStyleContext based on type
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: allow to use a different style context in DrawTitle
+	
+	Panel will need to use a different one
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Panel, Decorations: draw the background under the text glyphs before the text itself Fixes: 723167
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: never allow values minor or equal to 0 as UI scale
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsTitle: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: draw text glyphs background on menu items
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add support for drawing the text background under the glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration. Fixes: 1281825
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+
+>>>>>>> MERGE-SOURCE
 2014-03-28  CI bot  <[e-mail]>
 
 	Releasing 7.1.2+14.04.20140328.1-0ubuntu1
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-06-19 18:41:56 +0000
+++ debian/changelog	2014-07-01 15:43:33 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity (7.3.0+14.10.20140619-0ubuntu1) utopic; urgency=low
 
   [ Stephen M. Webb ]
@@ -93,11 +94,76 @@
     std:vector definition
   * disabled precompiled headers on arm64 Ubuntu package builds (LP:
     #1317276)
+=======
+unity (7.2.1+14.04.20140513-0ubuntu3) trusty; urgency=medium
+
+  [ Alfred Neumayer ]
+  * Restore the launcher position by reversing the animation and
+    unsetting the DND_PUSHED_OFF quirk. (LP: #1304882)
+
+  [ Brandon Schaefer ]
+  * TextInput: move the warning icon inside the input field, render it
+    white (LP: #1307738)
+  * ShutdownView: Scale up the Buttons and Text plus Borders of the
+    UnityWindowView. (LP: #1308323)
+  * Lockscreen warning icon needs a tooltip to say what the warning is
+    about! (LP: #1308288)
+
+  [ Marco Trevisan (Treviño) ]
+  * UnityScreen: always paint the lockscreen above, just add menu and
+    onboard as exceptions Some code cleanup, factorizing similar code.
+    (LP: #1313280)
+  * ApplicationLauncherIcon: Focus and, in case, Spread the windows on
+    DnD After 1 second that an user is over an icon, that icon should
+    focus the relative application and Spread its windows if it has more
+    than one opened. Correctly handle the DnD scale in launcher, and
+    apply glow to the icon under pointer. (LP: #607796)
+  * ShutdownView: Scale up the Buttons and Text plus Borders of the
+    UnityWindowView. (LP: #1308323)
+  * SwitcherView: use RawPixel's for the size values and convert them to
+    match current scaling (LP: #1317348)
+  * PluginAdapter: try to grab the screen to make sure that the screen
+    is not grabbed FocusIn event with NotifyGrab mode is not always
+    triggered by X when a window takes the grab, then we need to ensure
+    that there's no grab by trying to get one. We only care about
+    keyboard here, since pointer grabs don't affect us in general.
+    (LP: #741869)
+  * ShortcutView: use RawPixel's for the size values and convert them to
+    match current scaling Plus dinamically allocate horizontal space,
+    not to cut the text. (LP: #924840)
+
+  [ Chris Townsend ]
+  * Fix issue where scaling the edge illumination up and down with the
+    size of the Launcher icons would cause the illumination border to be
+    offset and smaller than the icon. (LP: #1309739) 
+  * Fix issue where the number of Launcher icon pips are not always
+    properly updated when a new window of an already running application
+    is opened. (LP: #1283775)
+  * Fix issue where the Panel shadow would get drawn over drop down
+    windows in full screen windows. (LP: #1316005)
+
+  [ Andrea Azzarone ]
+  * Clear the clipboard when locking the screen. (LP: #1308911)
+  * Disable switcher gestures if screen is locked. Fixed a regression.
+    (LP: #1321043)
+  * Pass the correct options to showLauncherKeyTerminate in
+    UnityScreen::OnLockScreen (LP: #1320438)
+  * Fix skype indicator blinking. (LP: #1310200)
+  * Add a warning in the session dialog if other sessions are still
+    open. (LP: #1281058)
+
+ -- Chris Townsend <[e-mail]>  Thu, 19 Jun 2014 10:36:15 -0400
+
+unity (7.2.1+14.04.20140513-0ubuntu2) trusty; urgency=medium
+>>>>>>> MERGE-SOURCE
 
   [ Brandon Schaefer ]
   * Set the max width, so our static text wraps. So we don't end up
     rendering text out of the view area. (LP: #1312749)
 
+  [ Jnkyu Yi ]
+  * fixed range of blacklisted Unicode characters (lp: #1251193)
+
   [ Marco Trevisan (Treviño) ]
   * UnityScreen: toggle activation of all the unity compiz actions when
     locking the screen Also, make sure that the lockscreen views are
@@ -109,38 +175,23 @@
     focus. This will make possible to see menus also when there's a key-
     grab (although they will be without keyboard support). Finally,
     reset the menu state, if that failed.
-  * UnityScreen: always paint the lockscreen above, just add menu and
-    onboard as exceptions Some code cleanup, factorizing similar code.
-    (LP: #1313280)
-  * UnityScreen: don't try to show Dash/Hud if the screen is grabbed
-    Also move the dash opening out from LauncherController, and get rid
-    of UBus as first initialization source, as it can only slow things
-    down here. (LP: #741869)
   * PluginAdapter: make sure we don't try to call an invalid
     initiate/terminate callback function (LP: #1221673)
   * DebugDBusInterface: match properties if they are in the AP array
     form [<type>, <value>] (LP: #1307748)
 
+  [ Stephen M. Webb ]
+  * lockscreen/LockScreenAccelerators.h: added required header for
+    std:vector definition (fixes FTBFS in Ubuntu)
+  * disabled precompiled headers on arm64 Ubuntu package builds
+    (lp: #1317276)
+  * bump upstream release to 7.2.1
+
   [ William Hua ]
-  * Add proper support for modifier-only shortcuts on the lock screen.
-    (LP: #1291461)
-
-  [ Jinkyu Yi ]
-  * Dash: Fix problem at checking blacklisted unicode range (LP:
-    #1251193)
-
-  [ Andrea Azzarone ]
-  * Add a warning in the session dialog if other sessions are still
-    open. (LP: #1281058)
-
- -- Ubuntu daily release <[e-mail]>  Mon, 12 May 2014 22:03:27 +0000
-
-unity (7.2.0+14.04.20140423-0ubuntu2) utopic; urgency=medium
-
-  * debian/control: depends on autopilot-desktop-legacy rather than
-    autopilot-desktop.
-
- -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 01 May 2014 00:32:05 -0400
+  * added proper support for modifier-only shortcuts on the lock screen
+    (lp: #1291461)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 13 May 2014 20:46:01 +0000
 
 unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2014-05-07 19:55:43 +0000
+++ debian/control	2014-07-01 15:43:33 +0000
@@ -165,7 +165,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         autopilot-desktop-legacy,
+         autopilot-desktop,
          python-windowmocker,
          gir1.2-appindicator3-0.1,
          gir1.2-dee-1.0,
 
=== modified file 'lockscreen/LockScreenController.cpp'
=== modified file 'plugins/unityshell/src/unityshell.cpp'
=== modified file 'po/unity.pot'
--- po/unity.pot	2014-03-10 17:51:32 +0000
+++ po/unity.pot	2014-07-01 15:43:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2013-04-17 16:00+0100\n"
+"POT-Creation-Date: 2014-07-01 11:21-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,6 +38,26 @@
 msgid "Last Updated"
 msgstr ""
 
+#. The "%s" is used in the dash preview to display the "<hint>: <value>" infos
+#, c-format
+msgid "%s:"
+msgstr ""
+
+msgid "Comments"
+msgstr ""
+
+msgid "This window is not responding"
+msgstr ""
+
+msgid "Do you want to force the application to exit, or wait for it to respond?"
+msgstr ""
+
+msgid "_Wait"
+msgstr ""
+
+msgid "_Force Quit"
+msgstr ""
+
 msgid "Type your command"
 msgstr ""
 
@@ -50,6 +70,12 @@
 msgid "Quit"
 msgstr ""
 
+msgid "Exit"
+msgstr ""
+
+msgid "Close"
+msgstr ""
+
 msgid "Search your computer and online sources"
 msgstr ""
 
@@ -69,13 +95,16 @@
 msgid "Waiting to install"
 msgstr ""
 
+msgid "Installing…"
+msgstr ""
+
 msgid "Drop To Add Application"
 msgstr ""
 
 msgid "Trash"
 msgstr ""
 
-msgid "Empty Trash..."
+msgid "Empty Trash…"
 msgstr ""
 
 msgid "Open"
@@ -96,6 +125,15 @@
 msgid "Unmount"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Invalid password, please try again"
+msgstr ""
+
 msgid "Ubuntu Desktop"
 msgstr ""
 
@@ -105,6 +143,14 @@
 msgid "Launcher"
 msgstr ""
 
+#, c-format
+msgid "%s: running: %zu windows open"
+msgstr ""
+
+#, c-format
+msgid "%s: running"
+msgstr ""
+
 msgid "Quicklist"
 msgstr ""
 
@@ -165,6 +211,9 @@
 msgid "Opens the Dash Music Lens."
 msgstr ""
 
+msgid "Opens the Dash Photo Lens."
+msgstr ""
+
 msgid "Opens the Dash Video Lens."
 msgstr ""
 
@@ -210,6 +259,9 @@
 msgid "Switches between applications."
 msgstr ""
 
+msgid "Switches between applications from all workspaces."
+msgstr ""
+
 msgid "Switches windows of current applications."
 msgstr ""
 
@@ -234,6 +286,12 @@
 msgid "Spreads all windows in the current workspace."
 msgstr ""
 
+msgid "Spreads all windows."
+msgstr ""
+
+msgid "Spreads all windows in all the workspaces."
+msgstr ""
+
 msgid "Minimises all windows."
 msgstr ""
 
@@ -258,7 +316,7 @@
 msgid "Places the window in corresponding position."
 msgstr ""
 
-msgid "Ctrl + Alt + Num"
+msgid "Ctrl + Alt + Num (keypad)"
 msgstr ""
 
 msgid " Drag"
@@ -270,6 +328,11 @@
 msgid "Resizes the window."
 msgstr ""
 
+msgid ""
+"Other users are logged in. Restarting or shutting down will close their open applications and may cause them to lose work.\n"
+"\n"
+msgstr ""
+
 msgid "Shut Down"
 msgstr ""
 
@@ -327,3 +390,7 @@
 
 msgid "Filter results"
 msgstr ""
+
+#. avoid wrap lines
+msgid "Caps lock is on"
+msgstr ""
 
=== modified file 'shutdown/SessionView.cpp'
--- shutdown/SessionView.cpp	2014-06-18 15:08:33 +0000
+++ shutdown/SessionView.cpp	2014-07-01 15:43:33 +0000
@@ -96,10 +96,16 @@
   UpdateContents();
 }
 
+<<<<<<< TREE
 void View::UpdateContents()
 {
   SetVisible(true);
   PopulateButtons();
+=======
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &View::UpdateViewSize)));
+
+  UpdateViewSize();
+>>>>>>> MERGE-SOURCE
   UpdateText();
   UpdateViewSize();
 }
@@ -130,6 +136,26 @@
   }
 }
 
+void View::UpdateViewSize()
+{
+  main_layout_->SetTopAndBottomPadding(style::TOP_PADDING.CP(scale()), style::BOTTOM_PADDING.CP(scale()));
+  main_layout_->SetLeftAndRightPadding(style::LEFT_RIGHT_PADDING.CP(scale()));
+  main_layout_->SetSpaceBetweenChildren(style::MAIN_SPACE.CP(scale()));
+
+  title_->SetScale(scale());
+  subtitle_->SetScale(scale());
+
+  ReloadCloseButtonTexture();
+
+  buttons_layout_->SetSpaceBetweenChildren(style::BUTTONS_SPACE.CP(scale()));
+
+  for (auto* area : buttons_layout_->GetChildren())
+  {
+    auto* button = static_cast<Button*>(area);
+    button->scale = scale();
+  }
+}
+
 void View::UpdateText()
 {
   std::string message;
@@ -217,6 +243,7 @@
 
   if (mode() == Mode::LOGOUT)
   {
+<<<<<<< TREE
     if (manager_->is_locked())
       return;
 
@@ -228,6 +255,14 @@
     }
 
     auto* button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
+=======
+    auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
+    button->scale = scale();
+    button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
+    AddButton(button);
+
+    button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
+>>>>>>> MERGE-SOURCE
     button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Logout));
     key_focus_area_ = button;
     AddButton(button);
@@ -236,23 +271,40 @@
   {
     if (mode() == Mode::FULL)
     {
+<<<<<<< TREE
       if (manager_->CanLock())
       {
         auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
         button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
         AddButton(button);
       }
+=======
+      auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
+      button->scale = scale();
+      button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
+      AddButton(button);
+>>>>>>> MERGE-SOURCE
 
       if (manager_->CanSuspend())
       {
+<<<<<<< TREE
         auto* button = new Button(Button::Action::SUSPEND, NUX_TRACKER_LOCATION);
+=======
+        button = new Button(Button::Action::SUSPEND, NUX_TRACKER_LOCATION);
+        button->scale = scale();
+>>>>>>> MERGE-SOURCE
         button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Suspend));
         AddButton(button);
       }
 
       if (manager_->CanHibernate())
       {
+<<<<<<< TREE
         auto* button = new Button(Button::Action::HIBERNATE, NUX_TRACKER_LOCATION);
+=======
+        button = new Button(Button::Action::HIBERNATE, NUX_TRACKER_LOCATION);
+        button->scale = scale();
+>>>>>>> MERGE-SOURCE
         button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Hibernate));
         AddButton(button);
       }
@@ -261,10 +313,12 @@
     if (manager_->CanShutdown())
     {
       auto *button = new Button(Button::Action::REBOOT, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Reboot));
       AddButton(button);
 
       button = new Button(Button::Action::SHUTDOWN, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Shutdown));
       key_focus_area_ = (mode() == Mode::SHUTDOWN) ? button : key_focus_area_;
       AddButton(button);
@@ -272,6 +326,7 @@
     else if (mode() == Mode::FULL && !manager_->is_locked())
     {
       auto* button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Logout));
       AddButton(button);
     }
 
=== modified file 'shutdown/SessionView.h'
--- shutdown/SessionView.h	2014-05-16 03:39:48 +0000
+++ shutdown/SessionView.h	2014-07-01 15:43:33 +0000
@@ -25,9 +25,14 @@
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 
+<<<<<<< TREE
 #include <UnityCore/GLibSource.h>
 #include <UnityCore/SessionManager.h>
 #include "unity-shared/EMConverter.h"
+=======
+#include "UnityCore/SessionManager.h"
+#include "unity-shared/EMConverter.h"
+>>>>>>> MERGE-SOURCE
 #include "unity-shared/UnityWindowView.h"
 
 namespace unity
@@ -73,7 +78,12 @@
 private:
   friend class TestSessionView;
 
+<<<<<<< TREE
   void PopulateButtons();
+=======
+  void UpdateViewSize();
+
+>>>>>>> MERGE-SOURCE
   void UpdateText();
   void UpdateContents();
   void UpdateViewSize();