Merge lp:~3v1n0/unity/launcher-dnd-icon-damage-fix-5.0 into lp:unity

[Marco Trevisan (Treviño)]

unityshell: correctly damage the LauncherDragWindow region

Backported to unity 5.0 lp:~3v1n0/unity/launcher-dnd-icon-damage-fix/+merge/118142

=== modified file 'AUTHORS'
--- AUTHORS	2012-07-09 07:51:54 +0000
+++ AUTHORS	2012-08-03 16:26:24 +0000
@@ -24,9 +24,13 @@
  Brandon Schaefer <[e-mail]>, Thomi Richards <[e-mail]>
  Brandon Schaefer <[e-mail]>
  Chase Douglas <[e-mail]>
+<<<<<<< TREE
  Christopher James Halse Rogers <[e-mail]>
  Christopher Lee <[e-mail]>
  Christopher Lee <[e-mail]>
+=======
+ Christopher James Halse Rogers <[e-mail]>
+>>>>>>> MERGE-SOURCE
  Chris Coulson <[e-mail]>
  Daniel d'Andrada <[e-mail]>
  Daniel van Vugt <[e-mail]>
@@ -37,6 +41,7 @@
  Didier Roche <[e-mail]>
  foxoman <[e-mail]>
  Gabor Kelemen <[e-mail]>
+ Gary Lasker <[e-mail]>
  Gordon Allott <[e-mail]>
  Henri De Veene <[e-mail]>
  Jani Monoses <[e-mail]>
@@ -111,9 +116,14 @@
  Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
  Thomi Richards <[e-mail]>, Thomi Richards <[e-mail]>
  Thomi Richards <[e-mail]>
+<<<<<<< TREE
  Thomi Richards <[e-mail]>, Albert Astals <[e-mail]>
  Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
  Thomi Richards <[e-mail]>, Brandon Schaefer <[e-mail]>
+=======
+ Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
+ Thomi Richards <[e-mail]>, Brandon Schaefer <[e-mail]>
+>>>>>>> MERGE-SOURCE
  Thomi Richards <[e-mail]>, Gordon Allott <[e-mail]>
  Thomi Richards <[e-mail]>, Jason Smith <[e-mail]>
  Thomi Richards <[e-mail]>, Miklos Juhasz <[e-mail]>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-03 12:51:02 +0000
+++ CMakeLists.txt	2012-08-03 16:26:24 +0000
@@ -7,8 +7,13 @@
 # Base bits
 #
 set (PROJECT_NAME "unity")
+<<<<<<< TREE
 set (UNITY_MAJOR 6)
 set (UNITY_MINOR 0)
+=======
+set (UNITY_MAJOR 5)
+set (UNITY_MINOR 14)
+>>>>>>> MERGE-SOURCE
 set (UNITY_MICRO 0)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")

=== modified file 'ChangeLog'
--- ChangeLog	2012-07-09 07:51:54 +0000
+++ ChangeLog	2012-08-03 16:26:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2012-07-09  Thomi Richards  <[e-mail]>
 
 	Fix several intermittently failing tests.. Fixes: . Approved by Tim Penhey.
@@ -5080,6 +5081,2140 @@
 
 	Release\ 5.10.0
 
+=======
[phone]  Gary Lasker  <[e-mail]>
+
+	manual-tests/SoftwareCenter.txt: added tests for Ubuntu Software Center/Unity launcher integration feature. Fixes: . Approved by Marco Trevisan (Treviño), Brandon Schaefer, Christopher Lee.
+
[phone]  Gary Lasker  <[e-mail]>
+
+	clarify the steps for selecting a game (many thanks Christopher Lee)
+
[phone]  Gary Lasker  <[e-mail]>
+
+	targeted to the 5.0 series branch, update Unity launcher Software Center integration manual tests and provide additional important test cases to thoroughly test the full set of integration details, including all of the bug fixes for Unity branch https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes/+merge/110214 and the corresponding Software Center branch https://code.launchpad.net/~gary-lasker/software-center/unity-launcher-integration-fixes
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~thomir/unity/fix-for-754565. Fixes: https://bugs.launchpad.net/bugs/754565. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport AP test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~yeganeh/unity/fix-for-754565.
+
[phone]  Zaid Yeganeh  <[e-mail]>
+
+	[unityshell] Added key modifier/flags to the mouse events of launcher icons, and added logic for shift+click = new instance
+	
+	modified:
+	plugins/unityshell/src/AbstractLauncherIcon.h
+	- Added flags to the mouse events
+	
+	plugins/unityshell/src/Launcher.cpp
+	- Pass through key flags to launcher icons
+	
+	plugins/unityshell/src/LauncherIcon.cpp
+	- Logic added for shift click based on flag state
+	
+	plugins/unityshell/src/LauncherIcon.h
+	plugins/unityshell/src/SimpleLauncherIcon.cpp
+	plugins/unityshell/src/SimpleLauncherIcon.h
+	- Changed interfaces based on the AbstractLauncherIcon
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	SoftwareCenterLauncherIcon: avoid the "Waiting to Install" tooltip to stay after installation
+	
+	Be consistent with auto-hiding launcher.. Fixes: https://bugs.launchpad.net/bugs/925014, https://bugs.launchpad.net/bugs/1002440, https://bugs.launchpad.net/bugs/1012896. Approved by Marco Trevisan (Treviño), Brandon Schaefer, Thomi Richards.
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Merge from 5.0 branch
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Added test, need to probably fix it though
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Fix urgent quirk after installation of paid app
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Fixed string comparison, thanks Tim
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Fix the delay in adding launcher icons to the launcher by ensuring a redraw takes place (bug #1012896) and also fix the string comparison of desktop file with software-center-agent.
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Fix bug #925014 on the Unity side. Check if an aptdaemon task was specified. If not, then the icon tooltip will stay the same (i.e. the app name, rather than Waiting to install)
+
[phone]  Bilal Akhtar  <[e-mail]>
+
+	Fix bug #1002440, by not creating SC launcher icon if the desktop file was unspecified or set to SC's agent, as in the case of paid apps. Instead, the icon will be added at the end of the install
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-987955. Fixes: https://bugs.launchpad.net/bugs/987955. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-987955.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Scale mode now does not skip the first super to open the dash.. Fixes: https://bugs.launchpad.net/bugs/1023811. Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* fixes launcher -> scale mode -> dash problem
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-772445. Fixes: https://bugs.launchpad.net/bugs/772445. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-772445
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport branch lp:~andyrock/unity/fix-839717. Fixes: https://bugs.launchpad.net/bugs/839717. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-839717.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	KeyboardUtil: fix possible crash if XkbGetKeyboard returns null
+	
+	Also use initializer list. Fixes: https://bugs.launchpad.net/bugs/920258. Approved by Gord Allott.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	KeyboardUtil: fix typo
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	KeyboardUtil: oops, fix return value.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	KeyboardUtil: fix possible crash if XkbGetKeyboard returns null
+	
+	Also use initializer list
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-932531. Fixes: https://bugs.launchpad.net/bugs/932531. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-932531.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-bug-955158. Fixes: https://bugs.launchpad.net/bugs/955158. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove default_item_layout/list.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-bug-955158.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-934062. Fixes: https://bugs.launchpad.net/bugs/934062. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-934062.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-851982.. Fixes: https://bugs.launchpad.net/bugs/851982. Approved by Brandon Schaefer.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-851982
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapterCompiz: ignore offscreen windows when looking for the top one. Fixes: https://bugs.launchpad.net/bugs/996604. Approved by Brandon Schaefer.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	test_launcher: add autopilot test to check spread initialization on double click
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapterCompiz: ignore offscreen windows when looking for the top one
+
[phone]  Didier Roche  <[e-mail]>
+
+	Fix a crash when a GError exception is triggered. Fixes: https://bugs.launchpad.net/bugs/778470. Approved by Sam Spilsbury.
+
[phone]  Didier Roche  <[e-mail]>
+
+	import glib for handling the GError (LP: #778470)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashView: filter out the unprintable keys when focusing the search bar
+	
+	The search bar can't be focused when invalid keys (such as shift, ctrl, F1...) are pressed.. Fixes: https://bugs.launchpad.net/bugs/931393. Approved by Andrea Azzarone.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashView: filter out the unprintable keys when focusing the search bar
+	
+	The search bar can't be focused when invalid keys (such as shift, ctrl, F1...) are pressed...
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-1016239. Fixes: https://bugs.launchpad.net/bugs/1016239. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-1016239
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	The dash will now open when invoked while in spread/scale mode.. Fixes: https://bugs.launchpad.net/bugs/944033. Approved by Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes opening the dash when in scale mode
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	The switcher now focuses it's own window, instead of leaving it to the current one. Now Alt+F4 does not work while the switcher is active.. Fixes: . Approved by Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* SRU fix for alt+f4 re opening a program while using the switcher.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixes closing the shurnk Hud when clicking outside it's geometry.. Fixes: https://bugs.launchpad.net/bugs/962651. Approved by Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* switched close and it...
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* ap and minor fixes
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Hud will close when clicking anywhere outside of it's current geo (including being shrunk)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport  lp:~andyrock/unity/fix-994163. Fixes: https://bugs.launchpad.net/bugs/994163. Approved by Łukasz Zemczak.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport  lp:~andyrock/unity/fix-994163.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixes AP test, get_compiz_option wasn't included in utilities.. Fixes: . Approved by Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* fixes ap test get_compiz_option wasn't in 5.0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IMTextEntry: don't ingore ctrl/alt keypress to make ibus still working. Fixes: . Approved by Brandon Schaefer.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IMTextEntry: don't ingore ctrl/alt keypress to make ibus still working
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixes focus problem when entering expo mode from KeyNav(Alt+F1).. Fixes: https://bugs.launchpad.net/bugs/962408. Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes going into expo mode from key nav mode (alt+f1)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Documents and files now dragged from the Dash to the Launcher into an application will close the dash.. Fixes: https://bugs.launchpad.net/bugs/865168. Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Dragging documents and files to an app on the launcher closes the dash.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IMTextEntry: ignore invalid keypress when using modifiers keys.
+	
+	All the key pressure when pressing the Alt or Super key should be ignored.
+	When pressing Ctrl key we should only allow: A key, arrow keys, Backspace or Delete keys and Home or Delete keys.. Fixes: https://bugs.launchpad.net/bugs/1013751. Approved by .
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	test_im_text_entry: fix the IMTextEntry inclusion
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IMTextEntry: ignore invalid keypress when using modifiers keys.
+	
+	All the key pressure when pressing the Alt or Super key should be ignored.
+	When pressing Ctrl key we should only allow: A key, arrow keys, Backspace or
+	Delete keys and Home or Delete keys.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashController / HudController: hide the overlay when the spread is initiated. Fixes: https://bugs.launchpad.net/bugs/870284. Approved by .
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, added tests for Dash and Hud on spread
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudController: hide the HUD when the spread is initiated
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashController: hide the dash when spread is initiated
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Cherry-picked from unity trunk (rev2407):
+	Launcher: Fix dragging to the last position when out of the launcher. Fixes: https://bugs.launchpad.net/bugs/971421. Approved by Marco Trevisan (Treviño).
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Cherry-picked from unity trunk (rev2407):
+	Launcher: Fix dragging to the last position when out of the launcher
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-987674. Fixes: https://bugs.launchpad.net/bugs/987674. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug 987674.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport  lp:~andyrock/unity/hud-reset
+	. Fixes: https://bugs.launchpad.net/bugs/1011507. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add missing files.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/hud-reset.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-1008656.. Fixes: https://bugs.launchpad.net/bugs/1008656. Approved by Łukasz Zemczak.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-1008656.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Back-porting fix from unity trunk.
+	When dragging a non-application, do not saturate all icons automatically, but only those that are needed.
+	
+	Eliminates flickering before 'prelighting' the Launcher icons that can handle the current drag-and-drop (LP #863230).. Fixes: https://bugs.launchpad.net/bugs/863230. Approved by .
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	When dragging a non-application, do not saturate all icons automatically, but only those that are needed.
+	
+	Eliminates flickering before 'prelighting' the Launcher icons that can handle the current drag-and-drop (LP #863230)
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Draw the result grid in proximity of the search entry. Backport lp:~andyrock/unity/fix-1008603. Fixes: https://bugs.launchpad.net/bugs/1008603. Approved by Łukasz Zemczak.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/fix-1008603
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Back-porting fix from unity trunk.
+	Don't show the switcher window during constructing the view. Wait for the ShowView timeout.. Fixes: https://bugs.launchpad.net/bugs/987156. Approved by Tim Penhey.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Added two manual-tests for testing the fixed behavior. Better have everything well tested.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Added a unit test for the switcher show functionality. The same as in the previous proposition.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Don't show the switcher window during constructing the view. Wait for the show timeout.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports branch lp:~andyrock/unity/hud-text.. Fixes: https://bugs.launchpad.net/bugs/939436. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport lp:~andyrock/unity/hud-text.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: Unset the BamfApplication when removing the icon.
+	
+	Doing this manually, we prevent that a duplicated application can be added between the removal of the BamfLauncherIcon and the effective destruction (that is controlled by a timeout in LauncherModel).. Fixes: https://bugs.launchpad.net/bugs/1003574. Approved by .
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherController: use glib::Signal to handle the Bamf matcher signal.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: Disconnect all the _bamf_app signals at once on removal.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GLib::SignalManager: allow to disconnect all the signals for a given Object.
+	
+	When the signal string name is empty, we disconnect all the sigals
+	for the given object.
+
[phone]  Gord Allott  <[e-mail]>
+
+	* Capture information about the icon of the application to be installed from the software center. Re-use it when rendering the launcher interface.
+	* Fix bug #981168. Fixes: https://bugs.launchpad.net/bugs/981168. Approved by Gord Allott.
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixed up memory leaks
+
[phone]  Jay Taoko  <[e-mail]>
+
+	* Capture information about the icon of the application to be installed from the software center. Re-use it when rendering the launcher interface.
+
[phone]  Jay Taoko  <[e-mail]>
+
+	* Capture part of the content of Launcher::handle_dbus_method_call into a lambda call.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Backported andyrock's fix from lp:unity/6.0 - Unmute launcher (LP: #949448).. Fixes: https://bugs.launchpad.net/bugs/949448. Approved by Andrea Azzarone.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Backported andyrock's fix for LP: #949448 from lp:unity/6.0.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports lp:~andyrock/unity/queue-draw-result-view-grid from lp:unity/6.0.. Fixes: . Approved by Andrea Azzarone, Łukasz Zemczak.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports branch lp:~andyrock/unity/queue-draw-result-view-grid.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reduce the BGHash::RefreshColor() calls
+	
+	Don't call BGHash::RefreshColor() every atom on the XRoot window changes,
+	do it only when the target one changes. Fixes: . Approved by Andrea Azzarone.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reduce the BGHash::RefreshColor() calls
+	
+	Don't call BGHash::RefreshColor() every atom on the XRoot window changes,
+	do it only when the target one changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports branch lp:~vanvugt/unity/fix-987304.. Fixes: https://bugs.launchpad.net/bugs/987304. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports branch lp:~vanvugt/unity/fix-987304.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backported fix from lp:unity/6.0 - Dash - search field is hidden by tooltips (LP: #978030).. Fixes: https://bugs.launchpad.net/bugs/978030. Approved by Andrea Azzarone, Łukasz Zemczak.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backports branch lp:~andyrock/unity/fix-978030.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add AP tests.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable the bfb/hudlaunchericon tooltip when the dash/hud is open.
+	Hide a launcher icon tooltip as soon as the dash/hud is shown.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Backported andyrock's fix from trunk - fix UnityViewWindow background when blur is disabled.. Fixes: . Approved by Gord Allott.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Backported andyrock's fix for LP: #989291. Fix UnityViewWindow background when blur is disabled.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merged branches lp:~3v1n0/unity/launcher-double-icons-tests and lp:~3v1n0/unity/quick-app-reopen-icon-fix. Fixes: https://bugs.launchpad.net/bugs/772063, https://bugs.launchpad.net/bugs/995916, https://bugs.launchpad.net/bugs/999820. Approved by .
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging fix for "Missing GIMP icon bug"
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging single-icon AP tests.
+
[phone]  Didier Roche  <[e-mail]>
+
+	Release\ 5.12.0
+
[phone]  Sebastien Bacher  <[e-mail]>
+
+	Revert r2331, it's creating hang issues on start.. Fixes: . Approved by Didier Roche.
+
[phone]  Sebastien Bacher  <[e-mail]>
+
+	Revert r2331, it's creating hang issues on start. The commit is not fixing any
+	important issue and not needed in the SRU, it can come once the problems have
+	been resolved.
+
[phone]  Michael Vogt  <[e-mail]>
+
+	Check for "exit_state" on the install-finished signal from aptdaemon (LP: #982921) and remove launcher icon again on failure.. Fixes: https://bugs.launchpad.net/bugs/982921. Approved by Tim Penhey.
+
[phone]  Michael Vogt  <[e-mail]>
+
+	manual-tests/SoftwareCenter.txt: add manual test for the launcher integration cancel
+
[phone]  Michael Vogt  <[e-mail]>
+
+	remove USC launcher again from unity on download/install failure or cancel
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	We need to flag a bamf view that we control using an icon using the "unity-seen" qdata, or unity will duplicate it on bamfdaemon respawn. (LP: #928912). Fixes: https://bugs.launchpad.net/bugs/928912. Approved by Michal Hruby, Tim Penhey.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_launcher: removed the xclock test... We'll put it back soon.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging thomi's fixes
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Added xclock.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Renamed test methods.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Removed tautology from the test.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	CLeaned up test.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, use kill instead of pkill to close applications
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: export the application ID for introspection
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_launcher: added test to check the launcher status after bamfdaemon killing
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherController: set the "unity-seen" qdata to all the BamfApplications we have
+	
+	This avoid that we create two icons for the same application instance.
+	Moving to the safer GUINT...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: Focus an application if no child window is actually on top of the stack. Raises all urgent windows.
+	
+	This fixes bug #802816 that happens when an application raises a window on the top of the stack but the focus doesn't change.
+	
+	Plus, don't perform unneeded checks when focusing non-active applications.. Fixes: https://bugs.launchpad.net/bugs/802816, https://bugs.launchpad.net/bugs/986443. Approved by Tim Penhey.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual test: updated.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual-tests, Launcher: added a test for non top non-focused windows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: raise all the urgent windows, if there are any
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: focus an application if no child window is actually on top of the stack.
+	
+	This fixes bug #802816 that happens when an application raises a window on the top of the stack but the
+	focus doesn't change.
+	
+	Plus, don't perform unneeded checks for non-active applications.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add method to get if a window is on top.
+	
+	Top window is a window that is on top of the stack, excluding invisible, not mapped,
+	minimized, set "above" and unity windows.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual-test, Launcher: added manual test for the Chromium web applications. Fixes: . Approved by Tim Penhey.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual-test, Launcher: added manual test for the Chromium web applications
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: activate the icon using the quicklist item using an Idle.
+	
+	This fixes the bug #986461 that caused the spread not to initiate clicking on the quicklist application name.. Fixes: https://bugs.launchpad.net/bugs/986461. Approved by Thomi Richards.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: removed the g_debug("%s", G_STRFUNC); from AddProperties dummy implementation
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_quicklist: add a test to check that spread works when initiated by quicklist
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, keybindings: include spread keybindings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, add WindowManager emulator
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	test_quicklist: added test to check if the application label works
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	unityshell: set PluginAdapter as introspectable child
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: make it introspectable, implementation in PluginAdapter.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: remove the _quicklist_activated_id related source on destruction
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: activate the icon using the quicklist item using an Idle.
+	
+	This fixes the bug #986461 that caused the spread not to initiate clicking on the quicklist
+	application name.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix scale inversion when processing non-rect tile textures. Fixes: https://bugs.launchpad.net/bugs/988338. Approved by Gord Allott.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix scale inversion when processing non-rect tile textures
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Don't crop the bottom of results in card view when a category is not expanded.. Fixes: https://bugs.launchpad.net/bugs/975003. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes LP bug #975003.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Destroy lens views before destroying lens models. Fixes: . Approved by Gord Allott, Sam Spilsbury.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Add a comment
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Destroy lens views before destroying lens models
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Make sure hud's spinner stops spinning after hud service returns reply. Fixes: https://bugs.launchpad.net/bugs/987781. Approved by Gord Allott, Marco Trevisan (Treviño).
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Make sure hud's spinner stops spinning after hud service returns reply
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Shorten the press/release time of the Ctrl+Space for the IBus AP tests.. Fixes: . Approved by Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Shortens the press/release time for Ctrl+Space as jenkins is a little slow
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Enable dnd for all launcher icons (and not just the ones matching the type).. Fixes: https://bugs.launchpad.net/bugs/880798. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix typo.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a manual test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #880798.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Set a shortcut for the new apps on the launcher too.. Fixes: https://bugs.launchpad.net/bugs/778499. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Adds AP test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #778499.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DeviceLauncherSection: updated to use glib::SignalManager and glib::Object
+	
+	This allow to be more safe; it fixes also some crashes caused by the fact that DeviceLauncherIcon didn't own the GVolume* object. Now it uses glib::Object completely, so we can automagically ref/unref the volume when the icon is created/removed.. Fixes: https://bugs.launchpad.net/bugs/918548, https://bugs.launchpad.net/bugs/977762. Approved by Andrea Azzarone.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DeviceLauncherSection: use glib::SignalManager
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DeviceLauncherIcon: use a glib::Object to handle the volume.
+	
+	So we can be safe about reference. This will automagically add
+	and remove a reference when needed.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	UnityScreen: use smart_pointers correctly, destruct items in correct order. Fixes: https://bugs.launchpad.net/bugs/987932. Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Remove useless namespace
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed spacing issue
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Some fixes, also added some comments about the ordering (was causing the crashes)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Changed WindowThread to use a unique ptr
+	* Also fixed a memory leak with the debugger
+	* Some cleaning up also
+	* Thanks Treviño for the information :)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	UnityScreen: destroy the controllers before the window thread
+	
+	Fixes crashes enabling/disabling plugins in CCSM. Fixes: https://bugs.launchpad.net/bugs/931201, https://bugs.launchpad.net/bugs/942286, https://bugs.launchpad.net/bugs/947844, https://bugs.launchpad.net/bugs/952378. Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes some crashes with the ccsm and plugins
+	* There still seems to be a crash, but it looks to be in bamf
+
[phone]  Michal Hruby  <[e-mail]>
+
+	GLibDBusProxy: Remove 1 second timeout we used before connecting to dbus proxies. Fixes: . Approved by Marco Trevisan (Treviño).
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Remove 1 second timeout we used before connecting to dbus proxies
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudLauncherIcon: close the HUD when activating the icon
+	
+	As design requested in bug #963918. Fixes: https://bugs.launchpad.net/bugs/963918. Approved by Gord Allott.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudLauncherIcon: removed unneeded space.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_hud: add test to check if clicking over the HUD icon closes it.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudLauncherIcon: close the HUD when activating the icon
+	
+	As design requested in bug #963918
+
[phone]  smspillaz  <[e-mail]>
+
+	See Bug 880449 : Minimized windows were being considered for showdesktop and had their input shape removed twice.
+	
+	1) Never allow different entities to fight over the input shape of the window. Have one shared interface between them with RAII semantics
+	2) Don't allow minimized windows to enter showdesktop mode. Fixes: . Approved by Gord Allott.
+
[phone]  smspillaz  <[e-mail]>
+
+	Fix style, use <memory>
+
[phone]  smspillaz  <[e-mail]>
+
+	Don't showdesktop minimized windows
+
[phone]  smspillaz  <[e-mail]>
+
+	Make the minimize handler use the same mechanism
+
[phone]  smspillaz  <[e-mail]>
+
+	Acquire input shape removal through RAII semantics
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Hud: update the icon size to match the launcher icon size when in auto-hide mode
+	
+	Plus prevent a couple of crashes. Fixes: https://bugs.launchpad.net/bugs/921506, https://bugs.launchpad.net/bugs/983646. Approved by Tim Penhey.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudView: Set the minimum icon height to match the content_layout
+	
+	So the icon is vertically centered to the hud search (minimal) layout if needed.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudIcon: use unsigned integer for padding.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudView: remove space
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudIcon: Fix the icon position to be relative to size, add a minimum vertical padding
+	
+	This makes the icon draw correctly when it's big, also it makes the view to increas its
+	vertical size slightly to use some padding if needed.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudView: fix the geometry not to change when the icon size changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	HudController: add SetIcon function that removes some code duplication
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	IconTexture: be more safe when handling _pixbuf_cached
+	
+	Set it to null when invalid and during initialization
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk (window button fixes)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Hud: update the icon size to match the launcher icon size.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with icon fixes branch
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use 2 columns in the card view in desktop mode when filters are opened.. Fixes: https://bugs.launchpad.net/bugs/977817. Approved by Mirco Müller, Marco Trevisan (Treviño), Andrea Cimitan.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug #977817.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Fixes position of "show desktop" icon-LP:964073. Fixes: https://bugs.launchpad.net/bugs/964073. Approved by Marco Trevisan (Treviño).
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Fixed braces
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Fixed indentation
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Fixed ccsm problem
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Removed excess DesktopLauncherIcons()
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Re-added code
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Made fix more explicit-thanks Marco
+
[phone]  Michael Rawson  <[e-mail]>
+
+	Moved show desktop icon to intended position
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowButtons: avoid to disable the Overlay close button.
+	
+	This fixes a regression I probabily introduced (sorry).. Fixes: https://bugs.launchpad.net/bugs/986264. Approved by Andrea Azzarone.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowButtons: remove extra space, and be more crash-safe
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowButtons: avoid to disable the Overlay close button.
+	
+	This fixes a regression I probabily introduced (sorry).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Don't activate "home.lens" during dash closing.. Fixes: https://bugs.launchpad.net/bugs/914785. Approved by Michal Hruby, Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Don't activate the home lens during the dash closing.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Update IBus tests to only set the IME once per test case class.. Fixes: . Approved by Brandon Schaefer, Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Use a single setUpClass method.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* setUpClass, not tearDownClass
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Removed param, as it is no longer needed
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Now the ibus only reset the context when it changes test engines
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Changed to deactivate to an explicit call
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Fix potential pointer lockup on initial drag gesture.. Fixes: https://bugs.launchpad.net/bugs/979418. Approved by Marco Trevisan (Treviño), Alex Launi.
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Add test comment
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Fix pointer locking up after three touch window drag
+	
+	GestureEngine::EndDrag() checks if a drag gesture was performed before
+	ungrabbing the pointer. Unfortunately, it checks if the gesture ID is
+	non-zero, but a zero ID is valid. We don't need to check the gesture ID
+	at all since the drag window is maintained properly.
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Add regression test for drag gesture pointer grabs not being removed
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Add grab counting in compiz screen mock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowButtons: disable the close button if the controlled window is not closable
+	
+	Added support to WindowManager to get if a window is closable and maximizable, then used the IsWindowClosable method to enable or disable the close window button.. Fixes: https://bugs.launchpad.net/bugs/981196. Approved by Thomi Richards, Brandon Schaefer.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual-tests: WindowButtons, added test case for disabled close button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowButtons: disable the close button if the controlled window is not closable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add functions to get if a window is maximizable and closable
+
[phone]  Thomi Richards  <[e-mail]>
+
+	IBus autopilot tests now wait for input method context to be created before typing characters.. Fixes: . Approved by Brandon Schaefer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	ibus tests now wait for ibus to be activated in the target widget. This removes the need for sleep statements alltogether.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	IBus tests now wait until the im_active property on the SearchBar is set to true.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	First pass at fixing the ibus tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged launcher tests fix, needed by this branch.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a sanity check to avoid crashes.. Fixes: https://bugs.launchpad.net/bugs/982730. Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Adds a sanity check to avoid crashes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixes autopilot launcher test.. Fixes: . Approved by Alex Launi.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed launcher emulator and tests.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Finetune priorities when updating dash results, prevents flickering. Fixes: https://bugs.launchpad.net/bugs/961979. Approved by Gord Allott.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Finetune priorities when updating dash results, prevents flickering
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Shortcut hint tests now all pass.. Fixes: . Approved by Alex Launi.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed shortcut hint tests, cleaned up the shortcut hint controller, and made tests use the new Eventually() matcher, which eliminates the need for many sleep() statements.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed two failing tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Improve autopilot assertion messages inside the new wait_for method.. Fixes: . Approved by Alex Launi.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Autopilot wait_for assertions have a slightly better error message.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed failing panel autopilot tests.. Fixes: . Approved by Brandon Schaefer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed two failing panel tests.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	HudIcon now filters out windows on different workspaces and windows that are hidden.. Fixes: . Approved by Marco Trevisan (Treviño).
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* changed xid back to a 0, not a pointer
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed ap test
+	* Uses nullptr now
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* remove debug include
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed the ? icon appearing.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added ap test
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Now the hud filters out windows on different workspaces for the HudIcon.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed a failing test in the command_lens test suite.. Fixes: . Approved by Brandon Schaefer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed a failing command lens test. Somehow the assertion got inverted in the porting process.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Hud autopilot tests use the new Eventually autopilot matcher to reduce the number of test failures due to timing issues.. Fixes: . Approved by Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged trunk, resolved conflicts.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed indent error
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed the dash test that was removed
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* uses properties
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts* merged trunk, fixed conflicts
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed 2 ap fails
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView: fixed the quicklist key navigation, to make it consistent with Gtk menus navigation.
+	
+	The prelight of the items is now completely controlled by QuicklistView and never by QuicklistMenuItem, the children can define now when they are slectable.. Fixes: https://bugs.launchpad.net/bugs/911561, https://bugs.launchpad.net/bugs/978926, https://bugs.launchpad.net/bugs/979096. Approved by Thomi Richards.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_quicklist: cyclic keynav docstring fixes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_quicklist: use the Eventually matcher to avoid false-negatives
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot: quicklist emulator, applying Thomi's fixes.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_quicklist: docstrings updated.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot: quicklist, use only properties
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestQuicklistMenuitems: added GetSelectable tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, quicklist: added other tests to check the cyclic key-navigation
+	
+	Also the quicklist emulator now includes the selectable_items property
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, quicklist: use the new selectable item property instead of computing it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistMenuItem: add GetSelectable virtual method
+	
+	So each item can define when it's possible to select them, by default all
+	the items are selectable when visible and enabled, while the Separator
+	item can never be selected.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, quicklist: add more last/first tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_quicklist: added first bunch of key navigation tests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView, QuicklistMenuItem: export absolute geometries for introspection
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView: add support to Home/End Page up/down buttons to select items
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView: use the new SelectItem into RecvItemMouseDrag
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistMenuItem: don't change the focus on move, only on enter/leave
+	
+	This to keep the consistency with GTK menus.
+	Also when leaving an unselected entry, we shouldn't unselect all.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistMenuItem: make the introspection prelight name more explicit
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView: enhance the key navigation to follow the same menus behavior
+	
+	1) When no item is selected pressing the Down arrow key should
+	select the first item (from top)
+	2) When no item is selected pressing the Up arrow key should
+	select the last item (from top)
+	3) When the last item is selected, pressing the Down arrow key
+	should select the first item
+	4) When the first item is selected, pressing the Up arrow key
+	should select the last item
+	
+	All these cases assume that the mouse pointer is outside the
+	quicklist or over an item and not moving, in the case that the
+	mouse pointer is moved over an unselected item, the focus should
+	be moved to that item.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	QuicklistView: manage the prelight item status, avoid double-selected items
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Update HUD tests to use the new Eventually() matcher.. Fixes: . Approved by Brandon Schaefer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Removed unused import, fixed reference to property being treated as a function.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged trunk.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Cleaned up code after review.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Hud tests now use Eventually() matcher object instead of wait_for.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixed going from the Hud to the Dash forgetting window focus when exiting from the Dash.. Fixes: https://bugs.launchpad.net/bugs/984639. Approved by Andrea Azzarone, Thomi Richards.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Use the correct assert
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* removed sleep
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes Hud to Dash not restoring window focus
+	* Also fixes a Dash ap test failing
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Home lens tests use wait_for instead of explicit sleep statements.. Fixes: . Approved by Brandon Schaefer, Alex Launi, Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged trunk, reso;lved conflicts.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Home lens tests now use the Eventually() syntax.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	IBus tests use new Eventually matcher.. Fixes: . Approved by Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	IBus tests now use the Eventually() matcher instead of wait_for.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Don't close the dash if the click is inside the desktop dash border.. Fixes: https://bugs.launchpad.net/bugs/839472. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix AP test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes typo. Adds AP test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Clicking on the desktop dash border should do nothing, *NOT* close the dash.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Make sure we don't try to remove sources that were already removed.. Fixes: . Approved by Marco Trevisan (Treviño), Andrea Azzarone.
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Don't remove invalid sources
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #980924.. Fixes: https://bugs.launchpad.net/bugs/980924. Approved by Gord Allott, Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unneeded code.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes LP bug #980924.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: code updated to be more C++ friendly.
+	
+	Also moved into the unity namespace.. Fixes: . Approved by Andrea Azzarone.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: ref the GdkScreen object we own.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: code updated to be more C++ friendly.
+	
+	Also moved into the unity namespace.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix compilation of standalone launcher.. Fixes: https://bugs.launchpad.net/bugs/983989. Approved by Marco Trevisan (Treviño), Sam Spilsbury.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix standalone launcher.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use std::shared_ptr::reset instead of = some::Ptr(new...) for UScreen::proxy_. Fixes: . Approved by Marco Trevisan (Treviño).
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Revert prev commit. Use std::shared_ptr::reset.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Makes UScreen::proxy_ a unity::glib::DBusProxy.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug #977922.. Fixes: https://bugs.launchpad.net/bugs/977922. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug #977922.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix the switcher so it displays the full title of apps in Chinese. Fixes: https://bugs.launchpad.net/bugs/830801. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a manual test.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug #830801.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Launcher tests use Eventually() matcher.. Fixes: . Approved by Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Launcher emulator now uses wait_for to block until the action has been performed. Reduces the need for sleep() statements inside tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Launcher tests now use Eventually() matcher. Also removed some cruft from the launcher emulators.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged ibus-test-to-wait_for-feature into launcher-tests-pep8-whitespace-fixes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged hud-tests-to-wait_for-feature into ibus-test-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged ibus-test-to-wait_for-feature into launcher-tests-pep8-whitespace-fixes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged hud-tests-to-wait_for-feature into ibus-test-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged ibus-test-to-wait_for-feature into launcher-tests-pep8-whitespace-fixes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged hud-tests-to-wait_for-feature into ibus-test-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixes PEP8 and whitespace issues.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	IBUs tests now make use of the wait_for attribute feature. Also refactored the ibus tests so many of them are only a few lines long, and reduced the amount of duplicated code.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged dash-tests-to-wait_for-feature into home-lens-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixes several timing issues. Unity exports some properties in arrays, which makes it slightly tricky to use the wait_for feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	More hud test changes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Hud test changes first pass merge.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Home lens uses wait_for instead of explicit sleeps.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Dash autopilot tests use the new autopilot wait_for feature.. Fixes: . Approved by Brandon Schaefer, Tim Penhey.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Missed one spot.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Dash tests changed to use Eventually matcher.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	fixed code after code review.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	More fixes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged fix-command-lens-ap-tests-with-new-wait_for-featuer into dash-tests-to-wait_for-feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged in code to fix up the dash tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Command lens uses Eventually() autopilot matcher to eliminate the need for sleep() statements in autopilot tests.. Fixes: . Approved by Brandon Schaefer, Tim Penhey.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Updated to use the Eventually matcher.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged wait_for-to-use-testtools-exception into fix-command-lens-ap-tests-with-new-wait_for-featuer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Removed unused import
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Command lens tests updated to use the new wait_for feature, and various other API fixes.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Cleaned up docstrings and whitespace in autopilot panel tests.. Fixes: . Approved by Tim Penhey.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Whitespace, PEP8 and PEP257 fixes for the panel tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Adds an Eventually() matcher that allows us to block a while until a unity attribute matches a testtools match object.. Fixes: . Approved by Tim Penhey, Thomi Richards.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Check match and wait_for attribute are callables.:
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed code from review.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed code from review.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix some uninitialized variables.. Fixes: https://bugs.launchpad.net/bugs/983333. Approved by Tim Penhey.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix bug #983333
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #983268. Fixes: https://bugs.launchpad.net/bugs/983268. Approved by Thomi Richards.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #983268.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Extend the autopilot wait_for feature to use testtools matcher instances as well as ordinary values. Also added an 'Eventually' matcher which makes tests more explicit.. Fixes: . Approved by Alex Launi.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fixed typo
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Added 'Eventually' autopilot matcher.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Extend the autopilot wait_for feature to use testtools matcher instances as well as ordinary values.. Fixes: . Approved by Alex Launi.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Don't use hasattr,
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Cleaned up code after code review.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	wait_for now deals with attributes that have a '-' in them correctly.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	wait_for attribute now accept testtools matchers.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Attribute wait_for feature now raises an AssertionError instead of a RuntimeError. THis will make unit tests FAIL instead of ERRORing when wa wait_for call fails.
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Fix transparent panel in non-GLSL hardware, and use bool 'false' instead 'FALSE'. Fixes: https://bugs.launchpad.net/bugs/965323. Approved by Robert Carr, Michal Hruby.
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Correct fix for 965323
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Use false as boolean instead FALSE, whitespaces
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Attempt to fix 965323
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Added the autopilot wait_for attribute feature.. Fixes: . Approved by Marco Trevisan (Treviño), Brandon Schaefer.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Dash and hud emulators use new wait_for attribute feature.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged autopilot-attribute-feature into convert-to-use-wait_for.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Don't change dash in this pipeline.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged branch that fixes the multi key code.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Cleaned up gsettings calling code. Don't want to run command through a shell, and removed extra quotes.
+
[phone]  Alex Launi  <[e-mail]>
+
+	Small fixes for compose key tests
+
[phone]  Alex Launi  <[e-mail]>
+
+	Args should be a list not a tuple
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Merged trunk.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Dash tests now use new autopilot wait_for mechanism.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Fix unity logging reset.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Feature seems to work. Trying it out on the dash tests.
+
[phone]  Thomi Richards  <[e-mail]>
+
+	Removed old code, added special sauce.
+
[phone]  Lars Uebernickel  <[e-mail]>
+
+	Force menu reposition on popup in case its contents have changed.
+	
+	Fixes bug 883317.. Fixes: https://bugs.launchpad.net/bugs/883317. Approved by Marco Trevisan (Treviño).
+
[phone]  Lars Uebernickel  <[e-mail]>
+
+	Force menu reposition on popup in case its contents have changed
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix a couple of wrong reference/memory management issues. Fixes: https://bugs.launchpad.net/bugs/979429. Approved by Marco Trevisan (Treviño).
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix possible signal disconnection on already dead object
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix incorrect string freeing in Hud
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix wrong unref in DebugInterface
+
[phone]  Gord Allott  <[e-mail]>
+
+	Small fix for the unity cmake, depend on unity core was missing from a test. Fixes: . Approved by Michal Hruby.
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixes small cmake depends issue
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	The shortcut keys in workspace section of the shortcut overlay aren't translated.. Fixes: https://bugs.launchpad.net/bugs/980828. Approved by Didier Roche.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fixes bug #980828.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Fix the behaviour of alt-tab and clicking on the launcher icon to just raise the most recently used window, not all for that app.
+	
+	
+	BamfLauncherIcon's activation related code has been updated to be more multimonitor aware (for free I've fixed also some bugs that caused the windows not to be put in spread mode in multi-monitor), and to support both the "Launcher only on Primary Monitor" and "Launcher on all monitors" options.
+	
+	PluginAdapter's FocusWindowGroup method has been updated to optionally only unminimize / raise and activate only the top window. This code would have been more optimized using a reverse iterator to fetch the top_window, but not to change the whole logic and to allow to keep the previous behavior (that initially we wanted for "long alt+tab") without duplicating code, I've just hacked that.
+	Implemented also GetWindowMonitor to workaround the mismatch we had with the compiz' window->outputDevice() and the UScreen values that now we use in the whole unity.
+	
+	Screencast of the fixed version: http://ubuntuone.com/7YaWciQnaZHfzr35asSz0N. Fixes: https://bugs.launchpad.net/bugs/861250, https://bugs.launchpad.net/bugs/959339, https://bugs.launchpad.net/bugs/981795. Approved by Thomi Richards, Tim Penhey.
+
[phone]  Tim Penhey  <[e-mail]>
+
+	Test the alt-tab appears on the monitor that has window focus.
+
[phone]  Tim Penhey  <[e-mail]>
+
+	Add window stack assertions to the switcher tests.
+
[phone]  Tim Penhey  <[e-mail]>
+
+	Assert that the visible window stack is what we expect.
+
[phone]  Tim Penhey  <[e-mail]>
+
+	More AP test tweaks.
+
[phone]  Tim Penhey  <[e-mail]>
+
+	Tweaks to the test.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: avoid to raise and unminimize top_window if already done
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: be more clear in comment (yeah?)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: use GetMonitorAtPosition in GetMonitorWithMouse
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager, BamfLauncherIcon: some code cleanup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_launcher: updated click test to check minimized windows too
+	
+	Removed debug data
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot, test_switcher: updated against new updates
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	unityshell: show the Alt+Tab window in the monitor where is the active window
+	
+	As per design.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add method to get the active window.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: removing debugging bits
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with branch changes
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* removed something that got added somehow
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added an AP test for the new design changes.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherController: Removing the code for the Quick Alt+Tab, it should behave always at the same way
+	
+	19:11:04 <JohnLea> so to summarize the above, when a app icon is selected
+	in Alt-Tab, the most recently focused window (on any monitor, but only in
+	the current workspace) of that application which is not minimised
+	should be focused
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	autopilot: fixed the AP test
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: Also invisible windows shouldn't be counted as available in monitor
+	
+	Now the spread works as expected, clicking on each monitor's panel! ;)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: don't consider an unmapped window as one in monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: focus a window if the application is not active on the current monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: if the current launcher is used for all the monitors, don't filter windows per monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherController: include the switcher monitor when activating a group
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add GetWindowMonitor method, and use UScreen to fetch it
+	
+	This now used in PluginAdapter not to have inconsistences.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UScreen: allow to get the monitor for a given point
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	unityshell: switcher, use UScreen to get the monitor value.
+	
+	Not using this can cause inconsistences, due to the fact that compiz
+	numbers the devices in a different way.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter::FocusWindowGroup: add a parameter to define if focusing the on-top window only
+	
+	This allow to be more monitor/VP safe
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* remove extra line
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed the No new line error diff was reporting
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* merged trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* removed random dash '-'
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Add autopilot test for both bugs!
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added more autopilot test for quick alt+tab
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* merged trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* merged trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added 2 autopilot test showing quick tab is true when pressed fast enough
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* fixed manual test I messed up
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added a timer for quick tab
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merged trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Added another manual test
+	* Fixes
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixed tabbing issues
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merged with trunk, fixed conficts
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: don't include dialog windows on Alt+Tab.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	manual-tests: Added test for QuickAltTab
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: Add support for the FocusVisibility::OnlyVisibleOnTop on FocusWindowGroup
+	
+	When a group is asked to focus with OnlyVisibleOnTop, we look for the
+	first non-minimized window on top of the stack and we raise and activate it.
+	
+	Code indentation fixes included.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BamfLauncherIcon: when we receive a "quick" activate, use the OnlyVisibleOnTop focus visbility
+	
+	Defined a new FocusVisibility called OnlyVisibleOnTop that is meant
+	to only focus the first application window on top of the stack.
+	That is used when we receive a Switcher activate with a button != 0.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherController: use the button value of ActionArg to indicate the switch type
+	
+	Instead of defining another type of ActionArg, I've used the button value
+	of ActionArg to define if we're currently performing a quick-alt+tab or
+	a standard switch.
+	Basically: 
+
[phone]  Alexandros Frantzis  <[e-mail]>
+
+	Fix compilation with OpenGL ES 2.0.. Fixes: . Approved by Sam Spilsbury.
+
[phone]  Alexandros Frantzis  <[e-mail]>
+
+	Fix compilation with OpenGL ES 2.0.
+
[phone]  Gord Allott  <[e-mail] >
+
+	fixes an uninitalised variable in the dashview code
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixed uninitalised value
+
[phone]  Didier Roche  <[e-mail]>
+
+	Release\ 5.10.0
+
+>>>>>>> MERGE-SOURCE
 2012-04-12  Michal Hruby  <[e-mail]>
 
 	Make sure the lenses search for things we want on startup. Fixes: https://bugs.launchpad.net/bugs/979799. Approved by Gord Allott.

=== modified file 'UnityCore/GLibSignal.cpp'
=== modified file 'UnityCore/GLibSignal.h'
--- UnityCore/GLibSignal.h	2012-07-16 11:03:32 +0000
+++ UnityCore/GLibSignal.h	2012-08-03 16:26:24 +0000
@@ -86,6 +86,7 @@
 public:
   SignalManager();
   void Add(SignalBase* signal);
+<<<<<<< TREE
   void Add(SignalBase::Ptr const& signal);
   template <typename R, typename G, typename... Ts>
   void Add(G object, std::string const& signal_name, typename Signal<R, G, Ts...>::SignalCallback const& callback)
@@ -97,6 +98,12 @@
 
 protected:
   std::vector<SignalBase::Ptr> connections_;
+=======
+  void Disconnect(void* object, std::string const& signal_name = "");
+
+private:
+  ConnectionVector connections_;
+>>>>>>> MERGE-SOURCE
 };
 
 }

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-06-27 05:03:08 +0000
+++ dash/DashController.cpp	2012-08-03 16:26:24 +0000
@@ -67,9 +67,30 @@
       nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
     }
   });
-
-  auto spread_cb = sigc::bind(sigc::mem_fun(this, &Controller::HideDash), true);
-  PluginAdapter::Default()->initiate_spread.connect(spread_cb);
+<<<<<<< TREE
+=======
+
+  auto spread_cb = sigc::bind(sigc::mem_fun(this, &Controller::HideDash), true);
+  PluginAdapter::Default()->initiate_spread.connect(spread_cb);
+}
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
+  auto spread_cb = sigc::bind(sigc::mem_fun(this, &Controller::HideDash), true);
+  PluginAdapter::Default()->initiate_spread.connect(spread_cb);
+=======
+Controller::~Controller()
+{
+  if (window_)
+    window_->UnReference();
+  window_ = 0;
+
+  if (timeline_id_)
+    g_source_remove(timeline_id_);
+
+  if (ensure_id_)
+    g_source_remove(ensure_id_);
+>>>>>>> MERGE-SOURCE
 }
 
 void Controller::SetupWindow()
@@ -258,6 +279,10 @@
     need_show_ = true;
     return;
   }
+<<<<<<< TREE
+=======
+
+>>>>>>> MERGE-SOURCE
   view_->AboutToShow();
 
   window_->ShowWindow(true);

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-07-10 03:27:49 +0000
+++ dash/DashView.cpp	2012-08-03 16:26:24 +0000
@@ -29,10 +29,17 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/RadioOptionFilter.h>
 
+<<<<<<< TREE
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/KeyboardUtil.h"
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/UBusMessages.h"
+=======
+#include "DashStyle.h"
+#include "DashSettings.h"
+#include "UBusMessages.h"
+#include "KeyboardUtil.h"
+>>>>>>> MERGE-SOURCE
 
 namespace unity
 {
@@ -105,9 +112,20 @@
 
 DashView::~DashView()
 {
+<<<<<<< TREE
   // Do this explicitely, otherwise dee will complain about invalid access
   // to the lens models
   RemoveLayout();
+=======
+  if (searching_timeout_id_)
+    g_source_remove (searching_timeout_id_);
+  if (hide_message_delay_id_)
+    g_source_remove(hide_message_delay_id_);
+
+  // Do this explicitely, otherwise dee will complain about invalid access
+  // to the lens models
+  RemoveLayout ();
+>>>>>>> MERGE-SOURCE
 }
 
 void DashView::SetMonitorOffset(int x, int y)
@@ -762,9 +780,15 @@
   ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 }
 
+<<<<<<< TREE
 nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
                                       unsigned long x11_key_code,
                                       unsigned long special_keys_state)
+=======
+Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
+                                 unsigned long x11_key_code,
+                                 unsigned long special_keys_state)
+>>>>>>> MERGE-SOURCE
 {
   // Only care about states of Alt, Ctrl, Super, Shift, not the lock keys
   special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |
@@ -773,8 +797,12 @@
   // Do what nux::View does, but if the event isn't a key navigation,
   // designate the text entry to process it.
 
+<<<<<<< TREE
   using namespace nux;
   nux::KeyNavDirection direction = KEY_NAV_NONE;
+=======
+  nux::KeyNavDirection direction = KEY_NAV_NONE;
+>>>>>>> MERGE-SOURCE
   bool ctrl = (special_keys_state & NUX_STATE_CTRL);
 
   switch (x11_key_code)

=== modified file 'dash/LensBar.cpp'
=== modified file 'dash/LensBarIcon.cpp'
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-06-18 02:57:23 +0000
+++ dash/PlacesGroup.cpp	2012-08-03 16:26:24 +0000
@@ -340,11 +340,17 @@
 void
 PlacesGroup::Relayout()
 {
+<<<<<<< TREE
   if (_relayout_idle)
     return;
 
   _relayout_idle.reset(new glib::Idle(glib::Source::Priority::HIGH));
   _relayout_idle->Run(sigc::mem_fun(this, &PlacesGroup::OnIdleRelayout));
+=======
+  if (_idle_id == 0)
+    _idle_id = g_idle_add_full(G_PRIORITY_HIGH,
+                               (GSourceFunc)OnIdleRelayout, this, NULL);
+>>>>>>> MERGE-SOURCE
 }
 
 bool

=== modified file 'dash/ResultRendererTile.cpp'
=== modified file 'dash/ResultView.cpp'
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-07-30 16:24:18 +0000
+++ dash/ResultViewGrid.cpp	2012-08-03 16:26:24 +0000
@@ -52,7 +52,14 @@
   , mouse_over_index_(-1)
   , active_index_(-1)
   , selected_index_(-1)
+<<<<<<< TREE
   , last_lazy_loaded_result_(0)
+=======
+  , preview_row_(0)
+  , last_lazy_loaded_result_ (0)
+  , lazy_load_handle_(0)
+  , view_changed_handle_(0)
+>>>>>>> MERGE-SOURCE
   , last_mouse_down_x_(-1)
   , last_mouse_down_y_(-1)
   , recorded_dash_width_(-1)
@@ -63,7 +70,15 @@
 {
   SetAcceptKeyNavFocusOnMouseDown(false);
 
+<<<<<<< TREE
   auto needredraw_lambda = [&](int value) { NeedRedraw(); };
+=======
+  auto needredraw_lambda = [&](int value)
+  {
+    NeedRedraw();
+  };
+
+>>>>>>> MERGE-SOURCE
   horizontal_spacing.changed.connect(needredraw_lambda);
   vertical_spacing.changed.connect(needredraw_lambda);
   padding.changed.connect(needredraw_lambda);
@@ -98,6 +113,26 @@
   });
 
   SetDndEnabled(true, false);
+<<<<<<< TREE
+=======
+}
+
+ResultViewGrid::~ResultViewGrid()
+{
+  if (lazy_load_handle_)
+    g_source_remove(lazy_load_handle_);
+
+  if (view_changed_handle_)
+    g_source_remove(view_changed_handle_);
+}
+
+gboolean ResultViewGrid::OnLazyLoad (gpointer data)
+{
+  ResultViewGrid *self = (ResultViewGrid*)data;
+  self->lazy_load_handle_ = 0;
+  self->DoLazyLoad();
+  return FALSE;
+>>>>>>> MERGE-SOURCE
 }
 
 void ResultViewGrid::QueueLazyLoad()
@@ -107,6 +142,7 @@
   last_lazy_loaded_result_ = 0; // we always want to reset the lazy load index here
 }
 
+<<<<<<< TREE
 void ResultViewGrid::QueueViewChanged()
 {
   if (!view_changed_idle_)
@@ -126,6 +162,28 @@
 
 bool ResultViewGrid::DoLazyLoad()
 {
+=======
+void ResultViewGrid::QueueViewChanged()
+{
+  if (view_changed_handle_ == 0)
+  {
+    // using G_PRIORITY_HIGH because this needs to happen *before* next draw
+    view_changed_handle_ = g_idle_add_full (G_PRIORITY_HIGH,
+                                            [](gpointer data) -> gboolean
+    {
+      ResultViewGrid *self = (ResultViewGrid*)data;
+      self->SizeReallocate();
+      self->last_lazy_loaded_result_ = 0; // reset the lazy load index
+      self->DoLazyLoad(); // also calls QueueDraw
+      self->view_changed_handle_ = 0;
+      return FALSE;
+    }, this, NULL);
+  }
+}
+
+void ResultViewGrid::DoLazyLoad()
+{
+>>>>>>> MERGE-SOURCE
   // FIXME - so this code was nice, it would only load the visible entries on the screen
   // however nux does not give us a good enough indicator right now that we are scrolling,
   // thus if you scroll more than a screen in one frame, you will end up with at least one frame where
@@ -472,8 +530,13 @@
 {
   SizeReallocate();
   QueueLazyLoad();
+<<<<<<< TREE
 
   return ResultView::ComputeContentSize();
+=======
+  long ret = ResultView::ComputeContentSize();
+  return ret;
+>>>>>>> MERGE-SOURCE
 }
 
 

=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2012-06-18 02:57:23 +0000
+++ dash/ResultViewGrid.h	2012-08-03 16:26:24 +0000
@@ -79,19 +79,42 @@
   typedef std::tuple <int, int> ResultListBounds;
   ResultListBounds GetVisableResults();
 
+<<<<<<< TREE
+=======
+  static gboolean OnLazyLoad(gpointer data);
+>>>>>>> MERGE-SOURCE
   void QueueLazyLoad();
+<<<<<<< TREE
   void QueueViewChanged();
   bool DoLazyLoad();
+=======
+  void QueueViewChanged();
+  void DoLazyLoad();
+>>>>>>> MERGE-SOURCE
 
   int GetItemsPerRow();
   void SizeReallocate();
+<<<<<<< TREE
+=======
+  void PositionPreview();
+>>>>>>> MERGE-SOURCE
 
   uint mouse_over_index_;
   int active_index_;
-  nux::Property<int> selected_index_;
+<<<<<<< TREE
+  nux::Property<int> selected_index_;
+=======
+  nux::Property<int> selected_index_;
+  uint preview_row_;
+>>>>>>> MERGE-SOURCE
   std::string focused_uri_;
 
   int last_lazy_loaded_result_;
+<<<<<<< TREE
+=======
+  unsigned lazy_load_handle_;
+  unsigned view_changed_handle_;
+>>>>>>> MERGE-SOURCE
   int last_mouse_down_x_;
   int last_mouse_down_y_;
   std::string current_drag_uri_;

=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2012-07-04 02:37:23 +0000
+++ hud/HudButton.cpp	2012-08-03 16:26:24 +0000
@@ -33,8 +33,13 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
 
+<<<<<<< TREE
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/StaticCairoText.h"
+=======
+#include "DashStyle.h"
+#include "StaticCairoText.h"
+>>>>>>> MERGE-SOURCE
 
 #include "HudButton.h"
 #include "HudPrivate.h"
@@ -52,6 +57,7 @@
 namespace hud
 {
 
+<<<<<<< TREE
 NUX_IMPLEMENT_OBJECT_TYPE(HudButton);
 
 HudButton::HudButton(NUX_FILE_LINE_DECL)
@@ -64,6 +70,20 @@
   hlayout_->SetLeftAndRightPadding(hlayout_left_padding, -1);
   SetLayout(hlayout_);
 
+=======
+NUX_IMPLEMENT_OBJECT_TYPE(HudButton);
+
+HudButton::HudButton (NUX_FILE_LINE_DECL)
+    : nux::Button (NUX_FILE_LINE_PARAM)
+    , is_rounded(false)
+    , is_focused_(false)
+    , skip_draw_(true)
+{
+  hlayout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+  hlayout_->SetLeftAndRightPadding(hlayout_left_padding, -1);
+  SetLayout(hlayout_);
+
+>>>>>>> MERGE-SOURCE
   InitTheme();
 
   key_nav_focus_change.connect([&](nux::Area*, bool, nux::KeyNavDirection)
@@ -77,6 +97,9 @@
   });
 }
 
+HudButton::~HudButton() {
+}
+
 void HudButton::InitTheme()
 {
   is_rounded.changed.connect([&](bool)
@@ -198,6 +221,7 @@
 {
   query_ = query;
   label = query->formatted_text;
+<<<<<<< TREE
 
   auto items(impl::RefactorText(label));
 
@@ -209,6 +233,19 @@
     text->SetFont(button_font);
     hlayout_->AddView(text, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   }
+=======
+
+  auto items(impl::RefactorText(label()));
+
+  hlayout_->Clear();
+  for (auto item : items)
+  {
+    nux::StaticCairoText* text = new nux::StaticCairoText(item.first);
+    text->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, item.second ? 1.0f : 0.5f));
+    text->SetFont(button_font);
+    hlayout_->AddView(text, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 Query::Ptr HudButton::GetQuery()
@@ -231,8 +268,12 @@
 void HudButton::AddProperties(GVariantBuilder* builder)
 {
   variant::BuilderWrapper(builder)
+<<<<<<< TREE
     .add("label", label())
     .add("focused", fake_focused());
+=======
+    .add("label", label());
+>>>>>>> MERGE-SOURCE
 }
 
 } // namespace hud

=== modified file 'hud/HudButton.h'
--- hud/HudButton.h	2012-06-27 21:32:48 +0000
+++ hud/HudButton.h	2012-08-03 16:26:24 +0000
@@ -27,6 +27,7 @@
 #include <Nux/Button.h>
 #include <Nux/TextureArea.h>
 #include <UnityCore/Hud.h>
+<<<<<<< TREE
 #include "unity-shared/Introspectable.h"
 
 namespace nux { class HLayout; }
@@ -36,15 +37,34 @@
 namespace hud
 {
 
+=======
+
+#include "Introspectable.h"
+
+namespace nux { class HLayout; }
+
+namespace unity
+{
+namespace hud
+{
+
+>>>>>>> MERGE-SOURCE
 class HudButton : public nux::Button, public unity::debug::Introspectable 
 {
   NUX_DECLARE_OBJECT_TYPE(HudButton, nux::Button);
 
 public:
   typedef nux::ObjectPtr<HudButton> Ptr;
+<<<<<<< TREE
 
   HudButton(NUX_FILE_LINE_PROTO);
 
+=======
+
+  HudButton (NUX_FILE_LINE_PROTO);
+  virtual ~HudButton();
+  
+>>>>>>> MERGE-SOURCE
   void SetQuery(Query::Ptr query);
   std::shared_ptr<Query> GetQuery();
 
@@ -62,8 +82,13 @@
 
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
+<<<<<<< TREE
  
   void InitTheme();
+=======
+
+  void InitTheme();
+>>>>>>> MERGE-SOURCE
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
 
 private:

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-06-26 02:22:44 +0000
+++ hud/HudController.cpp	2012-08-03 16:26:24 +0000
@@ -16,11 +16,14 @@
  * Authored by: Gord Allott <[e-mail]>
  */
 
+#include <config.h>
+
 #include "HudController.h"
 
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <UnityCore/Variant.h>
+<<<<<<< TREE
 
 #include "unity-shared/WindowManager.h"
 #include "unity-shared/PanelStyle.h"
@@ -28,6 +31,13 @@
 #include "unity-shared/UScreen.h"
 
 #include "config.h"
+=======
+#include "WindowManager.h"
+#include "PanelStyle.h"
+#include "UBusMessages.h"
+#include "UScreen.h"
+
+>>>>>>> MERGE-SOURCE
 #include <libbamf/libbamf.h>
 
 namespace unity
@@ -50,7 +60,12 @@
   , timeline_animator_(90)
   , view_(nullptr)
   , monitor_index_(0)
-  , view_function_(function)
+<<<<<<< TREE
+  , view_function_(function)
+=======
+  , type_wait_handle_(0)
+  , view_function_(function)
+>>>>>>> MERGE-SOURCE
 {
   LOG_DEBUG(logger) << "hud startup";
   SetupWindow();
@@ -85,6 +100,25 @@
   EnsureHud();
 }
 
+<<<<<<< TREE
+=======
+Controller::~Controller()
+{
+  if (window_)
+    window_->UnReference();
+  window_ = 0;
+
+  if (timeline_id_)
+    g_source_remove(timeline_id_);
+
+  if (ensure_id_)
+    g_source_remove(ensure_id_);
+
+  if (type_wait_handle_)
+    g_source_remove(type_wait_handle_);
+}
+
+>>>>>>> MERGE-SOURCE
 void Controller::SetupWindow()
 {
   window_.Adopt(new nux::BaseWindow("Hud"));
@@ -412,8 +446,13 @@
   {
     if (!visible_)
     {
+<<<<<<< TREE
       window_->ShowWindow(false);
       view_->ResetToDefault();
+=======
+      self->window_->ShowWindow(false);
+      self->view_->ResetToDefault();
+>>>>>>> MERGE-SOURCE
     }
     else
     {

=== modified file 'hud/HudController.h'
--- hud/HudController.h	2012-06-18 02:57:23 +0000
+++ hud/HudController.h	2012-08-03 16:26:24 +0000
@@ -44,7 +44,12 @@
 public:
   typedef std::shared_ptr<Controller> Ptr;
 
-  Controller(std::function<AbstractView*(void)> const& function = []() { return new View; });
+<<<<<<< TREE
+  Controller(std::function<AbstractView*(void)> const& function = []() { return new View; });
+=======
+  Controller(std::function<AbstractView*(void)> const& function = []() { return new View; });
+  ~Controller();
+>>>>>>> MERGE-SOURCE
 
   nux::BaseWindow* window() const;
 
@@ -104,7 +109,12 @@
 
   Animator timeline_animator_;
 
-  AbstractView* view_;
+<<<<<<< TREE
+  AbstractView* view_;
+=======
+  AbstractView* view_;
+  guint ensure_id_;
+>>>>>>> MERGE-SOURCE
   std::string focused_app_icon_;
   nux::Layout* layout_;
   uint monitor_index_;
@@ -113,7 +123,15 @@
   std::function<AbstractView*(void)> view_function_;
 };
 
-} // namespace hud
-} // namespace unity
-
-#endif // UNITYSHELL_HUD_CONTROLLER_H
+<<<<<<< TREE
+} // namespace hud
+} // namespace unity
+
+#endif // UNITYSHELL_HUD_CONTROLLER_H
+=======
+} // namespace hud
+} // namespace unity
+
+#endif // UNITYSHELL_HUD_CONTROLLER_H
+
+>>>>>>> MERGE-SOURCE

=== modified file 'hud/HudIcon.h'
=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-07-10 03:27:49 +0000
+++ hud/HudView.cpp	2012-08-03 16:26:24 +0000
@@ -25,12 +25,19 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
 #include <Nux/HLayout.h>
+<<<<<<< TREE
 #include <Nux/VLayout.h>
 
 #include "unity-shared/Introspectable.h"
 
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/DashStyle.h"
+=======
+#include <Nux/VLayout.h>
+
+#include "UBusMessages.h"
+#include "DashStyle.h"
+>>>>>>> MERGE-SOURCE
 
 namespace unity
 {
@@ -58,8 +65,14 @@
 NUX_IMPLEMENT_OBJECT_TYPE(View);
 
 View::View()
+<<<<<<< TREE
   : AbstractView()
   , button_views_(nullptr)
+=======
+  : AbstractView()
+  , button_views_(NULL)
+  , timeline_id_(0)
+>>>>>>> MERGE-SOURCE
   , start_time_(0)
   , last_known_height_(0)
   , current_height_(0)
@@ -118,6 +131,16 @@
 
 View::~View()
 {
+<<<<<<< TREE
+=======
+  for (auto button = buttons_.begin(); button != buttons_.end(); button++)
+  {
+    RemoveChild((*button).GetPointer());
+  }
+
+  if (timeline_id_)
+    g_source_remove(timeline_id_);
+>>>>>>> MERGE-SOURCE
 }
 
 void View::ProcessGrowShrink()
@@ -166,9 +189,15 @@
 
 void View::ResetToDefault()
 {
+<<<<<<< TREE
   SetQueries(Hud::Queries());
   current_height_ = content_layout_->GetBaseHeight();;
 
+=======
+  SetQueries(Hud::Queries());
+  current_height_ = content_layout_->GetBaseHeight();
+
+>>>>>>> MERGE-SOURCE
   search_bar_->search_string = "";
   search_bar_->search_hint = _("Type your command");
 }
@@ -211,11 +240,20 @@
   return search_bar_->text_entry();
 }
 
-std::list<HudButton::Ptr> const& View::buttons() const
-{
-  return buttons_;
-}
-
+<<<<<<< TREE
+std::list<HudButton::Ptr> const& View::buttons() const
+{
+  return buttons_;
+}
+
+=======
+std::list<HudButton::Ptr> const& View::buttons() const
+{
+  return buttons_;
+}
+
+
+>>>>>>> MERGE-SOURCE
 void View::SetQueries(Hud::Queries queries)
 {
   // early exit, if the user is key navigating on the hud, we don't want to set new
@@ -255,7 +293,11 @@
       query_activated.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
 
+<<<<<<< TREE
     button->key_nav_focus_change.connect([&](nux::Area* area, bool recieving, nux::KeyNavDirection direction){
+=======
+    button->key_nav_focus_change.connect([&](nux::Area* area, bool recieving, KeyNavDirection direction){
+>>>>>>> MERGE-SOURCE
       if (recieving)
         query_selected.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
@@ -268,7 +310,12 @@
     buttons_.front()->is_rounded = true;
     buttons_.back()->fake_focused = true;
     selected_button_ = 1;
-  }
+<<<<<<< TREE
+  }
+=======
+  }
+
+>>>>>>> MERGE-SOURCE
 
   QueueRelayout();
   QueueDraw();
@@ -397,12 +444,21 @@
 {
   LOG_DEBUG(logger) << "got search change";
   search_changed.emit(search_string);
+<<<<<<< TREE
 
   for(auto button : buttons_)
   {
     button->fake_focused = false;
   }
 
+=======
+
+  for (auto button : buttons_)
+  {
+    button->fake_focused = false;
+  }
+
+>>>>>>> MERGE-SOURCE
   if (!buttons_.empty())
     buttons_.back()->fake_focused = true;
 }
@@ -477,11 +533,21 @@
 
   if (timeline_need_more_draw_ && !timeline_idle_)
   {
+<<<<<<< TREE
     timeline_idle_.reset(new glib::Idle([&] () {
       QueueDraw();
       timeline_idle_.reset();
       return false;
     }));
+=======
+    timeline_id_ = g_idle_add([] (gpointer data) -> gboolean
+    {
+      View *self = static_cast<View*>(data);
+      self->QueueDraw();
+      self->timeline_id_ = 0;
+      return FALSE;
+    }, this);
+>>>>>>> MERGE-SOURCE
   }
 }
 
@@ -501,7 +567,7 @@
 {
   unsigned num_buttons = buttons_.size();
   variant::BuilderWrapper(builder)
-    .add(GetGeometry())
+    .add(content_geo_)
     .add("selected_button", selected_button_)
     .add("num_buttons", num_buttons);
 }

=== modified file 'hud/HudView.h'
--- hud/HudView.h	2012-07-04 02:37:23 +0000
+++ hud/HudView.h	2012-08-03 16:26:24 +0000
@@ -23,14 +23,25 @@
 
 #include <Nux/Nux.h>
 #include <Nux/VLayout.h>
+<<<<<<< TREE
 #include <UnityCore/GLibSource.h>
 
+=======
+
+#include "HudAbstractView.h"
+>>>>>>> MERGE-SOURCE
 #include "HudIcon.h"
 #include "HudButton.h"
+<<<<<<< TREE
 #include "HudAbstractView.h"
 #include "unity-shared/SearchBar.h"
 #include "unity-shared/OverlayRenderer.h"
 #include "unity-shared/UBusWrapper.h"
+=======
+#include "SearchBar.h"
+#include "OverlayRenderer.h"
+#include "UBusWrapper.h"
+>>>>>>> MERGE-SOURCE
 
 namespace unity
 {
@@ -39,8 +50,13 @@
 
 class View : public AbstractView
 {
+<<<<<<< TREE
   NUX_DECLARE_OBJECT_TYPE(View, AbstractView);
 public:
+=======
+  NUX_DECLARE_OBJECT_TYPE(HudView, AbstractView);
+public:
+>>>>>>> MERGE-SOURCE
   typedef nux::ObjectPtr<View> Ptr;
 
   View();
@@ -61,7 +77,11 @@
   void AboutToHide();
 
   void SetWindowGeometry(nux::Geometry const& absolute_geo, nux::Geometry const& geo);
+<<<<<<< TREE
 
+=======
+  
+>>>>>>> MERGE-SOURCE
 protected:
   virtual Area* FindKeyFocusArea(unsigned int event_type,
   unsigned long x11_key_code,
@@ -118,8 +138,14 @@
   bool activated_signal_sent_;
 };
 
+} // namespace hud
+} // namespace unity
 
+<<<<<<< TREE
 } // namespace hud
 } // namespace unity
+=======
+#endif // UNITYSHELL_HUD_VIEW_H
+>>>>>>> MERGE-SOURCE
 
 #endif // UNITYSHELL_HUD_VIEW_H

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2012-06-14 09:48:15 +0000
+++ launcher/AbstractLauncherIcon.h	2012-08-03 16:26:24 +0000
@@ -210,9 +210,15 @@
   
   virtual void UnStick() = 0;
 
+<<<<<<< TREE
   sigc::signal<void, int, int, unsigned long> mouse_down;
   sigc::signal<void, int, int, unsigned long> mouse_up;
   sigc::signal<void, int, int, unsigned long> mouse_click;
+=======
+  sigc::signal<void, int, unsigned long, int> mouse_down;
+  sigc::signal<void, int, unsigned long, int> mouse_up;
+  sigc::signal<void, int, unsigned long, int> mouse_click;
+>>>>>>> MERGE-SOURCE
   sigc::signal<void, int>      mouse_enter;
   sigc::signal<void, int>      mouse_leave;
 

=== modified file 'launcher/BFBLauncherIcon.cpp'
=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-07-10 22:18:50 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-08-03 16:26:24 +0000
@@ -115,7 +115,16 @@
                             {
                               EnsureWindowState();
                               UpdateIconGeometries(GetCenters());
+<<<<<<< TREE
                               _source_manager.Remove(ICON_REMOVE_TIMEOUT);
+=======
+
+                              if (_remove_timeout_id)
+                              {
+                                g_source_remove(_remove_timeout_id);
+                                _remove_timeout_id = 0;
+                              }
+>>>>>>> MERGE-SOURCE
                             }
                           });
   _gsignals.Add(sig);
@@ -130,6 +139,7 @@
   sig = new glib::Signal<void, BamfView*>(bamf_view, "closed",
                           [&] (BamfView*) {
                             if (!IsSticky())
+<<<<<<< TREE
                             {
                               SetQuirk(QUIRK_VISIBLE, false);
 
@@ -144,6 +154,25 @@
                                 return false;
                               }, ICON_REMOVE_TIMEOUT);
                             }
+=======
+                            {
+                              /* Use a timeout to remove the icon, this avoids
+                               * that we remove an application that is going
+                               * to be reopened soon. So applications that
+                               * have a splash screen won't be removed from
+                               * the launcher while the splash is closed and
+                               * a new window is opened. */
+                              if (_remove_timeout_id)
+                                g_source_remove(_remove_timeout_id);
+
+                              _remove_timeout_id = g_timeout_add_seconds(1, [] (gpointer data) -> gboolean {
+                                auto self = static_cast<BamfLauncherIcon*>(data);
+                                self->Remove();
+                                self->_remove_timeout_id = 0;
+                                return false;
+                              }, this);
+                            }
+>>>>>>> MERGE-SOURCE
                           });
   _gsignals.Add(sig);
 
@@ -180,6 +209,40 @@
    * we make sure that this icon won't be reused (no duplicated icon). */
   _gsignals.Disconnect(_bamf_app);
   g_object_set_qdata(G_OBJECT(_bamf_app.RawPtr()),
+<<<<<<< TREE
+                     g_quark_from_static_string("unity-seen"), nullptr);
+  _bamf_app = nullptr;
+
+  SimpleLauncherIcon::Remove();
+=======
+                     g_quark_from_static_string("unity-seen"), nullptr);
+
+  if (_remove_timeout_id != 0)
+    g_source_remove(_remove_timeout_id);
+
+  if (_fill_supported_types_id != 0)
+    g_source_remove(_fill_supported_types_id);
+
+  if (_quicklist_activated_id != 0)
+    g_source_remove(_quicklist_activated_id);
+
+  if (_window_moved_id != 0)
+    g_source_remove(_window_moved_id);
+
+  if (_dnd_hover_timer != 0)
+    g_source_remove(_dnd_hover_timer);
+>>>>>>> MERGE-SOURCE
+}
+
+void BamfLauncherIcon::Remove()
+{
+  /* Removing the unity-seen flag to the wrapped bamf application, on remove
+   * request we make sure that if the bamf application is re-opened while
+   * the removal process is still ongoing, the application will be shown
+   * on the launcher. Disconnecting from signals and nullifying the _bamf_app
+   * we make sure that this icon won't be reused (no duplicated icon). */
+  _gsignals.Disconnect(_bamf_app);
+  g_object_set_qdata(G_OBJECT(_bamf_app.RawPtr()),
                      g_quark_from_static_string("unity-seen"), nullptr);
   _bamf_app = nullptr;
 
@@ -1044,10 +1107,20 @@
 
     _gsignals.Add(new glib::Signal<void, DbusmenuMenuitem*, int>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                                     [&] (DbusmenuMenuitem*, int) {
+<<<<<<< TREE
                                       _source_manager.AddIdle([&] {
                                         ActivateLauncherIcon(ActionArg());
                                         return false;
                                       });
+=======
+                                      _quicklist_activated_id =
+                                        g_idle_add([] (gpointer data) -> gboolean {
+                                          auto self = static_cast<BamfLauncherIcon*>(data);
+                                          self->ActivateLauncherIcon(ActionArg());
+                                          self->_quicklist_activated_id = 0;
+                                          return FALSE;
+                                        }, this);
+>>>>>>> MERGE-SOURCE
                                     }));
 
     _menu_items_extra["AppName"] = glib::Object<DbusmenuMenuitem>(item);
@@ -1191,6 +1264,7 @@
 
 void BamfLauncherIcon::OnDndLeave()
 {
+<<<<<<< TREE
   /* Disabled, since the DND code is currently disabled as well.
   _source_manager.Remove(ICON_DND_OVER_TIMEOUT);
   */
@@ -1222,6 +1296,41 @@
 }
 
 nux::DndAction BamfLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
+=======
+  _dnd_hovered = false;
+
+  if (_dnd_hover_timer)
+    g_source_remove(_dnd_hover_timer);
+  _dnd_hover_timer = 0;
+}
+
+bool BamfLauncherIcon::OnShouldHighlightOnDrag(DndData const& dnd_data)
+{
+  bool is_home_launcher = boost::algorithm::ends_with(DesktopFile(), "nautilus-home.desktop") ||
+                          boost::algorithm::ends_with(DesktopFile(), "nautilus.desktop");
+
+  if (is_home_launcher)
+  {
+    return true;
+  }
+
+  for (auto type : dnd_data.Types())
+  {
+    for (auto supported_type : GetSupportedTypes())
+    {
+      if (g_content_type_is_a(type.c_str(), supported_type.c_str()))
+      {
+        if (!dnd_data.UrisByType(type).empty())
+          return true;
+      }
+    }
+  }
+
+  return false; 
+}
+
+nux::DndAction BamfLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
+>>>>>>> MERGE-SOURCE
 {
   return ValidateUrisForLaunch(dnd_data).empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
 }

=== modified file 'launcher/BamfLauncherIcon.h'
--- launcher/BamfLauncherIcon.h	2012-07-04 07:02:00 +0000
+++ launcher/BamfLauncherIcon.h	2012-08-03 16:26:24 +0000
@@ -124,6 +124,13 @@
 
   glib::Object<BamfApplication> _bamf_app;
   bool _supported_types_filled;
+<<<<<<< TREE
+=======
+  guint _remove_timeout_id;
+  guint _fill_supported_types_id;
+  guint _window_moved_id;
+  guint _quicklist_activated_id;
+>>>>>>> MERGE-SOURCE
 
   std::string _remote_uri;
   std::string _desktop_file;

=== modified file 'launcher/DesktopLauncherIcon.cpp'
=== modified file 'launcher/DeviceLauncherIcon.cpp'
--- launcher/DeviceLauncherIcon.cpp	2012-06-21 06:55:53 +0000
+++ launcher/DeviceLauncherIcon.cpp	2012-08-03 16:26:24 +0000
@@ -40,7 +40,12 @@
 
 nux::logging::Logger logger("unity.launcher");
 
-const unsigned int volume_changed_timeout =  500;
+<<<<<<< TREE
+const unsigned int volume_changed_timeout =  500;
+=======
+GduDevice* get_device_for_device_file (const gchar *device_file);
+const unsigned int volume_changed_timeout =  500;
+>>>>>>> MERGE-SOURCE
 
 }
 
@@ -63,6 +68,7 @@
   UpdateVisibility();
 }
 
+<<<<<<< TREE
 void DeviceLauncherIcon::OnVolumeChanged(GVolume* volume)
 {
   if (!G_IS_VOLUME(volume))
@@ -99,6 +105,57 @@
   }
 }
 
+=======
+DeviceLauncherIcon::~DeviceLauncherIcon()
+{
+  if (changed_timeout_ > 0)
+    g_source_remove(changed_timeout_);
+}
+
+void DeviceLauncherIcon::OnVolumeChanged(GVolume* volume)
+{
+  if (!G_IS_VOLUME(volume))
+    return;
+
+  if (changed_timeout_ > 0)
+    g_source_remove(changed_timeout_);
+  changed_timeout_ = g_timeout_add(volume_changed_timeout, &DeviceLauncherIcon::OnVolumeChangedTimeout, this);
+}
+
+gboolean DeviceLauncherIcon::OnVolumeChangedTimeout(gpointer data)
+{
+  DeviceLauncherIcon* self = static_cast<DeviceLauncherIcon*>(data);
+
+  self->UpdateDeviceIcon();
+  self->UpdateVisibility();
+  return FALSE;
+}
+
+void DeviceLauncherIcon::UpdateVisibility()
+{
+  switch (DevicesSettings::GetDefault().GetDevicesOption())
+  {
+    case DevicesSettings::NEVER:
+      SetQuirk(QUIRK_VISIBLE, false);
+      break;
+    case DevicesSettings::ONLY_MOUNTED:
+      if (keep_in_launcher_)
+      {
+        SetQuirk(QUIRK_VISIBLE, true);
+      }
+      else
+      {
+        glib::Object<GMount> mount(g_volume_get_mount(volume_));
+        SetQuirk(QUIRK_VISIBLE, mount);
+      }
+      break;
+    case DevicesSettings::ALWAYS:
+      SetQuirk(QUIRK_VISIBLE, true);
+      break;
+  }
+}
+
+>>>>>>> MERGE-SOURCE
 void DeviceLauncherIcon::UpdateDeviceIcon()
 {
   name_ = glib::String(g_volume_get_name(volume_)).Str();

=== modified file 'launcher/DeviceLauncherIcon.h'
--- launcher/DeviceLauncherIcon.h	2012-07-18 16:06:32 +0000
+++ launcher/DeviceLauncherIcon.h	2012-08-03 16:26:24 +0000
@@ -34,10 +34,16 @@
 class DeviceLauncherIcon : public SimpleLauncherIcon
 {
 public:
+<<<<<<< TREE
   typedef nux::ObjectPtr<DeviceLauncherIcon> Ptr;
 
   DeviceLauncherIcon(glib::Object<GVolume> const& volume);
 
+=======
+  DeviceLauncherIcon(glib::Object<GVolume> const& volume);
+  ~DeviceLauncherIcon();
+
+>>>>>>> MERGE-SOURCE
   void OnRemoved();
   bool CanEject();
   void Eject();
@@ -62,15 +68,27 @@
   static void OnEjectReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
   static void OnUnmountReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
   static void OnDriveStop(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
-  void OnVolumeChanged(GVolume* volume);
+<<<<<<< TREE
+  void OnVolumeChanged(GVolume* volume);
+=======
+  static gboolean OnVolumeChangedTimeout(gpointer data);
+  void OnVolumeChanged(GVolume* volume);
+>>>>>>> MERGE-SOURCE
   void OnSettingsChanged();
   void ShowNotification(std::string const&, unsigned, glib::Object<GdkPixbuf> const&, std::string const&);
 
 private:
+<<<<<<< TREE
   glib::Signal<void, GVolume*> signal_volume_changed_;
   glib::Source::UniquePtr changed_timeout_;
   glib::Object<GVolume> volume_;
 
+=======
+  glib::Signal<void, GVolume*> signal_volume_changed_;
+  guint changed_timeout_;
+  glib::Object<GVolume> volume_;
+  glib::String device_file_;
+>>>>>>> MERGE-SOURCE
   std::string name_;
   bool keep_in_launcher_;
 };

=== modified file 'launcher/DeviceLauncherSection.cpp'
--- launcher/DeviceLauncherSection.cpp	2012-07-18 17:51:56 +0000
+++ launcher/DeviceLauncherSection.cpp	2012-08-03 16:26:24 +0000
@@ -24,6 +24,7 @@
 namespace launcher
 {
 
+<<<<<<< TREE
 DeviceLauncherSection::DeviceLauncherSection(AbstractVolumeMonitorWrapper::Ptr volume_monitor)
   : monitor_(volume_monitor)
 {
@@ -39,7 +40,36 @@
 void DeviceLauncherSection::PopulateEntries()
 {
   for (auto volume : monitor_->GetVolumes())
+=======
+DeviceLauncherSection::DeviceLauncherSection()
+  : monitor_(g_volume_monitor_get())
+{
+  typedef glib::Signal<void, GVolumeMonitor*, GVolume*> VolumeSignal;
+  sig_manager_.Add(new VolumeSignal(monitor_, "volume-added", sigc::mem_fun(this, &DeviceLauncherSection::OnVolumeAdded)));
+  sig_manager_.Add(new VolumeSignal(monitor_, "volume-removed", sigc::mem_fun(this, &DeviceLauncherSection::OnVolumeRemoved)));
+
+  on_device_populate_entry_id_ = g_idle_add([] (gpointer data) {
+    auto self = static_cast<DeviceLauncherSection*>(data);
+    self->PopulateEntries();
+    self->on_device_populate_entry_id_ = 0;
+    return FALSE;
+    }, this);
+}
+
+DeviceLauncherSection::~DeviceLauncherSection()
+{
+  if (on_device_populate_entry_id_)
+    g_source_remove(on_device_populate_entry_id_);
+}
+
+void DeviceLauncherSection::PopulateEntries()
+{
+  GList* volumes = g_volume_monitor_get_volumes(monitor_);
+
+  for (GList* v = volumes; v; v = v->next)
+>>>>>>> MERGE-SOURCE
   {
+<<<<<<< TREE
     // Sanity check. Avoid duplicates.
     if (map_.find(volume) != map_.end())
       continue;
@@ -48,15 +78,37 @@
 
     map_[volume] = icon;
     IconAdded.emit(icon);
+=======
+    if (!G_IS_VOLUME(v->data))
+      continue;
+
+    // This will unref the volume, since the list entries needs that.
+    // We'll keep a reference in the icon.
+    glib::Object<GVolume> volume(G_VOLUME(v->data));
+    DeviceLauncherIcon* icon = new DeviceLauncherIcon(volume);
+
+    map_[volume] = icon;
+    IconAdded.emit(AbstractLauncherIcon::Ptr(icon));
+>>>>>>> MERGE-SOURCE
   }
+<<<<<<< TREE
+=======
+
+  g_list_free(volumes);
+>>>>>>> MERGE-SOURCE
 }
 
 /* Uses a std::map to track all the volume icons shown and not shown.
  * Keep in mind: when "volume-removed" is recevied we should erase
  * the pair (GVolume - DeviceLauncherIcon) from the std::map to avoid leaks
  */
+<<<<<<< TREE
 void DeviceLauncherSection::OnVolumeAdded(glib::Object<GVolume> const& volume)
+=======
+void DeviceLauncherSection::OnVolumeAdded(GVolumeMonitor* monitor, GVolume* volume)
+>>>>>>> MERGE-SOURCE
 {
+<<<<<<< TREE
   // Sanity check. Avoid duplicates.
   if (map_.find(volume) != map_.end())
     return;
@@ -65,10 +117,24 @@
 
   map_[volume] = icon;
   IconAdded.emit(icon);
+=======
+  // This just wraps the volume in a glib::Object, global ref_count is only
+  // temporary changed.
+  glib::Object<GVolume> gvolume(volume, glib::AddRef());
+  DeviceLauncherIcon* icon = new DeviceLauncherIcon(gvolume);
+
+  map_[gvolume] = icon;
+  IconAdded.emit(AbstractLauncherIcon::Ptr(icon));
+>>>>>>> MERGE-SOURCE
 }
 
+<<<<<<< TREE
 void DeviceLauncherSection::OnVolumeRemoved(glib::Object<GVolume> const& volume)
+=======
+void DeviceLauncherSection::OnVolumeRemoved(GVolumeMonitor* monitor, GVolume* volume)
+>>>>>>> MERGE-SOURCE
 {
+<<<<<<< TREE
   auto volume_it = map_.find(volume);
 
   // Sanity check
@@ -76,6 +142,15 @@
   {
     volume_it->second->OnRemoved();
     map_.erase(volume_it);
+=======
+  auto volume_it = map_.find(volume);
+
+  // It should not happen! Let me do the check anyway.
+  if (volume_it != map_.end())
+  {
+    volume_it->second->OnRemoved();
+    map_.erase(volume_it);
+>>>>>>> MERGE-SOURCE
   }
 }
 

=== modified file 'launcher/DeviceLauncherSection.h'
--- launcher/DeviceLauncherSection.h	2012-07-18 17:51:56 +0000
+++ launcher/DeviceLauncherSection.h	2012-08-03 16:26:24 +0000
@@ -22,7 +22,15 @@
 
 #include <map>
 
+<<<<<<< TREE
 #include <UnityCore/GLibSource.h>
+=======
+#include <gio/gio.h>
+#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
+#include <UnityCore/GLibWrapper.h>
+#include <UnityCore/GLibSignal.h>
+>>>>>>> MERGE-SOURCE
 
 #include "DeviceLauncherIcon.h"
 #include "AbstractVolumeMonitorWrapper.h"
@@ -40,6 +48,7 @@
   sigc::signal<void, AbstractLauncherIcon::Ptr> IconAdded;
 
 private:
+<<<<<<< TREE
   void PopulateEntries();
   void OnVolumeAdded(glib::Object<GVolume> const& volume);
   void OnVolumeRemoved(glib::Object<GVolume> const& volume);
@@ -47,6 +56,18 @@
   std::map<GVolume*, DeviceLauncherIcon::Ptr> map_;
   AbstractVolumeMonitorWrapper::Ptr monitor_;
   glib::Idle device_populate_idle_;
+=======
+  void PopulateEntries();
+
+  void OnVolumeAdded(GVolumeMonitor* monitor, GVolume* volume);
+  void OnVolumeRemoved(GVolumeMonitor* monitor, GVolume* volume);
+
+private:
+  glib::SignalManager sig_manager_;
+  glib::Object<GVolumeMonitor> monitor_;
+  std::map<GVolume*, DeviceLauncherIcon*> map_;
+  gulong on_device_populate_entry_id_;
+>>>>>>> MERGE-SOURCE
 };
 
 }

=== modified file 'launcher/DndData.cpp'
--- launcher/DndData.cpp	2012-07-09 14:11:06 +0000
+++ launcher/DndData.cpp	2012-08-03 16:26:24 +0000
@@ -35,16 +35,30 @@
   char* pch = strtok (uris, "\r\n");
   while (pch)
   {
+<<<<<<< TREE
     glib::String content_type(g_content_type_guess(pch,
                                                    nullptr,
                                                    0,
                                                    nullptr));
 
     if (content_type)
+=======
+    glib::String content_type(g_content_type_guess(pch, nullptr, 0, nullptr));
+
+    if (content_type)
+>>>>>>> MERGE-SOURCE
     {
+<<<<<<< TREE
       types_.insert(content_type.Str());
       uris_to_types_[pch] = content_type.Str();
       types_to_uris_[content_type.Str()].insert(pch);
+=======
+      std::string const& content_type_str = content_type.Str();
+
+      types_.insert(content_type_str);
+      uris_to_types_[pch] = content_type_str;
+      types_to_uris_[content_type_str].insert(pch);
+>>>>>>> MERGE-SOURCE
     }
 
     uris_.insert(pch);

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2012-07-26 10:41:51 +0000
+++ launcher/EdgeBarrierController.cpp	2012-08-03 16:26:24 +0000
@@ -65,7 +65,7 @@
 {
   UScreen *uscreen = UScreen::GetDefault();
 
-  auto monitors = uscreen->GetMonitors();
+  auto const& monitors = uscreen->GetMonitors();
   ResizeBarrierList(monitors);
 
   uscreen->changed.connect([&](int primary, std::vector<nux::Geometry>& layout) {
@@ -147,15 +147,24 @@
   }
 
   float decay_responsiveness_mult = ((parent_->options()->edge_responsiveness() - 1) * .3f) + 1;
+<<<<<<< TREE
   decaymulator_.rate_of_decay = parent_->options()->edge_decay_rate() * decay_responsiveness_mult;
 
+=======
+  decaymulator_->rate_of_decay = parent_->options()->edge_decay_rate() * decay_responsiveness_mult;
+
+>>>>>>> MERGE-SOURCE
   float overcome_responsiveness_mult = ((parent_->options()->edge_responsiveness() - 1) * 1.0f) + 1;
   edge_overcome_pressure_ = parent_->options()->edge_overcome_pressure() * overcome_responsiveness_mult;
 }
 
 void EdgeBarrierController::Impl::OnPointerBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event)
 {
+<<<<<<< TREE
   unsigned int monitor = owner->index;
+=======
+  unsigned monitor = owner->index;
+>>>>>>> MERGE-SOURCE
   bool process = true;
 
   if (monitor < subscribers_.size())
@@ -166,6 +175,7 @@
       process = false;
   }
 
+<<<<<<< TREE
   if (process && owner->released)
   {
     BarrierRelease(owner, event->event_id);
@@ -175,6 +185,12 @@
     decaymulator_.value = decaymulator_.value + event->velocity;
 
     if (decaymulator_.value > edge_overcome_pressure_ || (!parent_->sticky_edges() && !subscribers_[monitor]))
+=======
+  if (process && owner->x1 > 0)
+  {
+    decaymulator_->value = decaymulator_->value + event->velocity;
+    if (decaymulator_->value > edge_overcome_pressure_ || (!parent_->options()->edge_resist() && !subscribers_[monitor]))
+>>>>>>> MERGE-SOURCE
     {
       BarrierRelease(owner, event->event_id);
     }
@@ -199,8 +215,14 @@
 }
 
 EdgeBarrierController::EdgeBarrierController()
+<<<<<<< TREE
   : pimpl(new Impl(this))
 {}
+=======
+  : sticky_edges(false)
+  , pimpl(new Impl(this))
+{}
+>>>>>>> MERGE-SOURCE
 
 EdgeBarrierController::~EdgeBarrierController()
 {}
@@ -223,6 +245,7 @@
 
   auto const& monitors = UScreen::GetDefault()->GetMonitors();
   pimpl->subscribers_[monitor] = nullptr;
+<<<<<<< TREE
   pimpl->ResizeBarrierList(monitors);
   pimpl->SetupBarriers(monitors);
 }
@@ -239,6 +262,20 @@
 {
   pimpl->OnPointerBarrierEvent(owner, event);
 }
+=======
+  pimpl->ResizeBarrierList(monitors);
+  pimpl->SetupBarriers(monitors);
+}
+
+EdgeBarrierSubscriber* EdgeBarrierController::GetSubscriber(unsigned int monitor)
+{
+  if (monitor >= pimpl->subscribers_.size())
+    return nullptr;
+
+  return pimpl->subscribers_[monitor];
+}
+
+>>>>>>> MERGE-SOURCE
 
 }
 }

=== modified file 'launcher/EdgeBarrierController.h'
--- launcher/EdgeBarrierController.h	2012-07-25 23:18:17 +0000
+++ launcher/EdgeBarrierController.h	2012-08-03 16:26:24 +0000
@@ -41,12 +41,18 @@
   nux::RWProperty<bool> sticky_edges;
   nux::Property<launcher::Options::Ptr> options;
 
+<<<<<<< TREE
   void Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
   void Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
   EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor);
 
 protected:
   void ProcessBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event);
+=======
+  void Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
+  void Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
+  EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor);
+>>>>>>> MERGE-SOURCE
 
 private:
   struct Impl;

=== modified file 'launcher/HudLauncherIcon.cpp'
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-03 13:43:50 +0000
+++ launcher/Launcher.cpp	2012-08-03 16:26:24 +0000
@@ -216,7 +216,53 @@
   launcher_sheen_ = cache.FindTexture("dash_sheen", 0, 0, cb);
   launcher_pressure_effect_ = cache.FindTexture("launcher_pressure_effect", 0, 0, cb);
 
+<<<<<<< TREE
   options.changed.connect(sigc::mem_fun (this, &Launcher::OnOptionsChanged));
+=======
+  options.changed.connect (sigc::mem_fun (this, &Launcher::OnOptionsChanged));
+
+  // icon information from software center
+  _sc_icon = NULL;
+  _sc_icon_title = NULL;
+  _sc_icon_x = 0;
+  _sc_icon_y = 0;
+  _sc_icon_size = 0;
+  _sc_icon_desktop_file = NULL;
+  _sc_icon_aptdaemon_task = NULL;
+  _sc_anim_icon = false;
+}
+
+Launcher::~Launcher()
+{
+  g_bus_unown_name(_dbus_owner);
+
+  if (_dnd_check_handle)
+    g_source_remove(_dnd_check_handle);
+  if (_autoscroll_handle)
+    g_source_remove(_autoscroll_handle);
+  if (_start_dragicon_handle)
+    g_source_remove(_start_dragicon_handle);
+  if (_launcher_animation_timeout > 0)
+    g_source_remove(_launcher_animation_timeout);
+  if (_strut_hack_handle)
+    g_source_remove(_strut_hack_handle);
+
+  if (_on_data_collected_connection.connected())
+      _on_data_collected_connection.disconnect();
+
+  g_idle_remove_by_data(this);
+
+  if (_collection_window)
+    _collection_window->UnReference();
+
+  delete _hover_machine;
+  delete _hide_machine;
+
+  g_free(_sc_icon);
+  g_free(_sc_icon_title);
+  g_free(_sc_icon_desktop_file);
+  g_free(_sc_icon_aptdaemon_task);
+>>>>>>> MERGE-SOURCE
 }
 
 /* Introspection */
@@ -279,7 +325,15 @@
   .add("hovered", _hovered)
   .add("hidemode", options()->hide_mode)
   .add("hidden", _hidden)
-  .add("is_showing", ! _hidden)
+<<<<<<< TREE
+  .add("is_showing", ! _hidden)
+=======
+  .add("is_showing", ! _hidden)
+  .add("x", abs_geo.x)
+  .add("y", abs_geo.y)
+  .add("width", abs_geo.width)
+  .add("height", abs_geo.height)
+>>>>>>> MERGE-SOURCE
   .add("monitor", monitor())
   .add("quicklist-open", _hide_machine.GetQuirk(LauncherHideMachine::QUICKLIST_OPEN))
   .add("hide-quirks", _hide_machine.DebugHideQuirks())
@@ -1504,12 +1558,27 @@
   }
 }
 
+<<<<<<< TREE
 nux::ObjectPtr<nux::View> Launcher::GetActiveTooltip() const
 {
   return _active_tooltip;
 }
 
 void Launcher::SetActionState(LauncherActionState actionstate)
+=======
+nux::ObjectPtr<nux::View> const& Launcher::GetActiveTooltip() const
+{
+  return _active_tooltip;
+}
+
+nux::ObjectPtr<LauncherDragWindow> const& Launcher::GetDraggedIcon() const
+{
+  return _drag_window;
+}
+
+void
+Launcher::SetActionState(LauncherActionState actionstate)
+>>>>>>> MERGE-SOURCE
 {
   if (_launcher_action_state == actionstate)
     return;
@@ -1964,6 +2033,16 @@
   gPainter.PopBackground(push_count);
   GfxContext.PopClippingRectangle();
   GfxContext.PopClippingRectangle();
+
+  if (_sc_anim_icon)
+  {
+    launcher_addrequest_special.emit(_sc_icon_desktop_file, AbstractLauncherIcon::Ptr(), _sc_icon_aptdaemon_task, _sc_icon, _sc_icon_x, _sc_icon_y, _sc_icon_size);
+    g_free(_sc_icon); _sc_icon = NULL;
+    g_free(_sc_icon_title); _sc_icon_title = NULL;
+    g_free(_sc_icon_desktop_file); _sc_icon_desktop_file = NULL;
+    g_free(_sc_icon_aptdaemon_task); _sc_icon_aptdaemon_task = NULL;
+    _sc_anim_icon = false;
+  }
 }
 
 void Launcher::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -2114,6 +2193,7 @@
 
       if (progress >= 1.0f)
         _model->ReorderSmart(_drag_icon, hovered_icon, true);
+<<<<<<< TREE
       else if (progress == 0.0f) {
         if (_drag_icon->GetIconType() == hovered_icon->GetIconType()) {
           _model->ReorderBefore(_drag_icon, hovered_icon, false);
@@ -2144,6 +2224,38 @@
           }
         }
       }
+=======
+      else if (progress == 0.0f) {
+        if (_drag_icon->GetIconType() == hovered_icon->GetIconType()) {
+          _model->ReorderBefore(_drag_icon, hovered_icon, false);
+        } else {
+          // LauncherModel::ReorderBefore does not work on different icon types
+          // so if hovered_icon is of a different type than _drag_icon
+          // try to use LauncherModel::ReorderAfter with the icon that is before hovered_icon
+          AbstractLauncherIcon::Ptr iconBeforeHover;
+          LauncherModel::iterator it;
+          LauncherModel::iterator prevIt = _model->end();
+          for (it = _model->begin(); it != _model->end(); it++)
+          {
+            if (!(*it)->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
+              continue;
+
+            if ((*it) == hovered_icon) {
+              if (prevIt != _model->end()) {
+                iconBeforeHover = *prevIt;
+              }
+              break;
+            }
+
+            prevIt = it;
+          }
+
+          if (iconBeforeHover && _drag_icon != iconBeforeHover) {
+            _model->ReorderAfter(_drag_icon, iconBeforeHover);
+          }
+        }
+      }
+>>>>>>> MERGE-SOURCE
     }
   }
 }
@@ -2426,7 +2538,11 @@
     auto cb_func = sigc::mem_fun(this, &Launcher::StartIconDragTimeout);
     sources_.AddTimeout(START_DRAGICON_DURATION, cb_func, START_DRAGICON_TIMEOUT);
 
+<<<<<<< TREE
     launcher_icon->mouse_down.emit(nux::GetEventButton(button_flags), monitor, key_flags);
+=======
+    launcher_icon->mouse_down.emit(nux::GetEventButton(button_flags), key_flags, monitor);
+>>>>>>> MERGE-SOURCE
   }
 }
 
@@ -2440,17 +2556,32 @@
 
   if (_icon_mouse_down && (_icon_mouse_down == launcher_icon))
   {
+<<<<<<< TREE
     _icon_mouse_down->mouse_up.emit(nux::GetEventButton(button_flags), monitor, key_flags);
+=======
+    _icon_mouse_down->mouse_up.emit(nux::GetEventButton(button_flags), key_flags, monitor);
+>>>>>>> MERGE-SOURCE
 
     if (GetActionState() == ACTION_NONE)
     {
+<<<<<<< TREE
       _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), monitor, key_flags);
+=======
+
+      /* This will inform the icon if the action is valid for all the monitors */
+      int action_monitor = options()->show_for_all ? -1 : monitor;
+      _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), key_flags, action_monitor);
+>>>>>>> MERGE-SOURCE
     }
   }
 
   if (launcher_icon && (_icon_mouse_down != launcher_icon))
   {
+<<<<<<< TREE
     launcher_icon->mouse_up.emit(nux::GetEventButton(button_flags), monitor, key_flags);
+=======
+    launcher_icon->mouse_up.emit(nux::GetEventButton(button_flags), key_flags, monitor);
+>>>>>>> MERGE-SOURCE
   }
 
   if (GetActionState() == ACTION_DRAG_LAUNCHER)
@@ -2570,8 +2701,13 @@
     break;
   }
 
+<<<<<<< TREE
   _hide_machine.SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
 
+=======
+  _hide_machine->SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
+
+>>>>>>> MERGE-SOURCE
   for (auto it : _dnd_data.Uris())
   {
     if (g_str_has_suffix(it.c_str(), ".desktop"))
@@ -2585,16 +2721,31 @@
   {
     for (auto it : *_model)
     {
-      if (it->ShouldHighlightOnDrag(_dnd_data))
-      {
-        it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
-        it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
-      }
+<<<<<<< TREE
+      if (it->ShouldHighlightOnDrag(_dnd_data))
+      {
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
+      }
+=======
+      if (it->ShouldHighlightOnDrag(_dnd_data))
+      {
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
+      }
+>>>>>>> MERGE-SOURCE
       else
+<<<<<<< TREE
       {
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, true);
         it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
       }
+=======
+      {
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, true);
+      }
+>>>>>>> MERGE-SOURCE
     }
   }
   else
@@ -2624,8 +2775,14 @@
 
   for (auto it : *_model)
   {
+<<<<<<< TREE
     it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, is_overlay_open);
     it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
+=======
+    it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, false);
+    it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, false);
+    it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
+>>>>>>> MERGE-SOURCE
   }
 
   DndHoveredIconReset();
@@ -2694,8 +2851,13 @@
     {
       for (auto it : *_model)
       {
+<<<<<<< TREE
         if (it->ShouldHighlightOnDrag(_dnd_data))
           it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
+=======
+        if (it->ShouldHighlightOnDrag(_dnd_data))
+          it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
+>>>>>>> MERGE-SOURCE
         else
           it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, true);
       }
@@ -2821,9 +2983,15 @@
   }
   else if (_dnd_hovered_icon && _drag_action != nux::DNDACTION_NONE)
   {
+<<<<<<< TREE
      if (IsOverlayOpen())
        ubus_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 
+=======
+    if (IsOverlayOpen())
+      ubus.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+
+>>>>>>> MERGE-SOURCE
     _dnd_hovered_icon->AcceptDrop(_dnd_data);
   }
 
@@ -2847,6 +3015,89 @@
   return _model->Selection();
 }
 
+<<<<<<< TREE
+=======
+/* dbus handlers */
+
+void
+Launcher::handle_dbus_method_call(GDBusConnection*       connection,
+                                  const gchar*           sender,
+                                  const gchar*           object_path,
+                                  const gchar*           interface_name,
+                                  const gchar*           method_name,
+                                  GVariant*              parameters,
+                                  GDBusMethodInvocation* invocation,
+                                  gpointer               user_data)
+{
+  if (g_strcmp0(method_name, "AddLauncherItemFromPosition") == 0)
+  {
+    Launcher* self = (Launcher*)user_data;
+    self->_sc_anim_icon = true;
+    g_free(self->_sc_icon);
+    g_free(self->_sc_icon_desktop_file);
+    g_free(self->_sc_icon_aptdaemon_task);
+    g_variant_get(parameters, "(ssiiiss)", &self->_sc_icon_title,
+      &self->_sc_icon,
+      &self->_sc_icon_x,
+      &self->_sc_icon_y,
+      &self->_sc_icon_size,
+      &self->_sc_icon_desktop_file,
+      &self->_sc_icon_aptdaemon_task, NULL);
+
+    g_dbus_method_invocation_return_value(invocation, nullptr);
+
+    self->EnsureAnimation();
+  }
+}
+
+void
+Launcher::OnBusAcquired(GDBusConnection* connection,
+                        const gchar*     name,
+                        gpointer         user_data)
+{
+  GDBusNodeInfo* introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, NULL);
+  guint registration_id;
+
+  if (!introspection_data)
+  {
+    LOG_WARNING(logger) << "No introspection data loaded. Won't get dynamic launcher addition.";
+    return;
+  }
+
+
+
+  registration_id = g_dbus_connection_register_object(connection,
+                                                      S_DBUS_PATH.c_str(),
+                                                      introspection_data->interfaces[0],
+                                                      &interface_vtable,
+                                                      user_data,
+                                                      NULL,
+                                                      NULL);
+  if (!registration_id)
+  {
+    LOG_WARNING(logger) << "Object registration failed. Won't get dynamic launcher addition.";
+  }
+
+  g_dbus_node_info_unref(introspection_data);
+}
+
+void
+Launcher::OnNameAcquired(GDBusConnection* connection,
+                         const gchar*     name,
+                         gpointer         user_data)
+{
+  LOG_DEBUG(logger) << "Acquired the name " << name << " on the session bus";
+}
+
+void
+Launcher::OnNameLost(GDBusConnection* connection,
+                     const gchar*     name,
+                     gpointer         user_data)
+{
+  LOG_DEBUG(logger) << "Lost the name " << name << " on the session bus";
+}
+
+>>>>>>> MERGE-SOURCE
 //
 // Key navigation
 //

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-03 09:39:01 +0000
+++ launcher/Launcher.h	2012-08-03 16:26:24 +0000
@@ -95,8 +95,14 @@
     return _parent;
   };
 
+<<<<<<< TREE
   nux::ObjectPtr<nux::View> GetActiveTooltip() const;  // nullptr = no tooltip
 
+=======
+  nux::ObjectPtr<nux::View> const& GetActiveTooltip() const;
+  nux::ObjectPtr<LauncherDragWindow> const& GetDraggedIcon() const;
+
+>>>>>>> MERGE-SOURCE
   virtual void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
   virtual void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
   virtual void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
@@ -310,12 +316,16 @@
 
   void DndReset();
   void DndHoveredIconReset();
+<<<<<<< TREE
   void DndTimeoutSetup();
 
   LauncherModel::Ptr _model;
   nux::BaseWindow* _parent;
   nux::ObjectPtr<nux::View> _active_tooltip;
   QuicklistView* _active_quicklist;
+=======
+  nux::ObjectPtr<nux::View> _active_tooltip;
+>>>>>>> MERGE-SOURCE
 
   nux::HLayout* m_Layout;
 
@@ -386,9 +396,21 @@
 
   ui::AbstractIconRenderer::Ptr icon_renderer;
   BackgroundEffectHelper bg_effect_helper_;
+<<<<<<< TREE
 
   UBusManager ubus_;
   glib::SourceManager sources_;
+=======
+
+  gchar*  _sc_icon;
+  gchar*  _sc_icon_title;
+  gint32  _sc_icon_x;
+  gint32  _sc_icon_y;
+  gint32  _sc_icon_size;
+  gchar*  _sc_icon_desktop_file;
+  gchar*  _sc_icon_aptdaemon_task;
+  bool    _sc_anim_icon;
+>>>>>>> MERGE-SOURCE
 };
 
 }

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-03 11:58:29 +0000
+++ launcher/LauncherController.cpp	2012-08-03 16:26:24 +0000
@@ -26,21 +26,36 @@
 #include <Nux/BaseWindow.h>
 #include <NuxCore/Logger.h>
 
-#include "LauncherOptions.h"
 #include "BamfLauncherIcon.h"
+#include "BFBLauncherIcon.h"
 #include "DesktopLauncherIcon.h"
 #include "DeviceLauncherIcon.h"
 #include "FavoriteStore.h"
 #include "HudLauncherIcon.h"
 #include "LauncherController.h"
-#include "LauncherControllerPrivate.h"
+<<<<<<< TREE
+#include "LauncherControllerPrivate.h"
+=======
+#include "LauncherControllerPrivate.h"
+#include "LauncherOptions.h"
+>>>>>>> MERGE-SOURCE
 #include "SoftwareCenterLauncherIcon.h"
+<<<<<<< TREE
 #include "unity-shared/WindowManager.h"
+=======
+#include "TimeUtil.h"
+>>>>>>> MERGE-SOURCE
 #include "TrashLauncherIcon.h"
+<<<<<<< TREE
 #include "BFBLauncherIcon.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/TimeUtil.h"
+=======
+#include "UBusMessages.h"
+#include "UScreen.h"
+#include "WindowManager.h"
+>>>>>>> MERGE-SOURCE
 
 namespace unity
 {
@@ -78,6 +93,7 @@
   const int launcher_minimum_show_duration = 1250;
   const int shortcuts_show_delay = 750;
   const int ignore_repeat_shortcut_duration = 250;
+<<<<<<< TREE
 
   const std::string KEYPRESS_TIMEOUT = "keypress-timeout";
   const std::string LABELS_TIMEOUT = "label-show-timeout";
@@ -90,6 +106,11 @@
 GDBusInterfaceVTable Controller::Impl::interface_vtable =
   { Controller::Impl::OnDBusMethodCall, NULL, NULL};
 
+=======
+}
+}
+
+>>>>>>> MERGE-SOURCE
 Controller::Impl::Impl(Display* display, Controller* parent)
   : parent_(parent)
   , model_(new LauncherModel())
@@ -98,7 +119,13 @@
   , device_section_(volume_monitor_)
   , show_desktop_icon_(false)
   , display_(display)
+<<<<<<< TREE
   , matcher_(bamf_matcher_get_default())
+=======
+  , launcher_key_press_handler_id_(0)
+  , launcher_label_show_handler_id_(0)
+  , launcher_hide_handler_id_(0)
+>>>>>>> MERGE-SOURCE
 {
   edge_barriers_.options = parent_->options();
 
@@ -187,7 +214,12 @@
       launcher_ptr->GetParent()->UnReference();
   }
 
+<<<<<<< TREE
   g_bus_unown_name(dbus_owner_);
+=======
+  if (bamf_timer_handler_id_ != 0)
+    g_source_remove(bamf_timer_handler_id_);
+>>>>>>> MERGE-SOURCE
 }
 
 void Controller::Impl::EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors)
@@ -266,7 +298,11 @@
   launcher->display = display_;
   launcher->monitor = monitor;
   launcher->options = parent_->options();
+<<<<<<< TREE
   launcher->SetModel(model_);
+=======
+  launcher->SetModel(model_.get());
+>>>>>>> MERGE-SOURCE
 
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout->AddView(launcher, 1);
@@ -350,11 +386,19 @@
       return;
   }
 
+<<<<<<< TREE
   // Check if desktop file was supplied, or if it's set to SC's agent
   // See https://bugs.launchpad.net/unity/+bug/1002440
   if (path.empty() || path == "software-center-agent")
     return;
 
+=======
+ // Check if desktop file was supplied, or if it's set to SC's agent
+ // See https://bugs.launchpad.net/unity/+bug/1002440
+  if (path.empty() || path == "software-center-agent")
+    return;
+
+>>>>>>> MERGE-SOURCE
   SoftwareCenterLauncherIcon::Ptr result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
 
   CurrentLauncher()->ForceReveal(true);
@@ -1073,12 +1117,22 @@
   }
 
   if (activate)
+<<<<<<< TREE
   {
     pimpl->sources_.AddIdle([this] {
       pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
       return false;
     });
   }
+=======
+  {
+    g_idle_add([] (gpointer data) -> gboolean {
+      Controller *self = (Controller*)data;
+        self->pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+      return FALSE;
+    }, this);
+  }
+>>>>>>> MERGE-SOURCE
 
   pimpl->launcher_keynav = false;
   if (!pimpl->launcher_open)

=== modified file 'launcher/LauncherController.h'
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-07-10 15:51:59 +0000
+++ launcher/LauncherIcon.cpp	2012-08-03 16:26:24 +0000
@@ -621,13 +621,21 @@
   return true;
 }
 
+<<<<<<< TREE
 void LauncherIcon::RecvMouseDown(int button, int monitor, unsigned long key_flags)
+=======
+void LauncherIcon::RecvMouseDown(int button, unsigned long key_flags, int monitor)
+>>>>>>> MERGE-SOURCE
 {
   if (button == 3)
     OpenQuicklist();
 }
 
+<<<<<<< TREE
 void LauncherIcon::RecvMouseUp(int button, int monitor, unsigned long key_flags)
+=======
+void LauncherIcon::RecvMouseUp(int button, unsigned long key_flags, int monitor)
+>>>>>>> MERGE-SOURCE
 {
   if (button == 3)
   {
@@ -636,15 +644,25 @@
   }
 }
 
+<<<<<<< TREE
 void LauncherIcon::RecvMouseClick(int button, int monitor, unsigned long key_flags)
+=======
+void LauncherIcon::RecvMouseClick(int button, unsigned long key_flags, int monitor)
+>>>>>>> MERGE-SOURCE
 {
   ActionArg arg(ActionArg::LAUNCHER, button);
   arg.monitor = monitor;
-
-  bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);
-
-  // Click without shift
-  if (button == 1 && !shift_pressed)
+  bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);
+
+<<<<<<< TREE
+  bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);
+
+  // Click without shift
+  if (button == 1 && !shift_pressed)
+=======
+  // Click without shift
+  if (button == 1 && !shift_pressed)
+>>>>>>> MERGE-SOURCE
     Activate(arg);
   // Middle click or click with shift
   else if ((button == 2) || (button == 1 && shift_pressed))
@@ -852,11 +870,33 @@
     UBusServer* ubus = ubus_server_get_default();
     ubus_server_send_message(ubus, UBUS_LAUNCHER_ICON_URGENT_CHANGED, g_variant_new_boolean(value));
   }
-
-  if (quirk == QUIRK_VISIBLE)
-  {
-     visibility_changed.emit();
-  }
+<<<<<<< TREE
+
+  if (quirk == QUIRK_VISIBLE)
+  {
+     visibility_changed.emit();
+  }
+=======
+
+  if (quirk == QUIRK_VISIBLE)
+  {
+     visibility_changed.emit();
+  }
+}
+
+gboolean
+LauncherIcon::OnDelayedUpdateTimeout(gpointer data)
+{
+  DelayedUpdateArg* arg = (DelayedUpdateArg*) data;
+  LauncherIcon* self = arg->self;
+
+  clock_gettime(CLOCK_MONOTONIC, &(self->_quirk_times[arg->quirk]));
+  self->EmitNeedsRedraw();
+
+  self->_time_delay_handle = 0;
+
+  return false;
+>>>>>>> MERGE-SOURCE
 }
 
 void

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2012-06-18 02:57:23 +0000
+++ launcher/LauncherIcon.h	2012-08-03 16:26:24 +0000
@@ -70,11 +70,19 @@
 
   void RecvMouseLeave(int monitor);
 
+<<<<<<< TREE
   void RecvMouseDown(int button, int monitor, unsigned long key_flags = 0);
 
   void RecvMouseUp(int button, int monitor, unsigned long key_flags = 0);
 
   void RecvMouseClick(int button, int monitor, unsigned long key_flags = 0);
+=======
+  void RecvMouseDown(int button, unsigned long key_flags, int monitor);
+
+  void RecvMouseUp(int button, unsigned long key_flags, int monitor);
+
+  void RecvMouseClick(int button, unsigned long key_flags, int monitor);
+>>>>>>> MERGE-SOURCE
 
   void HideTooltip();
 

=== modified file 'launcher/MockLauncherIcon.h'
=== modified file 'launcher/PointerBarrier.h'
=== modified file 'launcher/QuicklistMenuItem.cpp'
=== modified file 'launcher/QuicklistMenuItem.h'
=== modified file 'launcher/QuicklistMenuItemSeparator.cpp'
=== modified file 'launcher/QuicklistMenuItemSeparator.h'
=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2012-07-25 16:00:26 +0000
+++ launcher/QuicklistView.cpp	2012-08-03 16:26:24 +0000
@@ -302,7 +302,14 @@
     case NUX_KP_ENTER:
       if (IsMenuItemSelectable(_current_item_index))
       {
+<<<<<<< TREE
         ActivateItem(GetNthItems(_current_item_index));
+=======
+        dbusmenu_menuitem_handle_event(GetNthItems(_current_item_index)->_menuItem,
+                                       "clicked",
+                                       NULL,
+                                       0);
+>>>>>>> MERGE-SOURCE
         Hide();
       }
       break;
@@ -314,6 +321,7 @@
 
 QuicklistView::~QuicklistView()
 {
+<<<<<<< TREE
   for (auto item : _item_list)
   {
     // Remove from introspection
@@ -321,6 +329,16 @@
     item->UnReference();
   }
 
+=======
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    // Remove from introspection
+    RemoveChild(*it);
+    (*it)->UnReference();
+  }
+
+>>>>>>> MERGE-SOURCE
   _item_list.clear();
 }
 
@@ -337,7 +355,11 @@
 
   if (!_enable_quicklist_for_testing)
   {
+<<<<<<< TREE
     if (!_item_list.empty())
+=======
+    if ((_item_list.size() != 0))
+>>>>>>> MERGE-SOURCE
     {
       int offscreen_size = GetBaseY() +
                            GetBaseHeight() -
@@ -418,12 +440,22 @@
 
   gfxContext.PushClippingRectangle(base);
 
+<<<<<<< TREE
   for (auto item : _item_list)
   {
     if (item->GetVisible())
       item->ProcessDraw(gfxContext, forceDraw);
   }
 
+=======
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    if ((*it)->GetVisible())
+      (*it)->ProcessDraw(gfxContext, forceDraw);
+  }
+
+>>>>>>> MERGE-SOURCE
   gfxContext.PopClippingRectangle();
 }
 
@@ -435,6 +467,7 @@
   int MaxItemWidth = 0;
   int TotalItemHeight = 0;
 
+<<<<<<< TREE
   for (auto item : _item_list)
   {
     // Make sure item is in layout if it should be
@@ -454,6 +487,26 @@
     textHeight += QuicklistMenuItem::ITEM_MARGIN * 2;
 
     MaxItemWidth = std::max(MaxItemWidth, textWidth);
+=======
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    // Make sure item is in layout if it should be
+    if (!(*it)->GetVisible())
+    {
+      _item_layout->RemoveChildObject(*it);
+      continue;
+    }
+    else if (!(*it)->GetParentObject())
+      _item_layout->AddView(*it, 1, nux::eCenter, nux::eFull);
+
+    int  textWidth  = 0;
+    int  textHeight = 0;
+    (*it)->GetTextExtents(textWidth, textHeight);
+    if (textWidth > MaxItemWidth)
+      MaxItemWidth = textWidth;
+    textHeight += QuicklistMenuItem::ITEM_MARGIN * 2;
+>>>>>>> MERGE-SOURCE
     TotalItemHeight += textHeight;
   }
 
@@ -492,6 +545,7 @@
   UpdateTexture();
 
   int x = _padding + _anchor_width + _corner_radius + _offset_correction;
+<<<<<<< TREE
   int y = _top_space->GetMinimumHeight();
 
   for (auto item : _item_list)
@@ -505,11 +559,28 @@
     y += item->GetBaseHeight();
   }
 
+=======
+  int y = _top_space->GetMinimumHeight();
+
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    if (!(*it)->GetVisible())
+      continue;
+
+    (*it)->SetBaseX(x);
+    (*it)->SetBaseY(y);
+
+    y += (*it)->GetBaseHeight();
+  }
+
+>>>>>>> MERGE-SOURCE
   // We must correct the width of line separators. The rendering of the separator can be smaller than the width of the
   // quicklist. The reason for that is, the quicklist width is determined by the largest entry it contains. That size is
   // only after MaxItemWidth is computed in QuicklistView::PreLayoutManagement.
   // The setting of the separator width is done here after the Layout cycle for this widget is over. The width of the separator
   // has bee set correctly during the layout cycle, but the cairo rendering still need to be adjusted.
+<<<<<<< TREE
   int separator_width = _item_layout->GetBaseWidth();
 
   for (auto item : _item_list)
@@ -521,6 +592,20 @@
     }
   }
 
+=======
+  int separator_width = _item_layout->GetBaseWidth();
+
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    QuicklistMenuItem* item = (QuicklistMenuItem*)(*it);
+    if (item->GetVisible() && item->CairoSurfaceWidth() != separator_width)
+    {
+      // Compute textures of the item.
+      item->UpdateTexture();
+    }
+  }
+
+>>>>>>> MERGE-SOURCE
   return result;
 }
 
@@ -563,6 +648,7 @@
       ActivateItem(item);
     }
   }
+<<<<<<< TREE
 }
 
 void QuicklistView::ActivateItem(QuicklistMenuItem* item)
@@ -575,6 +661,8 @@
 
     dbusmenu_menuitem_handle_event(item->_menuItem, "clicked", NULL, 0);
   }
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 void QuicklistView::RecvItemMouseRelease(QuicklistMenuItem* item, int x, int y)
@@ -593,16 +681,29 @@
 
 void QuicklistView::CancelItemsPrelightStatus()
 {
+<<<<<<< TREE
   for (auto item : _item_list)
   {
     item->_prelight = false;
   }
+=======
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    (*it)->_prelight = false;
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void QuicklistView::RecvItemMouseDrag(QuicklistMenuItem* item, int x, int y)
 {
   nux::Geometry geo;
-  for (auto it : _item_list)
+<<<<<<< TREE
+  for (auto it : _item_list)
+=======
+
+  for (auto it : _item_list)
+>>>>>>> MERGE-SOURCE
   {
     int item_index = GetItemIndex(it);
 
@@ -683,7 +784,10 @@
     item->UnReference();
   }
 
+<<<<<<< TREE
 
+=======
+>>>>>>> MERGE-SOURCE
   _item_list.clear();
 
   _item_layout->Clear();

=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2012-07-11 06:21:46 +0000
+++ launcher/QuicklistView.h	2012-08-03 16:26:24 +0000
@@ -131,10 +131,15 @@
   //! Check the mouse up event sent by an item. Detect the item where the mous is and emit the appropriate signal.
   void CheckAndEmitItemSignal(int x, int y);
 
+<<<<<<< TREE
   void ActivateItem(QuicklistMenuItem* item);
 
   void SelectItem(int index);
   bool IsMenuItemSelectable(int index);
+=======
+  void SelectItem(int index);
+  bool IsMenuItemSelectable(int index);
+>>>>>>> MERGE-SOURCE
 
   //nux::CairoGraphics*   _cairo_graphics;
   int                   _anchorX;

=== modified file 'launcher/SimpleLauncherIcon.cpp'
--- launcher/SimpleLauncherIcon.cpp	2012-06-01 04:00:29 +0000
+++ launcher/SimpleLauncherIcon.cpp	2012-08-03 16:26:24 +0000
@@ -69,6 +69,7 @@
     g_signal_handler_disconnect(gtk_icon_theme_get_default(), theme_changed_id_);
 }
 
+<<<<<<< TREE
 void SimpleLauncherIcon::OnMouseDown(int button, int monitor, unsigned long key_flags)
 {
 }
@@ -78,6 +79,17 @@
 }
 
 void SimpleLauncherIcon::OnMouseClick(int button, int monitor, unsigned long key_flags)
+=======
+void SimpleLauncherIcon::OnMouseDown(int button, unsigned long key_flags, int monitor)
+{
+}
+
+void SimpleLauncherIcon::OnMouseUp(int button, unsigned long key_flags, int monitor)
+{
+}
+
+void SimpleLauncherIcon::OnMouseClick(int button, unsigned long key_flags, int monitor)
+>>>>>>> MERGE-SOURCE
 {
 }
 

=== modified file 'launcher/SimpleLauncherIcon.h'
--- launcher/SimpleLauncherIcon.h	2012-06-01 04:00:29 +0000
+++ launcher/SimpleLauncherIcon.h	2012-08-03 16:26:24 +0000
@@ -49,11 +49,18 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
+<<<<<<< TREE
   virtual void OnMouseDown(int button, int monitor, unsigned long key_flags = 0);
   virtual void OnMouseUp(int button, int monitor, unsigned long key_flags = 0);
   virtual void OnMouseClick(int button, int monitor, unsigned long key_flags = 0);
+=======
+  virtual void OnMouseDown(int button, unsigned long key_flags, int monitor);
+  virtual void OnMouseUp(int button, unsigned long key_flags, int monitor);
+  virtual void OnMouseClick(int button, unsigned long key_flags, int monitor);
+>>>>>>> MERGE-SOURCE
   virtual void OnMouseEnter(int monitor);
   virtual void OnMouseLeave(int monitor);
+
   virtual void ActivateLauncherIcon(ActionArg arg);
 
 private:

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-07-25 03:11:05 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-08-03 16:26:24 +0000
@@ -47,12 +47,25 @@
 {
 
   aptdaemon_trans_.Connect("PropertyChanged", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnPropertyChanged));
-  aptdaemon_trans_.Connect("Finished", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnFinished));
-
-  SetIconType(TYPE_APPLICATION);
-  icon_name = icon_path;
-  if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet
-    tooltip_text = _("Waiting to install");
+<<<<<<< TREE
+  aptdaemon_trans_.Connect("Finished", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnFinished));
+
+  SetIconType(TYPE_APPLICATION);
+  icon_name = icon_path;
+  if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet
+    tooltip_text = _("Waiting to install");
+=======
+  aptdaemon_trans_.Connect("Finished", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnFinished));
+
+  SetIconType(TYPE_APPLICATION);
+  icon_name = icon_path;
+  if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet
+    tooltip_text = _("Waiting to install");
+  else {
+    SetQuirk(QUIRK_URGENT, true);
+    needs_urgent_ = true;
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void SoftwareCenterLauncherIcon::Animate(nux::ObjectPtr<Launcher> launcher,

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
=== modified file 'launcher/StandaloneLauncher.cpp'
--- launcher/StandaloneLauncher.cpp	2012-07-27 20:20:29 +0000
+++ launcher/StandaloneLauncher.cpp	2012-08-03 16:26:24 +0000
@@ -31,12 +31,22 @@
 #include "NuxGraphics/GraphicsEngine.h"
 #include <gtk/gtk.h>
 
+<<<<<<< TREE
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "FavoriteStoreGSettings.h"
+=======
+#include "BackgroundEffectHelper.h"
+#include "FavoriteStoreGSettings.h"
+>>>>>>> MERGE-SOURCE
 #include "LauncherController.h"
 #include "Launcher.h"
+<<<<<<< TREE
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
+=======
+#include "PanelStyle.h"
+
+>>>>>>> MERGE-SOURCE
 #include <dbus/dbus-glib.h>
 
 using namespace unity;
@@ -59,10 +69,17 @@
 
   nux::NuxInitialize(0);
 
+<<<<<<< TREE
   unity::Settings settings;
   panel::Style panel_style;
   internal::FavoriteStoreGSettings favorite_store;
 
+=======
+  GeisAdapter geis_adapter;
+  panel::Style panel_style;
+  internal::FavoriteStoreGSettings favorite_store;
+
+>>>>>>> MERGE-SOURCE
   BackgroundEffectHelper::blur_type = BLUR_NONE;
   nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Switcher"), 300, 800, 0, &ThreadWidgetInit, 0);
 

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-08-02 02:14:22 +0000
+++ launcher/SwitcherController.cpp	2012-08-03 16:26:24 +0000
@@ -154,11 +154,19 @@
 
   ConstructView();
 
+<<<<<<< TREE
   ubus_manager_.SendMessage(UBUS_SWITCHER_START, NULL);
 
   if (view_window_) {
     view_window_->ShowWindow(true);
     view_window_->PushToFront();
+=======
+  ubus_manager_.SendMessage(UBUS_SWITCHER_START);
+
+  if (view_window_) {
+    view_window_->ShowWindow(true);
+    view_window_->PushToFront();
+>>>>>>> MERGE-SOURCE
     view_window_->SetOpacity(1.0f);
   }
 }
@@ -239,11 +247,21 @@
     }
   }
 
+<<<<<<< TREE
   ubus_manager_.SendMessage(UBUS_SWITCHER_END, g_variant_new_boolean(!accept_state));
 
   sources_.Remove(VIEW_CONSTRUCT_IDLE);
   sources_.Remove(SHOW_TIMEOUT);
   sources_.Remove(DETAIL_TIMEOUT);
+=======
+  ubus_manager_.SendMessage(UBUS_SWITCHER_END, g_variant_new_boolean(!accept_state));
+
+  if (view_idle_timer_)
+  {
+    g_source_remove(view_idle_timer_);
+    view_idle_timer_ = 0;
+  }
+>>>>>>> MERGE-SOURCE
 
   model_.reset();
   visible_ = false;
@@ -388,6 +406,7 @@
   return view_->ExternalTargets();
 }
 
+<<<<<<< TREE
 guint Controller::GetSwitcherInputWindowId() const
 {
   return view_window_->GetInputWindowId();
@@ -408,11 +427,19 @@
   return (show_desktop_disabled_ ? 0 : 1);
 }
 
+=======
+guint Controller::GetSwitcherInputWindowId() const
+{
+  return view_window_->GetInputWindowId();
+}
+
+>>>>>>> MERGE-SOURCE
 bool Controller::CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr first,
                                               AbstractLauncherIcon::Ptr second)
 {
   if (first->GetIconType() == second->GetIconType())
     return first->SwitcherPriority() > second->SwitcherPriority();
+<<<<<<< TREE
 
   if (first->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
     return true;
@@ -420,6 +447,14 @@
   if (second->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
     return false;
 
+=======
+
+  if (first->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
+	return true;
+
+  if (second->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
+	return false;
+>>>>>>> MERGE-SOURCE
   return first->GetIconType() < second->GetIconType();
 }
 

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-07-27 01:06:27 +0000
+++ launcher/SwitcherController.h	2012-08-03 16:26:24 +0000
@@ -90,12 +90,17 @@
 
   ui::LayoutWindowList ExternalRenderTargets ();
 
+<<<<<<< TREE
   guint GetSwitcherInputWindowId() const;
 
   bool IsShowDesktopDisabled() const;
   void SetShowDesktopDisabled(bool disabled);
   int StartIndex() const;
 
+=======
+  guint GetSwitcherInputWindowId() const;
+
+>>>>>>> MERGE-SOURCE
 protected:
   // Introspectable methods
   std::string GetName() const;

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2012-06-18 02:57:23 +0000
+++ launcher/SwitcherView.h	2012-08-03 16:26:24 +0000
@@ -24,8 +24,16 @@
 #include "unity-shared/AbstractIconRenderer.h"
 #include "unity-shared/StaticCairoText.h"
 #include "LayoutSystem.h"