Merge lp:~smspillaz/unity/4.0_fix_912682 into lp:unity

[Sam Spilsbury]

Fixes bug 912682

=== modified file 'AUTHORS'
--- AUTHORS	2012-01-12 16:47:05 +0000
+++ AUTHORS	2012-01-18 19:37:39 +0000
@@ -57,6 +57,10 @@
  Thomi Richards <[e-mail]>, Alex Launi <[e-mail]>
  Tim Penhey <[e-mail]>
  Ubuntu <ubuntu@netbook>
+<<<<<<< TREE
  Unity Merger <[e-mail]>
  Victor Eduardo <[e-mail]>
  Zaid Yeganeh <[e-mail]>
+=======
+ Zaid Yeganeh <[e-mail]>
+>>>>>>> MERGE-SOURCE

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-19 22:18:53 +0000
+++ CMakeLists.txt	2012-01-18 19:37:39 +0000
@@ -7,8 +7,13 @@
 # Base bits
 #
 set (PROJECT_NAME "unity")
+<<<<<<< TREE
 set (UNITY_MAJOR 5)
 set (UNITY_MINOR 0)
+=======
+set (UNITY_MAJOR 4)
+set (UNITY_MINOR 28)
+>>>>>>> MERGE-SOURCE
 set (UNITY_MICRO 0)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "5.0")

=== modified file 'ChangeLog'
--- ChangeLog	2012-01-12 16:47:05 +0000
+++ ChangeLog	2012-01-18 19:37:39 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2012-01-11  Marco Trevisan (Treviño)  <[e-mail]>
 
 	Fixed bug #914251, local variables should be passed by value.
@@ -3369,6 +3370,398 @@
 
 	Release\ 4.22.0
 
+=======
[phone]  Mirco Müller <[e-mail]>
+
+	4.26.0 release with backported fixes (from trunk), please consult "bzr log" for authors of individual patches
+	* (LP #863114): cannot raise window from panel after minimize
+	* (LP #865890): compiz crashed with SIGSEGV in nux::BaseWindow::GetInputWindowId()
+	* back out a horizontal margin that breaks sizing in some cases
+	* raise input windows from nux unconditionally on alt-tab and showing of the dash using compiz
+	* (LP #832151): properly unref'ing tray the FilterTrayCallback should not be called again
+	* (LP #834630): add an out-of-bounds check to the DetailXids vector
+	* (LP #856205): backported from unity trunk
+	* (LP #873100): clicking on panel when dash is open no longer causes maximized window to raise (backported r1751)
+	* (LP #860805): get focus on dash by pressing the super key first time after login (backported r1759)
+	* (LP #850623, LP #849611): don't segfault in geis_configuration_get_value() (backported r1728)
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Fix tests for FilterMultirangeWidget
+
[phone]  Zaid Yeganeh  <[e-mail]>
+  
+	Lens range widgets do not function correctly
+
[phone]  Zaid Yeganeh  <[e-mail]>
+
+	[UnityCore] Fixed the mouse interactions with the multi range filter
+	
+	modified:
+	UnityCore/MultiRangeFilter.cpp
+
[phone]  Jay Ó Broin  <[e-mail]>
+
+	Clicking blank space on top panel doesn't raise maximized window to front
+
[phone]  Jay Ó Broin  <[e-mail]>
+
+	Add handler to raise maximized window on left-click on panel (LP: #864708)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When the ibus was active and you pressed down it would move the focus to the result grid. Now when the ibus is active it keeps the focus when your press down/up
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Now pressing the ddown key with ibus works
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Bug #869196: unity panel menus don't stay open when clicked on second monitor with different geometry
+
[phone]  Robert Carr  <[e-mail]>
+
+	Always check return value of XGetWindowProperty otherwise we sometimes free a random chunk of memory
+
[phone]  Robert Carr  <[e-mail]>
+
+	Minimum height of multi range filter should be the same as for Genre buttons (32)
+
[phone]  Robert Carr  <[e-mail]>
+
+	Merge lp:~robertcarr/unity/filtertweaks
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_870430
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Use correct memory management and temporarily disable focus handlers when passing
+	the showdesktop wrap chain to core.
+	
+	Core checks for whether or not the window is allowed focus, for minimized windows
+	we set this to true because plugins such as scale need to check this value
+	to determine if a window should be added to their display lists. However, core
+	will set the "in showdesktop mode" value to true if the window is allowed to have
+	focus and wasn't already in showdesktop mode by the time the wrap chain is passed,
+	but the window is already hidden, so it shouldn't be allowed to be included in the
+	showdesktop list, so disable focus handlers such that CompWindow::focus will
+	return false
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Bug #870844: Double-click on the dash top panel is taken effect on the window underneith
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Leak fix
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: Code spacing fix
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: entry2geometry_hash free the keys as well.
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_843958 (lp:unity r1714)
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_870430 (lp:unity r1709)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Bug #869196: unity panel menus don't stay open when clicked on second monitor with different geometry
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: reset the use_event variable on menu-hidden
+	
+	This fixes the bug which caused the menus to re-close when opening one
+	after that the previous one has been closed using the "ESC" button.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelView: Sync geometries on panel window destruction
+	
+	This clears the indicators and menus entries geometries cached
+	in unity panel service.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelView: always sync geometries for indicators.
+	
+	Don't sync menus only if they aren't available in the current panel window
+	for the given monitor.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelView: When syncing geometries send a different panel name for each panel window
+	
+	Thanks to the new unity-panel-service code, this finally fixes bug #869196
+	for unity.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: Order the entries geometry per-panel to fix multi-monitor issues
+	
+	The entries geometries now are related to their parent panel, so every panel window
+	that is built now can define the geometries of his own entries.
+	This allows to redefine the get_entry_at function to make the event_filter function
+	to work correctly also when we're in a multi-screen environment not cause the indicator
+	menus to close on non-primary monitors.
+	
+	This is the needed base to fix bug #869196
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #870844: Double-click on the dash top panel is taken effect on the window underneith
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: don't react to middle-click when the dash is opened.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: don't react to double-click when the dash is opened.
+	
+	Fixes bug #870844
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Bug #841750: Dash - horizental divider line in between categories incorrectly drawn
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #814610: FFe: Since showing devices in Nautilus is removed, there is no way to format an usb stick
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a "Format..." quicklist item to device icons (LP bug# 814610).
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #862849: F10 opens a random menu item when it should open the first one [regression]
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #839480: Dash - When the Dash is open and there is a maximised app in the background, the top bar background should not disappear
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #869109: compiz crashed with SIGSEGV in nux::ROProperty<std::string>::operator std::string()
+
[phone]  Robert Carr  <[e-mail]>
+
+	Minimum height of multi range filter should be the same as for Genre buttons (32)
+
[phone]  Robert Carr  <[e-mail]>
+
+	Always check return value of XGetWindowProperty otherwise we sometimes free a random chunk of memory
+
[phone]  Robert Carr  <[e-mail]>
+
+	Merge lp:~robertcarr/unity/filtertweaks
+
[phone]  Robert Carr  <[e-mail]>
+
+	Fix button opacity
+
[phone]  Robert Carr  <[e-mail]>
+
+	Fix all button positioning and right margin
+
[phone]  Robert Carr  <[e-mail]>
+
+	Fix all button shape
+
[phone]  Robert Carr  <[e-mail]>
+
+	Filter Genre widget buttons are too big, fix to match mockup
+
[phone]  Robert Carr  <[e-mail]>
+
+	Fix some spacing in filter bar. work against 863246
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Bug #841750: Dash - horizental divider line in between categories incorrectly drawn
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixed additional issues (opacity, margin) added to LP: #841750
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #862849: F10 opens a random menu item when it should open the first one [regression]
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	F10 should open the first menu.
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #839480: Dash - When the Dash is open and there is a maximised app in the background, the top bar background should not disappear
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Don't replace top-bar when dash is opened and there's a maximized window. Fix LP: #839480
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Bug #869109: compiz crashed with SIGSEGV in nux::ROProperty<std::string>::operator std::string()
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixes issues with clicking when you don't actually move the mouse, but the UI moves underneith it
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	[merge] trunk
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	ibus character selection window not drawn
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixed the preedit_cursor_
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Fixed ibus window and text disappearing. Also the preedit text is now highlighted, like it usually is else where
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_864758
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Remove old minimized window handlers from the handler list and null check
+	the transient for windows that we read, since compiz may have already removed
+	them.
+	
+	Fixes LP #864758
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_868930
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Use a temporary
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Do automaximization on placement which only happens once when the window
+	is mapped after it is created, rather than on reparenting which may happen
+	if the window is withdrawn.
+	
+	Fixes LP #868930
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_867959
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Fix space
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Check for hidden windows rather than minimized ones to cover the
+	show-desktop case
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_854595
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Cast correctly
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Use an enum
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Only force unminimize windows for the launcher case
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Always unminimize initially minimized windows when a launcher icon is
+	activated since they are inaccessible elsewhere
+	
+	Fix LP #854595
+
[phone]  Jay Taoko  <[e-mail]>
+
+	Resize the _gradient_texture (in PanelMenuView::Draw) if needed
+	
+	Fix: bug #863068
+	Fix: bug #868293
+	Fix: bug #869028
+
[phone]  Alejandro Piñeiro  <[e-mail]>
+
+	Fix bug 843280
+
[phone]  Alejandro Piñeiro  <[e-mail]>
+
+	Avoid a shadowed variable
+
[phone]  Alejandro Piñeiro  <[e-mail]>
+
+	a11y: Solves bug 843280
+
[phone]  Alex Launi  <[e-mail]>
+
+	merge fix for GetState crash
+
[phone]  Alex Launi  <[e-mail]>
+
+	Remove introspection implementations on PanelMenuView to avoid crash
+
[phone]  Alex Launi  <[e-mail]>
+
+	merge trunk
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Merge lp:~mhr3/unity/bug-865482
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Merge lp:~mhr3/unity/bug-865482
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Fix bug #865482
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/unity.fix_868185
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merge lp:~smspillaz/untiy/unity.fix_868185
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Fix LP#868185 . Fall through the map case when determining whether or
+	not to hook the minimize function in core
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Release\ 4.22.0
+
+>>>>>>> MERGE-SOURCE
 2011-10-04  Neil Jagdish Patel  <[e-mail]>
 
 	Add -lm

=== added directory 'manual-tests'
=== renamed directory 'manual-tests' => 'manual-tests.moved'
=== added file 'manual-tests/QuicklistOnExpo.txt'
--- manual-tests/QuicklistOnExpo.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/QuicklistOnExpo.txt	2012-01-18 19:37:39 +0000
@@ -0,0 +1,14 @@
+Test Quicklist while on Expo
+============================
+
+This test shows how the launcher quicklists work when the expo plugin is activated.
+
+#. Start with a clear screen
+#. Press Super+S or select the workspace switcher on the launcher
+#. When the workspace switcher is running, right-click over a launcher icon
+
+Outcome
+  The expo should terminate, and the quicklist should be shown once the
+  workspace switcher has been closed.
+  Clicking over a quicklist item should work as expected and clicking outside
+  that quicklist, should close it.

=== added file 'manual-tests/ReadMe.txt'
--- manual-tests/ReadMe.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/ReadMe.txt	2012-01-18 19:37:39 +0000
@@ -0,0 +1,47 @@
+==============
+Manual Testing
+==============
+
+Outline
+-------
+Sometimes it is not possible to easily make an automated test for some
+use-cases.  However just because something isn't easily tested automatically
+doesn't mean that there isn't value in creating a test for it, just that the
+test needs to be executed by a person until it is converted into an automated
+test.
+
+
+Format
+------
+Manual tests take the format of text files in this directory (the manual-test
+one).  These files are formatted using `reStructured Text`_.  A very
+comprehensive `quick reference`_ is available.
+
+.. _reStructured Text: http://en.wikipedia.org/wiki/ReStructuredText
+.. _quick reference: http://docutils.sourceforge.net/docs/user/rst/quickref.html
+
+Tests have a header, steps to follow, and an expected outcome, as demonstrated
+by the following example:
+
+There can be multiple tests in a single file, but they should all be related,
+and the filename should indicate the tests it contains.
+
+
+Test Dash
+---------
+This test shows that the dash appears when the super key is pushed.
+
+#. Start with a clear screen
+#. Press the <super> key
+
+Outcome
+  The dash appears, and focus is in the search box.  The icons on the laucher
+  are desaturated except for the ubuntu button at the top.  The icons in the
+  panel go white.
+
+
+Directory Structure
+-------------------
+It is expected that as we grow a number of manual tests, we will use
+directories to organise them.
+

=== added directory 'manual-tests/custom-dash-home'
=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json	2012-01-18 19:37:39 +0000
@@ -0,0 +1,22 @@
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icon": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"source": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/help-about.svg"
+	},
+	"shortcut4": {
+		"source": "transmission-gtk.desktop"
+	}
+}

=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json	2012-01-18 19:37:39 +0000
@@ -0,0 +1,44 @@
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icon": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"source": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/help-about.svg"
+	},
+	"shortcut4": {
+		"source": "transmission-gtk.desktop"
+	},
+	"shortcut5": {
+		"source": "/usr/share/applications/eog.desktop",
+		"name": "Eye Of Gnome",
+		"name[de]": "Auge des Zwergs",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/eog.svg"
+	},
+	"shortcut6": {
+		"source": "/usr/share/applications/jockey-gtk.desktop",
+		"name": "Jockey",
+		"name[de]": "Jockey",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/jockey.svg"
+	},
+	"shortcut7": {
+		"source": "/usr/share/applications/gwibber.desktop",
+		"name": "gwibber",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/gwibber.svg"
+	},
+	"shortcut8": {
+		"source": "/usr/share/applications/giggle.desktop",
+		"name": "Giggle",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/giggle.svg"
+	}
+}

=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json	2012-01-18 19:37:39 +0000
@@ -0,0 +1,23 @@
+this is some intentional garbage with lots of errors
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icn": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"sorce": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/hep-about.svg"
+	},
+	"shortcut12": {
+		"source": "transmission-gtk.destop"
+	}
+}

=== added file 'manual-tests/custom-dash-home/custom-dash-home.txt'
--- manual-tests/custom-dash-home/custom-dash-home.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/custom-dash-home.txt	2012-01-18 19:37:39 +0000
@@ -0,0 +1,46 @@
+Manual tests for the 'dash custom home screen' functionality
+============================================================
+
+How to test
+-----------
+
+To test the functionality, create the folder $HOME/.config/unity/, and copy the
+three files HomeShortcutsCustomized*.json there.
+
+Then for each of them repeat the following steps:
+
+    cd $HOME/.config/unity/
+    rm HomeShortcutsCustomized.json
+    ln -s $FILE HomeShortcutsCustomized.json # replace $FILE with the json file being considered
+    # restart unity
+    # open the dash
+    # check the visual appearance against the expected results detailed below
+
+
+Expected results
+----------------
+
+With 'HomeShortcutsCustomized-4-entries.json', the home screen of the dash
+contains 4 icons that fill the first row. The second row is empty.
+Those icons are:
+ - "Software Center": launches the Ubuntu Software Center, the icon is the
+   Ubuntu Circle Of Friends, and if you are running with a French locale the
+   name is localized to "Logithèque".
+ - "Rock Music": opens the music lens with the genre filter set to "Rock".
+ - "Vidéos": opens the files lens with the type filter set to "videos", the icon
+   is a yellow star.
+ - "Transmission BitTorrent Client": launches transmission-gtk.
+
+With 'HomeShortcutsCustomized-8-entries.json', the home screen of the dash
+contains 8 icons that fill the two rows. The first row contains the exact same
+icons as 'HomeShortcutsCustomized-4-entries.json' (see details above). The icons
+on the second row are:
+ - "Eye Of Gnome": launches eog, if you are running with a German locale the
+   name is localized to "Auge des Zwergs".
+ - "Jockey": launches jockey-gtk.
+ - "gwibber": launches gwibber.
+ - "Giggle": this icon appears only if giggle is installed, it launches giggle.
+
+With 'HomeShortcutsCustomized-broken.json', the home screen of the dash contains
+the default icons because the file fails to be parsed.
+

=== added file 'manual-tests/launcher.txt'
--- manual-tests/launcher.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/launcher.txt	2012-01-18 19:37:39 +0000
@@ -0,0 +1,11 @@
+Test Dash Key Focus
+-------------------
+This test shows that the search bar in the dash gets key focus when using the super key to start the dash on start up.
+
+#. Start on a fresh login
+#. Press the <super> key
+#. Wait for dash to appear
+#. Type "hello"
+
+Outcome
+  The dash will appear, and "hello" will be in the search box.

=== modified file 'plugins/unityshell/resources/dash-widgets.json'
--- plugins/unityshell/resources/dash-widgets.json	2012-01-13 15:13:30 +0000
+++ plugins/unityshell/resources/dash-widgets.json	2012-01-18 19:37:39 +0000
@@ -46,8 +46,13 @@
     "text-size"      : 1.0,
     "text-color"     : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
     "text-opacity"   : [      1.0,       1.0,       1.0,       1.0,       1.0], 
+<<<<<<< TREE
     "fill-color"     : ["#FFFFFF", "#000000", "#000000", "#000000", "#000000"],
     "fill-opacity"   : [      0.15,      0.0,       0.0,       0.0,       0.0],
+=======
+    "fill-color"     : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
+    "fill-opacity"   : [      0.25,       0.0,      0.25,       0.0,       0.0],
+>>>>>>> MERGE-SOURCE
     "overlay-opacity": [      0.1,       0.1,       0.1,       0.0,       0.0],
     "overlay-mode"   : [ "normal",  "normal",  "normal",  "normal",  "normal"],
     "blur-size"      : [        1,         1,         1,         0,         0]},

=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.cpp'
=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.h'
=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-01-13 14:30:52 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-01-18 19:37:39 +0000
@@ -82,9 +82,13 @@
 
   if (arg.source != ActionArg::SWITCHER)
   {
+<<<<<<< TREE
     user_visible = bamf_view_user_visible(BAMF_VIEW(m_App));
 
     bool any_visible = false;
+=======
+    bool any_visible = false;
+>>>>>>> MERGE-SOURCE
     for (l = bamf_view_get_children(BAMF_VIEW(m_App)); l; l = l->next)
     {
       view = static_cast <BamfView*> (l->data);
@@ -92,12 +96,19 @@
       if (BAMF_IS_WINDOW(view))
       {
         Window xid = bamf_window_get_xid(BAMF_WINDOW(view));
+<<<<<<< TREE
 
         if (!any_visible && WindowManager::Default()->IsWindowOnCurrentDesktop(xid))
         {
           any_visible = true;
         }
         if (active && !WindowManager::Default()->IsWindowMapped(xid))
+=======
+
+        if (WindowManager::Default ()->IsWindowOnCurrentDesktop(xid))
+          any_visible = true;
+        if (!WindowManager::Default ()->IsWindowMapped(xid))
+>>>>>>> MERGE-SOURCE
         {
           active = false;
         }
@@ -582,8 +593,12 @@
   GList* children, *l;
   BamfView* view;
   bool any_urgent = false;
+<<<<<<< TREE
   bool any_visible = false;
   bool any_user_visible = false;
+=======
+  bool any_visible = false;
+>>>>>>> MERGE-SOURCE
 
   children = bamf_view_get_children(BAMF_VIEW(m_App));
 
@@ -600,6 +615,10 @@
       bool urgent = bamf_view_is_urgent(view);
       bool user_visible = bamf_view_user_visible(view);
 
+      if (WindowManager::Default ()->IsWindowOnCurrentDesktop (xid) &&
+          WindowManager::Default ()->IsWindowVisible (xid))
+        any_visible = true;
+
       if (any_urgent)
       {
         if (urgent)
@@ -615,19 +634,31 @@
         if (urgent || user_visible)
         {
           windows.clear();
+<<<<<<< TREE
           any_visible = false;
           any_urgent = (any_urgent || urgent);
           any_user_visible = (any_user_visible || user_visible);
+=======
+          any_visible = false;
+          any_urgent = true;
+>>>>>>> MERGE-SOURCE
         }
+<<<<<<< TREE
 
         windows.push_back(xid);
+=======
+>>>>>>> MERGE-SOURCE
       }
+<<<<<<< TREE
 
       if (WindowManager::Default()->IsWindowOnCurrentDesktop(xid) &&
           WindowManager::Default()->IsWindowVisible(xid))
       {
         any_visible = true;
       }
+=======
+      windows.push_back(xid);
+>>>>>>> MERGE-SOURCE
     }
   }
   g_list_free(children);

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2011-12-08 01:23:11 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-01-18 19:37:39 +0000
@@ -131,8 +131,13 @@
   SetupDashView();
   Relayout();
   ensure_id_ = 0;
+<<<<<<< TREE
 
   on_realize.emit();
+=======
+
+  on_realize.emit ();
+>>>>>>> MERGE-SOURCE
 }
 
 nux::BaseWindow* Controller::window() const

=== modified file 'plugins/unityshell/src/DashController.h'
=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2012-01-17 15:39:16 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2012-01-18 19:37:39 +0000
@@ -218,6 +218,7 @@
                                        (GSourceFunc)&OnLiveSearchTimeout,
                                        this);
 
+<<<<<<< TREE
   // Don't animate the spinner immediately, the searches are fast and
   // the spinner would just flicker
   if (start_spinner_timeout_)
@@ -228,6 +229,10 @@
                                          this);
  
   bool is_empty = pango_entry_->im_active() ? false : pango_entry_->GetText() == ""; 
+=======
+ 
+  bool is_empty = pango_entry_->im_active() ? false : pango_entry_->GetText() == ""; 
+>>>>>>> MERGE-SOURCE
   hint_->SetVisible(is_empty);
 
   pango_entry_->QueueDraw();

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-01-17 13:31:52 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-01-18 19:37:39 +0000
@@ -72,8 +72,15 @@
 
 DashView::~DashView()
 {
-  if (searching_timeout_id_)
-    g_source_remove (searching_timeout_id_);
+<<<<<<< TREE
+  if (searching_timeout_id_)
+    g_source_remove (searching_timeout_id_);
+=======
+  if (searching_timeout_id_)
+    g_source_remove (searching_timeout_id_);
+  delete bg_layer_;
+  delete bg_darken_layer_;
+>>>>>>> MERGE-SOURCE
 }
 
 void DashView::AboutToShow()
@@ -306,6 +313,17 @@
   return FALSE;
 }
 
+gboolean DashView::ResetSearchStateCb(gpointer data)
+{
+  DashView *self = static_cast<DashView*>(data);
+
+  self->search_in_progress_ = false;
+  self->activate_on_finish_ = false;
+  self->searching_timeout_id_ = 0;
+
+  return FALSE;
+}
+
 void DashView::OnSearchChanged(std::string const& search_string)
 {
   LOG_DEBUG(logger) << "Search changed: " << search_string;
@@ -384,6 +402,7 @@
 
 void DashView::OnSearchFinished(Lens::Hints const& hints)
 {
+<<<<<<< TREE
   Lens::Hints::const_iterator it;
   it = hints.find("no-results-hint");
   
@@ -395,6 +414,10 @@
   std::string search_string = search_bar_->search_string;
   if (active_lens_view_ && active_lens_view_->search_string == search_string)
   {
+=======
+  if (search_bar_->search_string == search_string)
+  {
+>>>>>>> MERGE-SOURCE
     search_bar_->SearchFinished();
     search_in_progress_ = false;
     if (activate_on_finish_)

=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2012-01-16 15:31:59 +0000
+++ plugins/unityshell/src/DashView.h	2012-01-18 19:37:39 +0000
@@ -126,10 +126,16 @@
   OverlayRenderer renderer_;
 
   std::string last_activated_uri_;
+<<<<<<< TREE
   // we're passing this back to g_* functions, so we'll keep the g* type
   guint searching_timeout_id_;
   bool search_in_progress_;
   bool activate_on_finish_;
+=======
+  guint searching_timeout_id_;
+  bool search_in_progress_;
+  bool activate_on_finish_;
+>>>>>>> MERGE-SOURCE
 
   bool visible_;
 };

=== modified file 'plugins/unityshell/src/FilterBar.cpp'
--- plugins/unityshell/src/FilterBar.cpp	2011-12-20 14:25:28 +0000
+++ plugins/unityshell/src/FilterBar.cpp	2012-01-18 19:37:39 +0000
@@ -39,6 +39,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterBar);
 
+<<<<<<< TREE
 FilterBar::FilterBar(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
 {
@@ -83,6 +84,46 @@
   for (auto iter: filter_map_)
   {
     if (iter.first->id == filter->id)
+=======
+  FilterBar::FilterBar(NUX_FILE_LINE_DECL)
+      : View (NUX_FILE_LINE_PARAM) {
+    // TODO - does the filterbar associate itself with a model of some sort?
+    // does libunity provide a Lens.Filters model or something that we can update on?
+    // don't want to associate a Filterbar with just a lens model, its a filter bar not a
+    // lens parser
+    Init ();
+  }
+
+  FilterBar::~FilterBar()
+  {
+  }
+
+  void FilterBar::Init () {
+    nux::Layout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);
+    layout->SetVerticalInternalMargin(12);
+    layout->SetVerticalExternalMargin(0);
+    SetLayout (layout);
+  }
+
+  void FilterBar::SetFilters (dash::Filters::Ptr filters)
+  {
+    filters_ = filters;
+  }
+
+  void FilterBar::AddFilter (dash::Filter::Ptr filter) {
+    if (filter_map_.count (filter) > 0) {
+      g_warning ("Attempting to add a filter that has already been added");
+      return;
+    }
+
+    nux::View *filter_view = factory_.WidgetForFilter (filter);
+    filter_map_[filter] = filter_view;
+    GetLayout()->AddView(filter_view, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+  }
+
+  void FilterBar::RemoveFilter (dash::Filter::Ptr filter) {
+    for (auto iter: filter_map_)
+>>>>>>> MERGE-SOURCE
     {
       nux::View* filter_view = iter.second;
       filter_map_.erase(filter_map_.find(iter.first));

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2012-01-18 19:37:39 +0000
@@ -23,6 +23,7 @@
 #include "DashStyle.h"
 #include "FilterBasicButton.h"
 #include "FilterExpanderLabel.h"
+#include "PlacesStyle.h"
 
 namespace unity
 {
@@ -31,6 +32,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
+<<<<<<< TREE
 FilterExpanderLabel::FilterExpanderLabel(std::string const& label, NUX_FILE_LINE_DECL)
   : FilterWidget(NUX_FILE_LINE_PARAM)
   , expanded(true)
@@ -150,3 +152,111 @@
 
 } // namespace dash
 } // namespace unity
+=======
+  FilterExpanderLabel::FilterExpanderLabel (std::string label, NUX_FILE_LINE_DECL)
+      : nux::View (NUX_FILE_LINE_PARAM)
+      , expanded (true)
+      , top_bar_layout_ (NULL)
+      , contents_ (NULL)
+      , right_hand_contents_ (NULL)
+      , expander_graphic_ (NULL)
+      , label_("<span size='larger' weight='bold'>" + label + "</span>")
+  {
+    expanded.changed.connect (sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
+    BuildLayout ();
+  }
+
+  FilterExpanderLabel::~FilterExpanderLabel() {
+
+  }
+
+  void FilterExpanderLabel::SetLabel (std::string label)
+  {
+    label_ = "<span size='larger' weight='bold'>" + label + "</span>";
+    cairo_label_->SetText(label_.c_str());
+  }
+
+  void FilterExpanderLabel::SetRightHandView (nux::View *view)
+  {
+    view->SetMaximumHeight(30);
+
+    right_hand_contents_ = view;
+    top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+  }
+
+  void FilterExpanderLabel::SetContents (nux::Layout *contents)
+  {
+    contents_ = contents;
+    contents_->SetVisible(expanded);
+    layout_->AddLayout (contents_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+
+    QueueDraw();
+  }
+
+  void FilterExpanderLabel::BuildLayout ()
+  {
+    PlacesStyle *style = PlacesStyle::GetDefault(); 
+
+    layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
+    top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+    
+    cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
+    cairo_label_->SetFontName("Ubuntu 10");
+    cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+    cairo_label_->mouse_down.connect(
+      [&](int x, int y, unsigned long button_flags, unsigned long key_flag)
+      {
+        expanded = !expanded;
+        if (contents_)
+          contents_->SetVisible(expanded);
+        QueueDraw();
+      });
+
+    top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+    top_bar_layout_->AddSpace(1, 1);
+    
+    top_bar_layout_->SetMaximumWidth((style->GetTileWidth() -12)*2+10);
+
+    layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
+    layout_->SetVerticalInternalMargin(0);
+
+    SetLayout(layout_);
+
+    QueueRelayout();
+    NeedRedraw();
+  }
+
+  void FilterExpanderLabel::DoExpandChange (bool change)
+  {
+    if (contents_)
+      contents_->SetVisible(change);
+
+    QueueRelayout();
+  }
+
+  long int FilterExpanderLabel::ProcessEvent(nux::IEvent& ievent, long int TraverseInfo, long int ProcessEventInfo) {
+    return GetLayout()->ProcessEvent(ievent, TraverseInfo, ProcessEventInfo);
+  }
+
+  void FilterExpanderLabel::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    nux::Geometry geo = GetGeometry();
+
+    GfxContext.PushClippingRectangle(geo);
+    nux::GetPainter().PaintBackground(GfxContext, geo);
+    GfxContext.PopClippingRectangle();
+  }
+
+  void FilterExpanderLabel::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    GfxContext.PushClippingRectangle(GetGeometry());
+
+    GetLayout()->ProcessDraw(GfxContext, force_draw);
+
+    GfxContext.PopClippingRectangle();
+  }
+
+  void FilterExpanderLabel::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    nux::View::PostDraw(GfxContext, force_draw);
+  }
+
+};
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp	2012-01-18 10:28:45 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp	2012-01-18 19:37:39 +0000
@@ -36,6 +36,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterGenre);
 
+<<<<<<< TREE
 FilterGenre::FilterGenre(int columns, NUX_FILE_LINE_DECL)
  : FilterExpanderLabel(_("Categories"), NUX_FILE_LINE_PARAM)
 {
@@ -101,6 +102,81 @@
   for (auto it=buttons_.begin() ; it != buttons_.end(); ++it)
   {
     if ((*it)->GetFilter() == removed_filter)
+=======
+  FilterGenre::FilterGenre (NUX_FILE_LINE_DECL)
+      : FilterExpanderLabel (_("Categories"), NUX_FILE_LINE_PARAM)
+      , all_selected (false)
+  {
+    InitTheme();
+
+    all_button_ = new FilterBasicButton(_("All"), NUX_TRACKER_LOCATION);
+    all_button_->activated.connect(sigc::mem_fun(this, &FilterGenre::OnAllActivated));
+    all_button_->label = _("All");
+
+    PlacesStyle* style = PlacesStyle::GetDefault();
+
+    genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
+    genre_layout_->ForceChildrenSize(true);
+    genre_layout_->SetHeightMatchContent(true);
+    genre_layout_->SetVerticalInternalMargin (12);
+    genre_layout_->SetVerticalExternalMargin (12);
+    genre_layout_->SetHorizontalInternalMargin (10);
+    genre_layout_->EnablePartialVisibility (false);
+    genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 32);
+
+    SetRightHandView(all_button_);
+    SetContents(genre_layout_);
+  }
+
+  FilterGenre::~FilterGenre()
+  {
+  }
+
+  void FilterGenre::SetFilter(dash::Filter::Ptr filter)
+  {
+    filter_ = std::static_pointer_cast<dash::CheckOptionFilter>(filter);
+
+    filter_->option_added.connect (sigc::mem_fun (this, &FilterGenre::OnOptionAdded));
+    filter_->option_removed.connect(sigc::mem_fun (this, &FilterGenre::OnOptionRemoved));
+
+    // finally - make sure we are up-todate with our filter list
+    dash::CheckOptionFilter::CheckOptions::iterator it;
+    dash::CheckOptionFilter::CheckOptions options = filter_->options;
+    for (it = options.begin(); it < options.end(); it++)
+      OnOptionAdded(*it);
+
+    SetLabel(filter_->name);
+  }
+
+  void FilterGenre::OnOptionAdded(dash::FilterOption::Ptr new_filter)
+  {
+    std::string tmp_label = new_filter->name;
+
+    char* escape = g_markup_escape_text(tmp_label.c_str(), -1);
+    std::string label = escape;
+    g_free(escape);
+
+    FilterGenreButton* button = new FilterGenreButton (label, NUX_TRACKER_LOCATION);
+    button->SetFilter (new_filter);
+    genre_layout_->AddView (button, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+    buttons_.push_back (button);
+  }
+
+  void FilterGenre::OnOptionRemoved(dash::FilterOption::Ptr removed_filter)
+  {
+    std::vector<FilterGenreButton*>::iterator it;
+    FilterGenreButton* found_filter = NULL;
+    for ( it=buttons_.begin() ; it < buttons_.end(); it++ )
+    {
+      if ((*it)->GetFilter() == removed_filter)
+      {
+        found_filter = *it;
+        break;
+      }
+    }
+
+    if (found_filter)
+>>>>>>> MERGE-SOURCE
     {
       genre_layout_->RemoveChildObject(*it);
       buttons_.erase(it);

=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-01-18 19:37:39 +0000
@@ -25,6 +25,7 @@
 #include "DashStyle.h"
 #include "FilterMultiRangeButton.h"
 
+<<<<<<< TREE
 namespace unity
 {
 namespace dash
@@ -203,3 +204,196 @@
 
 } // namespace dash
 } // namespace unity
+=======
+namespace unity {
+  FilterMultiRangeButton::FilterMultiRangeButton (const std::string label, NUX_FILE_LINE_DECL)
+      : nux::ToggleButton(label, NUX_FILE_LINE_PARAM)
+      , prelight_ (NULL)
+      , active_ (NULL)
+      , normal_ (NULL)
+      , has_arrow_ (MULTI_RANGE_ARROW_NONE)
+      , side_ (MULTI_RANGE_CENTER)
+  {
+    InitTheme();
+    activated.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
+    active.changed.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActiveChanged));
+  }
+
+  FilterMultiRangeButton::FilterMultiRangeButton (NUX_FILE_LINE_DECL)
+      : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+      , prelight_ (NULL)
+      , active_ (NULL)
+      , normal_ (NULL)
+      , has_arrow_ (MULTI_RANGE_ARROW_NONE)
+      , side_ (MULTI_RANGE_CENTER)
+  {
+    InitTheme();
+    activated.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
+    active.changed.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActiveChanged));
+  }
+
+  FilterMultiRangeButton::~FilterMultiRangeButton()
+  {
+    delete prelight_;
+    delete normal_;
+    delete active_;
+  }
+
+  void FilterMultiRangeButton::OnActivated (nux::Area *area)
+  {
+    bool tmp_active = active;
+    if (filter_ != NULL)
+      filter_->active = tmp_active;
+  }
+
+  void FilterMultiRangeButton::OnActiveChanged(bool value)
+  {
+    NeedRedraw();
+  }
+
+  void FilterMultiRangeButton::SetFilter (dash::FilterOption::Ptr filter)
+  {
+    filter_ = filter;
+    bool tmp_active = filter_->active;
+    active = tmp_active;
+  }
+
+  dash::FilterOption::Ptr FilterMultiRangeButton::GetFilter()
+  {
+    return filter_;
+  }
+
+  void FilterMultiRangeButton::SetVisualSide (MultiRangeSide side)
+  {
+    side_ = side;
+    prelight_->Invalidate(GetGeometry());
+    active_->Invalidate(GetGeometry());
+    normal_->Invalidate(GetGeometry());
+  }
+
+  void FilterMultiRangeButton::SetHasArrow (MultiRangeArrow value)
+  {
+    has_arrow_ = value;
+    active_->Invalidate(GetGeometry());
+    NeedRedraw();
+  }
+
+  long FilterMultiRangeButton::ComputeLayout2()
+  {
+    if (prelight_ == NULL)
+    {
+      InitTheme();
+    }
+    long ret = nux::ToggleButton::ComputeLayout2();
+    if (cached_geometry_ != GetGeometry())
+    {
+      prelight_->Invalidate(GetGeometry());
+      active_->Invalidate(GetGeometry());
+      normal_->Invalidate(GetGeometry());
+    }
+
+    cached_geometry_ = GetGeometry();
+    return ret;
+  }
+
+  void FilterMultiRangeButton::InitTheme()
+  {
+    if (prelight_ == NULL)
+    {
+      prelight_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_PRELIGHT));
+      active_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_ACTIVE));
+      normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_NORMAL));
+    }
+
+    SetMinimumHeight(32);
+  }
+
+  void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::State faked_state)
+  {
+    std::string name = "10";
+    std::stringstream final;
+
+    if (filter_)
+    {
+      name = filter_->name;      
+      final << "<small>" << name << "</small>";
+	}
+
+    DashStyle::Arrow arrow;
+    if (has_arrow_ == MULTI_RANGE_ARROW_NONE)
+      arrow = DashStyle::Arrow::NONE;
+    else if (has_arrow_ == MULTI_RANGE_ARROW_LEFT)
+      arrow = DashStyle::Arrow::LEFT;
+    else if (has_arrow_ == MULTI_RANGE_ARROW_BOTH)
+      arrow = DashStyle::Arrow::BOTH;
+    else
+      arrow = DashStyle::Arrow::RIGHT;
+
+    DashStyle::Segment segment;
+    if (side_ == MULTI_RANGE_SIDE_LEFT)
+      segment = DashStyle::Segment::LEFT;
+    else if (side_ == MULTI_RANGE_CENTER)
+      segment = DashStyle::Segment::MIDDLE;
+    else
+      segment = DashStyle::Segment::RIGHT;
+
+    DashStyle::Instance().MultiRangeSegment(cr, faked_state, final.str(), arrow, segment);
+    NeedRedraw();
+  }
+
+
+  long int FilterMultiRangeButton::ProcessEvent(nux::IEvent& ievent, long int TraverseInfo, long int ProcessEventInfo) {
+    return nux::ToggleButton::ProcessEvent(ievent, TraverseInfo, ProcessEventInfo);
+  }
+
+  void FilterMultiRangeButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    gPainter.PaintBackground(GfxContext, GetGeometry());
+    // set up our texture mode
+    nux::TexCoordXForm texxform;
+    texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+
+    // clear what is behind us
+    nux::t_u32 alpha = 0, src = 0, dest = 0;
+    GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+    GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+    nux::Color col = nux::color::Black;
+    col.alpha = 0;
+    GfxContext.QRP_Color(GetGeometry().x,
+                         GetGeometry().y,
+                         GetGeometry().width,
+                         GetGeometry().height,
+                         col);
+
+    nux::BaseTexture *texture = normal_->GetTexture();
+    //FIXME - dashstyle does not give us a focused state yet, so ignore
+    //~ if (state == nux::State::NUX_STATE_PRELIGHT)
+    //~ {
+      //~ texture = prelight_->GetTexture();
+    //~ }
+    if (active)
+    {
+      texture = active_->GetTexture();
+    }
+
+    GfxContext.QRP_1Tex(GetGeometry().x,
+                        GetGeometry().y,
+                        GetGeometry().width,
+                        GetGeometry().height,
+                        texture->GetDeviceTexture(),
+                        texxform,
+                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+    GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
+  }
+
+  void FilterMultiRangeButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    //nux::ToggleButton::DrawContent(GfxContext, force_draw);
+  }
+
+  void FilterMultiRangeButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
+    nux::ToggleButton::PostDraw(GfxContext, force_draw);
+  }
+
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/unityshell/src/GeisAdapter.cpp'
--- plugins/unityshell/src/GeisAdapter.cpp	2011-12-22 17:52:55 +0000
+++ plugins/unityshell/src/GeisAdapter.cpp	2012-01-18 19:37:39 +0000
@@ -469,7 +469,7 @@
     GEIS_XCB_FULL_WINDOW,
     &xcb_win_info
   };
-  GeisInstance instance;
+  GeisInstance instance = nullptr;
 
   status = geis_init(&win_info, &instance);
   if (status != GEIS_STATUS_SUCCESS)

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2012-01-04 00:13:27 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2012-01-18 19:37:39 +0000
@@ -263,12 +263,21 @@
 
   LOG_DEBUG(logger) << "Preedit changed: " << preedit;
 
+<<<<<<< TREE
   preedit_ = preedit.Str();
+=======
+  _preedit = preedit.Str();
+>>>>>>> MERGE-SOURCE
 
   if (strlen(preedit.Str().c_str())) {
     preedit_cursor_ = preedit.Str().length();
+<<<<<<< TREE
     QueueRefresh(true, true);
     sigTextChanged.emit(this);
+=======
+    QueueRefresh(true, true); 
+    sigTextChanged.emit(this);
+>>>>>>> MERGE-SOURCE
     UpdateCursorLocation();
   }
 }
@@ -286,9 +295,15 @@
   ResetPreedit();
   gtk_im_context_reset(im_context_);
 
+<<<<<<< TREE
   QueueRefresh(true, true);
   sigTextChanged.emit(this);
   
+=======
+  QueueRefresh(true, true); 
+  sigTextChanged.emit(this);
+  
+>>>>>>> MERGE-SOURCE
   LOG_DEBUG(logger) << "Preedit ended";
 }
 

=== modified file 'plugins/unityshell/src/JSONParser.cpp'
--- plugins/unityshell/src/JSONParser.cpp	2011-09-15 04:28:49 +0000
+++ plugins/unityshell/src/JSONParser.cpp	2012-01-18 19:37:39 +0000
@@ -145,6 +145,19 @@
     values[i] = json_array_get_double_element(array, i);
 }
 
+void Parser::ReadString(std::string const& node_name,
+                        std::string const& member_name,
+                        std::string& value) const
+{
+  JsonObject* object = GetNodeObject(node_name);
+
+  if (!object)
+    return;
+
+  if (json_object_has_member(object, member_name.c_str()))
+    value = json_object_get_string_member(object, member_name.c_str());
+}
+
 void Parser::ReadColor(std::string const& node_name,
                        std::string const& member_name,
                        std::string const& opacity_name,

=== modified file 'plugins/unityshell/src/JSONParser.h'
--- plugins/unityshell/src/JSONParser.h	2011-09-15 04:28:49 +0000
+++ plugins/unityshell/src/JSONParser.h	2012-01-18 19:37:39 +0000
@@ -58,6 +58,10 @@
                    std::string const& member_name,
                    std::vector<double>& values) const;
 
+  void ReadString(std::string const& node_name,
+                  std::string const& member_name,
+                  std::string& value) const;
+
   void ReadColor(std::string const& node_name,
                  std::string const& member_name,
                  std::string const& opacity_name,

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-01-11 12:05:06 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2012-01-18 19:37:39 +0000
@@ -549,8 +549,11 @@
 
   for (auto menu_item : menus)
   {
+<<<<<<< TREE
     QuicklistMenuItem* ql_item;
 
+=======
+>>>>>>> MERGE-SOURCE
     const gchar* type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TYPE);
     const gchar* toggle_type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
     gboolean prop_visible = dbusmenu_menuitem_property_get_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE);
@@ -594,6 +597,7 @@
     tip_x = 0;
     tip_y = _center.y;
   }
+<<<<<<< TREE
 
   auto win_manager = WindowManager::Default();
 
@@ -613,6 +617,27 @@
   {
     QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
   }
+=======
+
+  auto win_manager = WindowManager::Default();
+
+  if (win_manager->IsScaleActive())
+    win_manager->TerminateScale();
+
+  /* If the expo plugin is active, we need to wait it to be termated, before
+   * shwing the icon quicklist. */
+  if (win_manager->IsExpoActive())
+  {
+    on_expo_terminated_connection = win_manager->terminate_expo.connect([&]() {
+        QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+        on_expo_terminated_connection.disconnect();
+    });
+  }
+  else
+  {
+    QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+  }
+>>>>>>> MERGE-SOURCE
 
   return true;
 }

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2011-12-14 16:18:41 +0000
+++ plugins/unityshell/src/LensView.cpp	2012-01-18 19:37:39 +0000
@@ -144,8 +144,15 @@
 void LensView::SetupViews()
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+<<<<<<< TREE
   
   layout_->SetHorizontalExternalMargin(8);
+=======
+  
+  // Breaks the sizing of the whole dash causing some colums to be clipped from result view.
+  // look in to this for P.
+  //  layout_->SetHorizontalExternalMargin(8);
+>>>>>>> MERGE-SOURCE
 
   scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
                                     NUX_TRACKER_LOCATION);

=== modified file 'plugins/unityshell/src/PanelIndicatorsView.cpp'
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
=== modified file 'plugins/unityshell/src/PanelMenuView.h'
=== modified file 'plugins/unityshell/src/PanelTray.cpp'
--- plugins/unityshell/src/PanelTray.cpp	2011-12-14 20:04:23 +0000
+++ plugins/unityshell/src/PanelTray.cpp	2012-01-18 19:37:39 +0000
@@ -95,7 +95,11 @@
   if (_tray)
   {
     g_signal_handler_disconnect(na_tray_get_manager(_tray), _tray_icon_added_id);
+<<<<<<< TREE
     g_object_unref (_tray);
+=======
+    g_object_unref(_tray);
+>>>>>>> MERGE-SOURCE
     _tray = NULL;
   }
 

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2012-01-16 07:34:25 +0000
+++ plugins/unityshell/src/PanelView.cpp	2012-01-18 19:37:39 +0000
@@ -138,6 +138,11 @@
 {
   if (_track_menu_pointer_id)
     g_source_remove(_track_menu_pointer_id);
+<<<<<<< TREE
+=======
+
+  _style->UnReference();
+>>>>>>> MERGE-SOURCE
   UBusServer *ubus = ubus_server_get_default();
   ubus_server_unregister_interest(ubus, _handle_bg_color_update);
   ubus_server_unregister_interest(ubus, _handle_dash_hidden);
@@ -152,6 +157,9 @@
   indicator::EntryLocationMap locations;
   _remote->SyncGeometries(GetName() + boost::lexical_cast<std::string>(_monitor), locations);
 
+  indicator::EntryLocationMap locations;
+  _remote->SyncGeometries(GetName() + boost::lexical_cast<std::string>(_monitor), locations);
+
   delete _bg_layer;
 }
 

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
=== modified file 'plugins/unityshell/src/PlacesHomeView.cpp'
--- plugins/unityshell/src/PlacesHomeView.cpp	2011-12-14 20:04:23 +0000
+++ plugins/unityshell/src/PlacesHomeView.cpp	2012-01-18 19:37:39 +0000
@@ -38,17 +38,30 @@
 #include "UBusMessages.h"
 
 #include "PlacesHomeView.h"
+<<<<<<< TREE
+=======
+
+#include "JSONParser.h"
+>>>>>>> MERGE-SOURCE
 #include "PlacesSimpleTile.h"
 
 #include "DashStyle.h"
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
 
+#include <sstream>
 #include <string>
 #include <vector>
 
+#include <boost/algorithm/string.hpp>
+
 #define DELTA_DOUBLE_REQUEST 500000000
 
+namespace
+{
+  const std::string custom_shortcuts_file = "/unity/HomeShortcutsCustomized.json";
+}
+
 namespace unity
 {
 
@@ -135,7 +148,9 @@
 
   expanded.connect(sigc::mem_fun(this, &PlacesHomeView::Refresh));
 
-  Refresh();
+  // Wait for the asynchronous loading of the lenses to complete
+  // before refreshing the view for the first time.
+  _lenses.lenses_loaded.connect(sigc::bind(sigc::mem_fun(this, &PlacesHomeView::Refresh), (PlacesGroup*) NULL));
 }
 
 PlacesHomeView::~PlacesHomeView()
@@ -161,64 +176,227 @@
 
   _layout->Clear();
 
-  // Media Apps
-  markup = g_strdup_printf(temp, _("Media Apps"));
-  shortcut = new Shortcut(PKGDATADIR"/find_media_apps.png",
-                          markup,
-                          icon_size);
-  shortcut->_id = TYPE_PLACE;
-  shortcut->_place_id = g_strdup("applications.lens?filter_type=media");
-  shortcut->_place_section = 9;
-  _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
-  shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
-  g_free(markup);
-
-  // Internet Apps
-  markup = g_strdup_printf(temp, _("Internet Apps"));
-  shortcut = new Shortcut(PKGDATADIR"/find_internet_apps.png",
-                          markup,
-                          icon_size);
-  shortcut->_id = TYPE_PLACE;
-  shortcut->_place_id = g_strdup("applications.lens?filter_type=internet");
-  shortcut->_place_section = 8;
-  _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
-  shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
-  g_free(markup);
-
-  // More Apps
-  markup = g_strdup_printf(temp, _("More Apps"));
-  shortcut = new Shortcut(PKGDATADIR"/find_more_apps.png",
-                          markup,
-                          icon_size);
-  shortcut->_id = TYPE_PLACE;
-  shortcut->_place_id = g_strdup("applications.lens");
-  shortcut->_place_section = 0;
-  _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
-  shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
-  g_free(markup);
-
-  // Find Files
-  markup = g_strdup_printf(temp, _("Find Files"));
-  shortcut = new Shortcut(PKGDATADIR"/find_files.png",
-                          markup,
-                          icon_size);
-  shortcut->_id = TYPE_PLACE;
-  shortcut->_place_id = g_strdup("files.lens");
-  shortcut->_place_section = 0;
-  _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
-  shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
-  g_free(markup);
-
-  // Browser
-  CreateShortcutFromMime("x-scheme-handler/http", _("Browse the Web"), _browser_alternatives);
-
-  // Photos
-  // FIXME: Need to figure out the default
-  CreateShortcutFromExec("shotwell", _("View Photos"), _photo_alternatives);
-
-  CreateShortcutFromMime("x-scheme-handler/mailto", _("Check Email"), _email_alternatives);
-
-  CreateShortcutFromMime("audio/x-vorbis+ogg", _("Listen to Music"), _music_alternatives);
+  // The following code path allows one to replace the default dash home screen
+  // with a custom home screen, the contents of which are described in a JSON
+  // file. The file is looked for in the following locations in decreasing order
+  // of priority:
+  //   - $XDG_CONFIG_HOME/unity/ (defaults to $HOME/.config/unity/)
+  //   - $DIR/unity/ for $DIR in $XDG_CONFIG_DIRS
+  // The syntax of the file is as follows:
+  // ==========================================================================
+  // {
+  //   "shortcut1": {
+  //     "source": $source,
+  //     "name": $name,
+  //     "name[fr]": $name_in_french,
+  //     […]
+  //     "icon": $icon
+  //   },
+  //   "shortcut2": {
+  //     […]
+  //   },
+  //   […]
+  // }
+  // ==========================================================================
+  // The source attribute may either be a desktop file (full path or just its
+  // basename if it is located in a standard directory), or a lens file
+  // (basename only). This attribute is mandatory.
+  // The 'name' attribute is optional. If present, it will override the default
+  // display name as advertised by the desktop file or by the lens. The name can
+  // be localized in several languages using the square brackets suffix
+  // notation, in which case the locale matching the system’s will be used,
+  // defaulting to the untranslated 'name' attribute if necessary.
+  // The 'icon' attribute is optional. If present, it will override the default
+  // icon as advertised by the desktop file or by the lens. It should be a full
+  // path name.
+  // If the source is a lens, the optional 'filter' attribute allows specifying
+  // a filter in the form "$name:$value", e.g. "type:videos" for the files lens.
+  // If the source is a lens, the optional 'section' attribute allows specifying
+  // a section number (an integer starting at index 0).
+
+  std::string customShortcuts;
+  std::ostringstream file;
+  // Look for a custom shortcuts file in the user’s home directory first.
+  file << g_get_user_config_dir() << custom_shortcuts_file;
+  if (g_file_test(file.str().c_str(), G_FILE_TEST_EXISTS))
+  {
+    customShortcuts = file.str();
+  }
+  else
+  {
+    // Fall back on the standard XDG directories.
+    gchar** config = (gchar**) g_get_system_config_dirs();
+    for (gint i = 0; config[i]; ++i)
+    {
+      std::ostringstream file;
+      file << config[i] << custom_shortcuts_file;
+      if (g_file_test(file.str().c_str(), G_FILE_TEST_EXISTS))
+      {
+        customShortcuts = file.str();
+        break;
+      }
+    }
+  }
+  json::Parser parser;
+  if ((customShortcuts == "") || !parser.Open(customShortcuts))
+  {
+    // Media Apps
+    markup = g_strdup_printf(temp, _("Media Apps"));
+    shortcut = new Shortcut(PKGDATADIR"/find_media_apps.png",
+                            markup,
+                            icon_size);
+    shortcut->_id = TYPE_PLACE;
+    shortcut->_place_id = g_strdup("applications.lens?filter_type=media");
+    shortcut->_place_section = 9;
+    _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+    shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+    g_free(markup);
+
+    // Internet Apps
+    markup = g_strdup_printf(temp, _("Internet Apps"));
+    shortcut = new Shortcut(PKGDATADIR"/find_internet_apps.png",
+                            markup,
+                            icon_size);
+    shortcut->_id = TYPE_PLACE;
+    shortcut->_place_id = g_strdup("applications.lens?filter_type=internet");
+    shortcut->_place_section = 8;
+    _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+    shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+    g_free(markup);
+
+    // More Apps
+    markup = g_strdup_printf(temp, _("More Apps"));
+    shortcut = new Shortcut(PKGDATADIR"/find_more_apps.png",
+                            markup,
+                            icon_size);
+    shortcut->_id = TYPE_PLACE;
+    shortcut->_place_id = g_strdup("applications.lens");
+    shortcut->_place_section = 0;
+    _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+    shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+    g_free(markup);
+
+    // Find Files
+    markup = g_strdup_printf(temp, _("Find Files"));
+    shortcut = new Shortcut(PKGDATADIR"/find_files.png",
+                            markup,
+                            icon_size);
+    shortcut->_id = TYPE_PLACE;
+    shortcut->_place_id = g_strdup("files.lens");
+    shortcut->_place_section = 0;
+    _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+    shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+    g_free(markup);
+
+    // Browser
+    CreateShortcutFromMime("x-scheme-handler/http", _("Browse the Web"), _browser_alternatives);
+
+    // Photos
+    // FIXME: Need to figure out the default
+    CreateShortcutFromExec("shotwell", _("View Photos"), _photo_alternatives);
+
+    CreateShortcutFromMime("x-scheme-handler/mailto", _("Check Email"), _email_alternatives);
+
+    CreateShortcutFromMime("audio/x-vorbis+ogg", _("Listen to Music"), _music_alternatives);
+  }
+  else
+  {
+    // The custom shortcuts file can contain up to 8 shortcuts.
+    for (int i = 0; i < 8; ++i)
+    {
+      std::ostringstream oss;
+      oss << "shortcut" << (i + 1);
+      std::string slot = oss.str();
+      std::string source;
+      parser.ReadString(slot, "source", source);
+      if (source != "")
+      {
+        std::string icon;
+        parser.ReadString(slot, "icon", icon);
+
+        std::string name;
+        gchar** languages = (gchar**) g_get_language_names();
+        for (gint i = 0; languages[i]; ++i)
+        {
+          std::ostringstream key;
+          key << "name[" << languages[i] << "]";
+          parser.ReadString(slot, key.str(), name);
+          if (name != "")
+            break;
+        }
+        if (name == "")
+        {
+          parser.ReadString(slot, "name", name);
+        }
+
+        if (boost::iends_with(source, ".desktop"))
+        {
+          GDesktopAppInfo* info = NULL;
+          if (boost::istarts_with(source, "/"))
+            info = g_desktop_app_info_new_from_filename(source.c_str());
+          else
+            info = g_desktop_app_info_new(source.c_str());
+          if (G_IS_DESKTOP_APP_INFO(info))
+          {
+            if (name == "")
+              name = g_app_info_get_display_name(G_APP_INFO(info));
+            if (icon == "")
+            {
+              gchar* cicon = g_icon_to_string(g_app_info_get_icon(G_APP_INFO(info)));
+              icon = cicon;
+              g_free(cicon);
+            }
+            gchar* exec = g_strdup(g_app_info_get_executable(G_APP_INFO(info)));
+            markup = g_strdup_printf(temp, name.c_str());
+            shortcut = new Shortcut(icon.c_str(), markup, style->GetHomeTileIconSize());
+            shortcut->_id = TYPE_EXEC;
+            shortcut->_exec = exec;
+            _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+            shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+            g_free(markup);
+            g_object_unref(info);
+          }
+        }
+        else if (boost::iends_with(source, ".lens"))
+        {
+          unity::dash::Lens::Ptr lens = _lenses.GetLens(source);
+          if (lens)
+          {
+            if (name == "")
+              name = lens->name;
+            if (icon == "")
+              icon = lens->icon_hint;
+          }
+          std::string filter;
+          parser.ReadString(slot, "filter", filter);
+          int section = -1;
+          parser.ReadInt(slot, "section", section);
+          markup = g_strdup_printf(temp, name.c_str());
+          shortcut = new Shortcut(icon.c_str(), markup, style->GetHomeTileIconSize());
+          shortcut->_id = TYPE_PLACE;
+          if (filter != "")
+          {
+            std::vector<std::string> filter_key_value;
+            boost::split(filter_key_value, filter, boost::is_any_of(":"));
+            if (filter_key_value.size() == 2)
+              shortcut->_place_id = g_strdup_printf("%s?filter_%s=%s",
+                                                    source.c_str(),
+                                                    filter_key_value[0].c_str(),
+                                                    filter_key_value[1].c_str());
+            else
+              shortcut->_place_id = g_strdup(source.c_str());
+          }
+          else
+            shortcut->_place_id = g_strdup(source.c_str());
+          if (section != -1)
+            shortcut->_place_section = section;
+          _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
+          shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
+          g_free(markup);
+        }
+      }
+    }
+  }
 
   SetExpanded(true);
   SetCounts(8, 8);

=== modified file 'plugins/unityshell/src/PlacesHomeView.h'
--- plugins/unityshell/src/PlacesHomeView.h	2011-12-14 20:04:23 +0000
+++ plugins/unityshell/src/PlacesHomeView.h	2012-01-18 19:37:39 +0000
@@ -29,6 +29,8 @@
 
 #include <Nux/GridHLayout.h>
 
+#include <UnityCore/FilesystemLenses.h>
+
 #include "PlacesTile.h"
 #include "PlacesGroup.h"
 
@@ -66,6 +68,8 @@
   std::vector<std::string> _music_alternatives;
 
   guint _ubus_handle;
+
+  unity::dash::FilesystemLenses _lenses;
 };
 
 }

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2012-01-02 21:39:28 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2012-01-18 19:37:39 +0000
@@ -82,8 +82,20 @@
   {
     last_mouse_down_x_ = x;
     last_mouse_down_y_ = y;
-    uint index = GetIndexAtPosition(x, y);
-    mouse_over_index_ = index;
+<<<<<<< TREE
+    uint index = GetIndexAtPosition(x, y);
+    mouse_over_index_ = index;
+=======
+    uint index = GetIndexAtPosition(x, y);
+    mouse_over_index_ = index;
+    if (index >= 0 && index < results_.size())
+    {
+      // we got a click on a button so activate it
+      Result result = results_[index];
+      selected_index_ = index;
+      focused_uri_ = result.uri;
+    }
+>>>>>>> MERGE-SOURCE
   });
 
   mouse_leave.connect([&](int x, int y, unsigned long mouse_state, unsigned long button_state)
@@ -495,9 +507,26 @@
   {
     if (selected_index_ < 0)
     {
+<<<<<<< TREE
+=======
+      if (mouse_over_index_ >= 0 && mouse_over_index_ < static_cast<int>(results_.size()))
+      {
+        // to hack around nux, nux sends the keynavfocuschange event before
+        // mouse clicks, so when mouse click happens we have already scrolled away
+        // because the keynav focus changed
+        focused_uri_ = results_[mouse_over_index_].uri;
+        selected_index_ = mouse_over_index_;
+      }
+      else
+      {
+>>>>>>> MERGE-SOURCE
         focused_uri_ = results_.front().uri;
         selected_index_ = 0;
     }
+<<<<<<< TREE
+=======
+
+>>>>>>> MERGE-SOURCE
 
     int items_per_row = GetItemsPerRow();
     int focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);

=== modified file 'plugins/unityshell/src/ResultViewGrid.h'
=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.cpp'
--- plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2012-01-05 02:47:09 +0000
+++ plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2012-01-18 19:37:39 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /* Compiz unity plugin
  * unity.h
@@ -232,3 +233,239 @@
   if (mFBTexture)
     glDeleteTextures (1, &mFBTexture);
 }
+=======
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "ScreenEffectFramebufferObject.h"
+#include "BackgroundEffectHelper.h"
+#include <NuxCore/Logger.h>
+#include <dlfcn.h>
+
+namespace
+{
+  nux::logging::Logger logger ("unity.screeneffectframebufferobject");
+}
+
+void ScreenEffectFramebufferObject::paint (const nux::Geometry &output)
+{
+  /* Draw the bit of the relevant framebuffer for each output */
+
+  glPushAttrib (GL_VIEWPORT_BIT);
+  glViewport (0, mScreenSize.height - (output.y + output.height), mScreenSize.width, mScreenSize.height);
+
+  if (mFBTexture)
+  {
+    glEnable (GL_TEXTURE_2D);
+    activeTexture (GL_TEXTURE0_ARB);
+    glBindTexture (GL_TEXTURE_2D, mFBTexture);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+    glPushAttrib (GL_SCISSOR_BIT);
+    glEnable (GL_SCISSOR_TEST);
+
+    glScissor (output.x, mScreenSize.height - (output.y + output.height),
+	       output.width, output.height);
+
+    /* FIXME: This needs to be GL_TRIANGLE_STRIP */
+    glBegin (GL_QUADS);
+    glTexCoord2f (0, 1);
+    glVertex2i   (mGeometry.x, mGeometry.y);
+    glTexCoord2f (0, 0);
+    glVertex2i   (mGeometry.x, mGeometry.y + mGeometry.height);
+    glTexCoord2f (1, 0);
+    glVertex2i   (mGeometry.x + mGeometry.width, mGeometry.y + mGeometry.height);
+    glTexCoord2f (1, 1);
+    glVertex2i   (mGeometry.x + mGeometry.width, mGeometry.y);
+    glEnd ();
+
+    activeTexture (GL_TEXTURE0_ARB);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glBindTexture (GL_TEXTURE_2D, 0);
+    glDisable (GL_TEXTURE_2D);
+    glPopAttrib ();
+  }
+  glPopAttrib ();
+}
+
+void ScreenEffectFramebufferObject::onScreenSizeChanged(const nux::Geometry& screenSize)
+{
+  mScreenSize = screenSize;
+}
+
+
+void ScreenEffectFramebufferObject::unbind ()
+{
+  if (!mBoundCnt)
+    return;
+
+  mBoundCnt--;
+
+  (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, 0);
+
+  glDrawBuffer (GL_BACK);
+  glReadBuffer (GL_BACK);
+
+  /* Matches the viewport set we did in ::bind () */
+  glPopAttrib ();
+
+}
+
+bool ScreenEffectFramebufferObject::status ()
+{
+  return mFboStatus;
+}
+
+void ScreenEffectFramebufferObject::bind (const nux::Geometry &output)
+{
+  if (!BackgroundEffectHelper::HasDirtyHelpers())
+    return;
+
+  /* Clear the error bit */
+  glGetError ();
+
+  if (!mFBTexture)
+  {
+    glGenTextures (1, &mFBTexture);
+
+    glBindTexture (GL_TEXTURE_2D, mFBTexture);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, mGeometry.width, mGeometry.height, 0, GL_BGRA,
+#if IMAGE_BYTE_ORDER == MSBFirst
+                 GL_UNSIGNED_INT_8_8_8_8_REV,
+#else
+                 GL_UNSIGNED_BYTE,
+#endif
+                 NULL);
+
+    glBindTexture (GL_TEXTURE_2D, 0);
+
+    if (glGetError () != GL_NO_ERROR)
+    {
+      mFboHandle = 0;
+      mFboStatus = false;
+      return;
+    }
+  }
+
+  (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, mFboHandle);
+
+  (*framebufferTexture2D) (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                               GL_TEXTURE_2D, mFBTexture, 0);
+
+  (*framebufferTexture2D) (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+                               GL_TEXTURE_2D, 0, 0);
+
+  /* Ensure that a framebuffer is actually available */
+  if (!mFboStatus)
+  {
+    GLint status = (*checkFramebufferStatus) (GL_DRAW_FRAMEBUFFER);
+
+    if (status != GL_FRAMEBUFFER_COMPLETE)
+    {
+      switch (status)
+      {
+        case GL_FRAMEBUFFER_UNDEFINED:
+          LOG_WARN (logger) <<  "no window";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+          LOG_WARN (logger) <<  "attachment incomplete";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+          LOG_WARN (logger) <<  "no buffers attached to fbo";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+          LOG_WARN (logger) <<  "some attachment in glDrawBuffers doesn't exist in FBO";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+          LOG_WARN (logger) <<  "some attachment in glReadBuffers doesn't exist in FBO";
+          break;
+        case GL_FRAMEBUFFER_UNSUPPORTED:
+          LOG_WARN (logger) <<  "unsupported internal format";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+          LOG_WARN (logger) <<  "different levels of sampling for each attachment";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+          LOG_WARN (logger) <<  "number of layers is different";
+          break;
+        default:
+          LOG_WARN (logger) <<  "unable to bind the framebuffer for an unknown reason";
+          break;
+      }
+
+      bindFramebuffer (GL_FRAMEBUFFER_EXT, 0);
+      deleteFramebuffers (1, &mFboHandle);
+
+      glDrawBuffer (GL_BACK);
+      glReadBuffer (GL_BACK);
+
+      mFboHandle = 0;
+
+      mFboStatus = false;
+    }
+    else
+      mFboStatus = true;
+  }
+
+  if (mFboStatus)
+  {
+    glPushAttrib (GL_VIEWPORT_BIT);
+
+    glViewport (output.x,
+	       mScreenSize.height - (output.y + output.height),
+	       output.width,
+	       output.height);
+  }
+
+  mBoundCnt++;
+}
+
+
+ScreenEffectFramebufferObject::ScreenEffectFramebufferObject (GLXGetProcAddressProc p, const nux::Geometry &geom)
+ : getProcAddressGLX (p)
+ , mFboStatus (false)
+ , mFBTexture (0)
+ , mGeometry (geom)
+ , mBoundCnt (0)
+ , mScreenSize (geom)
+{
+  activeTexture = (GLActiveTextureProc) (*getProcAddressGLX) ((GLubyte *) "glActiveTexture");
+  genFramebuffers = (GLGenFramebuffersProc) (*getProcAddressGLX) ((GLubyte *)"glGenFramebuffersEXT");
+  deleteFramebuffers = (GLDeleteFramebuffersProc) (*getProcAddressGLX) ((GLubyte *)"glDeleteFramebuffersEXT");
+  bindFramebuffer = (GLBindFramebufferProc) (*getProcAddressGLX) ((GLubyte *)"glBindFramebufferEXT");
+  checkFramebufferStatus = (GLCheckFramebufferStatusProc) (*getProcAddressGLX) ((GLubyte *) "glCheckFramebufferStatusEXT");
+  framebufferTexture2D = (GLFramebufferTexture2DProc) (*getProcAddressGLX) ((GLubyte *) "glFramebufferTexture2DEXT");
+  
+  (*genFramebuffers) (1, &mFboHandle);
+}
+
+ScreenEffectFramebufferObject::~ScreenEffectFramebufferObject ()
+{
+  (*deleteFramebuffers) (1, &mFboHandle);
+
+  if (mFBTexture)
+    glDeleteTextures (1, &mFBTexture);
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.h'
--- plugins/unityshell/src/ScreenEffectFramebufferObject.h	2011-12-16 09:46:35 +0000
+++ plugins/unityshell/src/ScreenEffectFramebufferObject.h	2012-01-18 19:37:39 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /* Compiz unity plugin
  * unity.h
@@ -85,3 +86,89 @@
 } // namespace unity
 
 #endif
+=======
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef UNITY_SCREENEFFECT_FRAMEBUFFER_H
+#define UNITY_SCREENEFFECT_FRAMEBUFFER_H
+
+#include <Nux/Nux.h>
+
+class ScreenEffectFramebufferObject
+{
+public:
+
+  typedef boost::shared_ptr <ScreenEffectFramebufferObject> Ptr;
+  typedef void (*FuncPtr) (void);
+  typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
+
+  ScreenEffectFramebufferObject (GLXGetProcAddressProc, const nux::Geometry &geom);
+  ~ScreenEffectFramebufferObject ();
+
+public:
+
+  void bind (const nux::Geometry &geom);
+  void unbind ();
+
+  bool status ();
+  void paint (const nux::Geometry &geom);
+  bool bound () { return mBoundCnt > 0; }
+
+  GLuint texture () { return mFBTexture; }
+  
+  void onScreenSizeChanged (const nux::Geometry &screenSize);
+
+private:
+
+  FuncPtr getProcAddr (const std::string &);
+
+  typedef void (*GLActiveTextureProc) (GLenum texture);
+  typedef void (*GLGenFramebuffersProc) (GLsizei n,
+                                         GLuint  *framebuffers);
+  typedef void (*GLDeleteFramebuffersProc) (GLsizei n,
+                                            GLuint  *framebuffers);
+  typedef void (*GLBindFramebufferProc) (GLenum target,
+                                         GLuint framebuffer);
+  typedef GLenum (*GLCheckFramebufferStatusProc) (GLenum target);
+  typedef void (*GLFramebufferTexture2DProc) (GLenum target,
+                                              GLenum attachment,
+                                              GLenum textarget,
+                                              GLuint texture,
+                                              GLint  level);
+  
+  GLXGetProcAddressProc getProcAddressGLX;
+  GLActiveTextureProc activeTexture;
+  GLGenFramebuffersProc genFramebuffers;
+  GLDeleteFramebuffersProc deleteFramebuffers;
+  GLBindFramebufferProc bindFramebuffer;
+  GLCheckFramebufferStatusProc checkFramebufferStatus;
+  GLFramebufferTexture2DProc framebufferTexture2D;
+  /* compiz fbo handle that goes through to nux */
+  GLuint   mFboHandle; // actual handle to the framebuffer_ext
+  bool    mFboStatus; // did the framebuffer texture bind succeed
+  GLuint   mFBTexture;
+  nux::Geometry mGeometry;
+  unsigned int mBoundCnt;
+  
+  nux::Geometry mScreenSize;
+};
+
+#endif
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
=== modified file 'plugins/unityshell/src/SwitcherController.h'
=== modified file 'plugins/unityshell/src/SwitcherModel.cpp'
--- plugins/unityshell/src/SwitcherModel.cpp	2011-12-08 01:23:11 +0000
+++ plugins/unityshell/src/SwitcherModel.cpp	2012-01-18 19:37:39 +0000
@@ -173,10 +173,17 @@
 {
   if (!detail_selection || DetailXids ().empty())
     return 0;
+<<<<<<< TREE
 
   if (detail_selection_index > DetailXids().size() - 1)
     return 0;
  
+=======
+
+  if (detail_selection_index >= DetailXids().size())
+    return 0;
+  
+>>>>>>> MERGE-SOURCE
   return DetailXids()[detail_selection_index];
 }
 

=== modified file 'plugins/unityshell/src/WindowManager.cpp'
=== modified file 'plugins/unityshell/src/comptransientfor.cpp'
--- plugins/unityshell/src/comptransientfor.cpp	2011-08-23 14:47:38 +0000
+++ plugins/unityshell/src/comptransientfor.cpp	2012-01-18 19:37:39 +0000
@@ -55,13 +55,18 @@
 bool
 compiz::CompTransientForReader::isTransientFor (unsigned int ancestor)
 {
+  if (!ancestor ||
+      !priv->mWindow->id ())
+    return false;
+
   return priv->mWindow->transientFor () == ancestor;
 }
 
 bool
 compiz::CompTransientForReader::isGroupTransientFor (unsigned int clientLeader)
 {
-  if (!clientLeader)
+  if (!clientLeader ||
+      !priv->mWindow->id ())
     return false;
 
   if (priv->mWindow->transientFor () == None || priv->mWindow->transientFor () == screen->root ())

=== modified file 'plugins/unityshell/src/transientfor.cpp'
--- plugins/unityshell/src/transientfor.cpp	2011-08-26 10:37:35 +0000
+++ plugins/unityshell/src/transientfor.cpp	2012-01-18 19:37:39 +0000
@@ -51,9 +51,9 @@
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
-	    Window *data = (Window *) prop;
+      Window *data = (Window *) prop;
 
-	    serverAncestor = *data;
+      serverAncestor = *data;
     }
 
     XFree (prop);
@@ -65,6 +65,10 @@
 bool
 compiz::X11TransientForReader::isTransientFor (unsigned int ancestor)
 {
+  if (!ancestor ||
+      !priv->mXid)
+    return false;
+
   return ancestor == getAncestor ();
 }
 
@@ -80,14 +84,18 @@
   std::vector<std::string> strings;
   std::list<Atom>   atoms;
 
+  if (!clientLeader ||
+      !priv->mXid)
+    return false;
+
   if (XGetWindowProperty (priv->mDpy, priv->mXid, wmClientLeader, 0L, 2L, false,
                           XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, (unsigned char **)&prop) == Success)
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
-	    Window *data = (Window *) prop;
+      Window *data = (Window *) prop;
 
-	    serverClientLeader = *data;
+      serverClientLeader = *data;
     }
 
     XFree (prop);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-01-18 18:47:55 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-01-18 19:37:39 +0000
@@ -576,6 +576,7 @@
 void UnityScreen::paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask)
 {
   CompOutput *output = _last_output;
+<<<<<<< TREE
   Window     tray_xid = panel_controller_->GetTrayXid ();
 
   bool was_bound = _fbo->bound ();
@@ -584,6 +585,16 @@
   /* Draw the bit of the relevant framebuffer for each output */
 
   if (was_bound)
+=======
+  Window     tray_xid = panelController->GetTrayXid ();
+
+  bool was_bound = _fbo->bound ();
+  _fbo->unbind ();
+
+  /* Draw the bit of the relevant framebuffer for each output */
+
+  if (was_bound)
+>>>>>>> MERGE-SOURCE
   {
     GLMatrix sTransform;
     sTransform.toScreenSpace (&screen->fullscreenOutput (), -DEFAULT_Z_CAMERA);
@@ -737,6 +748,7 @@
 
 void UnityScreen::leaveShowDesktopMode (CompWindow *w)
 {
+<<<<<<< TREE
   /* Where a window is inhibiting, only allow the window
    * that is inhibiting the leave show desktop to actually
    * fade in again - all other windows should remain faded out */
@@ -768,6 +780,22 @@
       }
     }
   }
+=======
+  for (CompWindow *cw : screen->windows ())
+  {
+    if (cw->inShowDesktopMode ())
+    {
+      UnityWindow::get (cw)->leaveShowDesktop ();
+      // the animation plugin does strange things here ...
+      // if this notification is sent
+      //cw->windowNotify (CompWindowNotifyLeaveShowDesktopMode);
+    }
+  }
+
+  PluginAdapter::Default()->OnLeaveDesktop();
+
+  screen->leaveShowDesktopMode (w);
+>>>>>>> MERGE-SOURCE
 }
 
 void UnityWindow::enterShowDesktop ()
@@ -1448,11 +1476,16 @@
                                                  screen->outputDevs()[device].y1() + 100,
                                                  screen->outputDevs()[device].width() - 200,
                                                  screen->outputDevs()[device].height() - 200));
+<<<<<<< TREE
 
   switcher::ShowMode show_mode = optionGetAltTabBiasViewport() ? switcher::ShowMode::CURRENT_VIEWPORT : switcher::ShowMode::ALL;
 
   RaiseInputWindows();
   switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);
+=======
+  switcherController->Show(SwitcherController::ALL, SwitcherController::FOCUS_ORDER, false, results);
+  RaiseInputWindows();
+>>>>>>> MERGE-SOURCE
   return true;
 }
 
@@ -2264,15 +2297,27 @@
 
 void UnityScreen::Relayout()
 {
-  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+<<<<<<< TREE
+  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+=======
+  GdkRectangle rect;
+  nux::Geometry lCurGeom;
+  int panel_height = 24;
+  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+>>>>>>> MERGE-SOURCE
 
   if (!needsRelayout)
     return;
 
   if (GL::fbo)
   {
+<<<<<<< TREE
     uScreen->_fbo = ScreenEffectFramebufferObject::Ptr (new ScreenEffectFramebufferObject (glXGetProcAddressP, geometry));
     uScreen->_fbo->onScreenSizeChanged (geometry);
+=======
+    uScreen->_fbo.reset (new ScreenEffectFramebufferObject (glXGetProcAddressP, geometry));
+    uScreen->_fbo->onScreenSizeChanged (geometry);
+>>>>>>> MERGE-SOURCE
   }
 
   UScreen *uscreen = UScreen::GetDefault();
@@ -2334,9 +2379,15 @@
   {
     if (w->resName() == "onboard")
     {
+<<<<<<< TREE
       Window xid = dash_controller_->window()->GetInputWindowId();
       XSetTransientForHint (screen->dpy(), w->id(), xid);
       w->raise ();
+=======
+      Window xid = dashController->window()->GetInputWindowId();
+      XSetTransientForHint (screen->dpy(), w->id(), xid);
+      w->raise ();
+>>>>>>> MERGE-SOURCE
     }
   }
 }
@@ -2369,6 +2420,7 @@
   LOG_INFO(logger) << "initLauncher-Panel " << timer.ElapsedSeconds() << "s";
 
   /* Setup Places */
+<<<<<<< TREE
   dash_controller_.reset(new dash::Controller());
   dash_controller_->on_realize.connect(sigc::mem_fun(this, &UnityScreen::OnDashRealized));
   
@@ -2445,6 +2497,29 @@
   hints_.push_back(new shortcut::Hint(windows, "", "", _("Places window in corresponding positions."), shortcut::HARDCODED_OPTION, "Ctrl + Alt + Num"));
   hints_.push_back(new shortcut::Hint(windows, "", " Drag", _("Move window."), shortcut::COMPIZ_MOUSE_OPTION, "move", "initiate_button"));
   hints_.push_back(new shortcut::Hint(windows, "", " Drag", _("Resize window."), shortcut::COMPIZ_MOUSE_OPTION, "resize", "initiate_button"));
+=======
+  self->dashController = DashController::Ptr(new DashController());
+  self->dashController->on_realize.connect (sigc::mem_fun (self, &UnityScreen::OnDashRealized));
+
+  /* FIXME: this should not be manual, should be managed with a
+     show/hide callback like in GAIL
+  if (unity_a11y_initialized() == TRUE)
+  {
+    AtkObject* atk_obj = NULL;
+
+    atk_obj = unity_util_accessible_add_window(self->placesController->GetWindow());
+
+    atk_object_set_name(atk_obj, _("Places"));
+  }
+  */
+
+  self->launcher->SetHideMode(Launcher::LAUNCHER_HIDE_DODGE_WINDOWS);
+  self->launcher->SetLaunchAnimation(Launcher::LAUNCH_ANIMATION_PULSE);
+  self->launcher->SetUrgentAnimation(Launcher::URGENT_ANIMATION_WIGGLE);
+  self->ScheduleRelayout(0);
+
+  self->OnLauncherHiddenChanged();
+>>>>>>> MERGE-SOURCE
 }
 
 /* Window init */
@@ -2481,6 +2556,7 @@
 
   if (window->state () & CompWindowStateFullscreenMask)
     UnityScreen::get (screen)->fullscreen_windows_.push_back(window);
+<<<<<<< TREE
 
   /* We might be starting up so make sure that
    * we don't deref the dashcontroller that doesnt
@@ -2488,6 +2564,15 @@
   dash::Controller::Ptr dp = UnityScreen::get(screen)->dash_controller_;
 
   if (dp)
+=======
+
+  /* We might be starting up so make sure that
+   * we don't deref the dashcontroller that doesnt
+   * exist */
+  DashController::Ptr dp = UnityScreen::get (screen)->dashController;
+
+  if (dp)
+>>>>>>> MERGE-SOURCE
   {
     nux::BaseWindow* w = dp->window ();
 
@@ -2510,7 +2595,7 @@
 
   UnityShowdesktopHandler::animating_windows.remove (window);
 
-  if (mMinimizeHandler)
+  if (mMinimizeHandler && !window->destroyed ())
   {
     unminimize ();
     window->focusSetEnabled (this, false);
@@ -2518,9 +2603,10 @@
     window->unminimizeSetEnabled (this, false);
     window->minimizedSetEnabled (this, false);
     window->minimize ();
-
-    mMinimizeHandler.reset ();
   }
+
+  mMinimizeHandler.reset ();
+
   if (mShowdesktopHandler)
     delete mShowdesktopHandler;
     

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-01-14 13:05:16 +0000
+++ plugins/unityshell/src/unityshell.h	2012-01-18 19:37:39 +0000
@@ -49,15 +49,26 @@
 #include "DebugDBusInterface.h"
 #include "SwitcherController.h"
 #include "UBusWrapper.h"
-#include "ScreenEffectFramebufferObject.h"
+<<<<<<< TREE
+#include "ScreenEffectFramebufferObject.h"
+=======
+#include <Nux/WindowThread.h>
+#include <sigc++/sigc++.h>
+#include <boost/shared_ptr.hpp>
+#include "ScreenEffectFramebufferObject.h"
+>>>>>>> MERGE-SOURCE
 
 #include "compizminimizedwindowhandler.h"
+<<<<<<< TREE
 #include "BGHash.h"
 #include <compiztoolbox/compiztoolbox.h>
 #include <dlfcn.h>
 
 namespace unity
 {
+=======
+#include <dlfcn.h>
+>>>>>>> MERGE-SOURCE
 
 class UnityShowdesktopHandler
 {

=== modified file 'services/panel-service.c'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-01-17 13:31:52 +0000
+++ tests/CMakeLists.txt	2012-01-18 19:37:39 +0000
@@ -70,6 +70,444 @@
                 ${UNITY_SRC}/
                 )
 add_dependencies (test-unit unity-core-${UNITY_API_VERSION})
+<<<<<<< TREE
+=======
+
+#
+# Standalone tests
+#
+add_executable (standalone-dash
+                standalone_dash.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BGHash.cpp
+                ${UNITY_SRC}/BGHash.h
+                ${UNITY_SRC}/DashSearchBar.cpp
+                ${UNITY_SRC}/DashSearchBar.h
+                ${UNITY_SRC}/DashSearchBarSpinner.cpp
+                ${UNITY_SRC}/DashSearchBarSpinner.h
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterFactory.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterBar.cpp
+                ${UNITY_SRC}/FontSettings.cpp
+                ${UNITY_SRC}/FontSettings.h
+                ${UNITY_SRC}/IMTextEntry.cpp
+                ${UNITY_SRC}/IMTextEntry.h
+                ${UNITY_SRC}/PlacesHomeView.cpp
+                ${UNITY_SRC}/PlacesHomeView.h
+                ${UNITY_SRC}/PlacesGroup.cpp
+                ${UNITY_SRC}/PlacesGroup.h
+                ${UNITY_SRC}/DashSettings.cpp
+                ${UNITY_SRC}/DashSettings.h
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                ${UNITY_SRC}/PlacesTile.cpp
+                ${UNITY_SRC}/PlacesTile.h
+                ${UNITY_SRC}/PlacesSimpleTile.cpp
+                ${UNITY_SRC}/PlacesSimpleTile.h
+                ${UNITY_SRC}/PlacesVScrollBar.cpp
+                ${UNITY_SRC}/PlacesVScrollBar.h
+                ${UNITY_SRC}/DashView.cpp
+                ${UNITY_SRC}/DashView.h
+                ${UNITY_SRC}/HomeView.cpp
+                ${UNITY_SRC}/HomeView.h
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/IconLoader.h
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconTexture.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/LensBar.cpp
+                ${UNITY_SRC}/LensBar.h
+                ${UNITY_SRC}/LensBarIcon.cpp
+                ${UNITY_SRC}/LensBarIcon.h
+                ${UNITY_SRC}/LensView.cpp
+                ${UNITY_SRC}/LensView.h
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/ResultView.cpp
+                ${UNITY_SRC}/ResultViewGrid.cpp
+                ${UNITY_SRC}/ResultRenderer.cpp
+                ${UNITY_SRC}/ResultRendererTile.cpp
+                ${UNITY_SRC}/ResultRendererHorizontalTile.cpp
+                ${UNITY_SRC}/TextureCache.h
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/Timer.h
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                ${UNITY_SRC}/UScreen.cpp
+                ${UNITY_SRC}/UScreen.h
+                )
+add_dependencies (standalone-dash unity-core-${UNITY_API_VERSION})
+
+
+#
+# Please use "standalone-$foo" naming convention for standalone tests
+#
+add_executable (test-panel
+                TestPanel.cpp
+                ${UNITY_SRC}/Animator.cpp
+                ${UNITY_SRC}/Animator.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/DashSettings.cpp
+                ${UNITY_SRC}/DashSettings.h
+                ${UNITY_SRC}/PanelStyle.cpp
+                ${UNITY_SRC}/PanelStyle.h
+                ${UNITY_SRC}/PanelView.cpp
+                ${UNITY_SRC}/PanelView.h
+                ${UNITY_SRC}/PanelIndicatorsView.cpp
+                ${UNITY_SRC}/PanelIndicatorsView.h
+                ${UNITY_SRC}/PanelIndicatorEntryView.cpp
+                ${UNITY_SRC}/PanelIndicatorEntryView.h
+                ${UNITY_SRC}/PanelTitlebarGrabAreaView.h
+                ${UNITY_SRC}/PanelTitlebarGrabAreaView.cpp
+                ${UNITY_SRC}/PanelTray.cpp
+                ${UNITY_SRC}/PanelTray.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/PanelMenuView.cpp
+                ${UNITY_SRC}/PanelMenuView.h
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/Timer.h
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/WindowButtons.cpp
+                ${UNITY_SRC}/WindowButtons.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/UScreen.cpp
+                ${UNITY_SRC}/UScreen.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-panel unity-core-${UNITY_API_VERSION})
+
+add_executable (test-switcher
+                TestSwitcher.cpp
+                ${UNITY_SRC}/AbstractLauncherIcon.h
+                ${UNITY_SRC}/AbstractIconRenderer.h
+                ${UNITY_SRC}/SwitcherController.cpp
+                ${UNITY_SRC}/SwitcherController.h
+                ${UNITY_SRC}/SwitcherModel.cpp
+                ${UNITY_SRC}/SwitcherModel.h
+                ${UNITY_SRC}/SwitcherView.cpp
+                ${UNITY_SRC}/SwitcherView.h
+                ${UNITY_SRC}/LayoutSystem.h
+                ${UNITY_SRC}/LayoutSystem.cpp
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/IconRenderer.cpp
+                ${UNITY_SRC}/IconRenderer.h
+                ${UNITY_SRC}/MockLauncherIcon.h
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-switcher unity-core-${UNITY_API_VERSION})
+
+add_executable (test-launcher
+                TestLauncher.cpp
+                ${UNITY_SRC}/AbstractLauncherIcon.h
+                ${UNITY_SRC}/AbstractIconRenderer.h
+                ${UNITY_SRC}/LauncherIcon.cpp
+                ${UNITY_SRC}/LauncherIcon.h
+                ${UNITY_SRC}/SimpleLauncherIcon.cpp
+                ${UNITY_SRC}/SimpleLauncherIcon.h
+                ${UNITY_SRC}/BamfLauncherIcon.cpp
+                ${UNITY_SRC}/BamfLauncherIcon.h
+                ${UNITY_SRC}/BFBLauncherIcon.cpp
+                ${UNITY_SRC}/BFBLauncherIcon.h
+                ${UNITY_SRC}/SpacerLauncherIcon.cpp
+                ${UNITY_SRC}/SpacerLauncherIcon.h
+                ${UNITY_SRC}/DndData.cpp
+                ${UNITY_SRC}/DndData.h
+                ${UNITY_SRC}/TrashLauncherIcon.cpp
+                ${UNITY_SRC}/TrashLauncherIcon.h
+                ${UNITY_SRC}/DNDCollectionWindow.cpp
+                ${UNITY_SRC}/DNDCollectionWindow.h
+                ${UNITY_SRC}/DeviceLauncherIcon.cpp
+                ${UNITY_SRC}/DeviceLauncherIcon.h
+                ${UNITY_SRC}/DeviceLauncherSection.cpp
+                ${UNITY_SRC}/DeviceLauncherSection.h
+                ${UNITY_SRC}/DevicesSettings.cpp
+                ${UNITY_SRC}/DevicesSettings.h
+                ${UNITY_SRC}/FavoriteStore.cpp
+                ${UNITY_SRC}/FavoriteStore.h
+                ${UNITY_SRC}/FavoriteStoreGSettings.cpp
+                ${UNITY_SRC}/FavoriteStoreGSettings.h
+                ${UNITY_SRC}/LauncherEntryRemoteModel.cpp
+                ${UNITY_SRC}/LauncherEntryRemoteModel.h
+                ${UNITY_SRC}/LauncherEntryRemote.cpp
+                ${UNITY_SRC}/LauncherEntryRemote.h
+                ${UNITY_SRC}/LauncherController.cpp
+                ${UNITY_SRC}/LauncherController.h
+                ${UNITY_SRC}/LauncherModel.cpp
+                ${UNITY_SRC}/LauncherModel.h
+                ${UNITY_SRC}/Launcher.cpp
+                ${UNITY_SRC}/Launcher.h
+                ${UNITY_SRC}/LauncherHideMachine.cpp
+                ${UNITY_SRC}/LauncherHideMachine.h
+                ${UNITY_SRC}/LauncherHoverMachine.cpp
+                ${UNITY_SRC}/LauncherHoverMachine.h
+                ${UNITY_SRC}/LauncherDragWindow.cpp
+                ${UNITY_SRC}/LauncherDragWindow.h
+                ${UNITY_SRC}/GeisAdapter.cpp
+                ${UNITY_SRC}/GeisAdapter.h
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/IconRenderer.cpp
+                ${UNITY_SRC}/IconRenderer.h
+                ${UNITY_SRC}/Tooltip.cpp
+                ${UNITY_SRC}/Tooltip.h
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/QuicklistManager.cpp
+                ${UNITY_SRC}/QuicklistManager.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-launcher unity-core-${UNITY_API_VERSION})
+
+add_executable (test-keyutil
+                TestKeyboardUtil.cpp
+                ${UNITY_SRC}/KeyboardUtil.h
+                ${UNITY_SRC}/KeyboardUtil.cpp
+                )
+add_dependencies (test-keyutil unity-core-${UNITY_API_VERSION})
+
+add_executable (test-quicklist
+                ui/TestQuicklist.cpp
+                ui/EventFaker.cpp
+                ui/EventFaker.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-quicklist unity-core-${UNITY_API_VERSION})
+
+add_executable (test-quicklist-visuals
+                ui/TestQuicklistVisuals.cpp
+                ui/EventFaker.cpp
+                ui/EventFaker.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-quicklist-visuals unity-core-${UNITY_API_VERSION})
+
+add_executable (test-filters
+                TestFilters.cpp
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                )
+add_dependencies(test-filters unity-core-${UNITY_API_VERSION})
+
+add_executable (test-filter-bar
+                TestFilterBar.cpp
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterFactory.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterBar.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                )
+add_dependencies(test-filter-bar unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-applicaiton
+                TestPreviewApplications.cpp
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-applicaiton unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-generic
+                TestPreviewGeneric.cpp
+                ${UNITY_SRC}/PreviewGeneric.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-generic unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-music
+                TestPreviewMusic.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/PreviewMusic.cpp
+                ${UNITY_SRC}/PreviewMusicTrack.cpp
+                ${UNITY_SRC}/PreviewMusicTrackWidget.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-music unity-core-${UNITY_API_VERSION})
+
+add_executable (test-result-view
+                TestResultView.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/ResultView.cpp
+                ${UNITY_SRC}/ResultViewGrid.cpp
+                ${UNITY_SRC}/ResultRenderer.cpp
+                ${UNITY_SRC}/ResultRendererTile.cpp
+                ${UNITY_SRC}/ResultRendererHorizontalTile.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies(test-result-view unity-core-${UNITY_API_VERSION})
+
+add_executable (test-dash-style
+                TestDashStyle.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/DashStyle.h
+                ${UNITY_SRC}/JSONParser.cpp
+                ${PLACES_COMMON_SOURCE}
+                )
+add_dependencies (test-dash-style unity-core-${UNITY_API_VERSION})
+
+add_executable (test-bg-hash
+                TestBGHash.cpp
+                ${UNITY_SRC}/BGHash.cpp
+                ${UNITY_SRC}/BGHash.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+               )
+add_dependencies (test-bg-hash unity-core-${UNITY_API_VERSION})
+
+find_package (OpenGL)
+
+include_directories (${OPENGL_gl_INCDIRS})
+add_library (glfuncloader SHARED
+	     ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)
+target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})
+add_executable (screen-effect-fbo
+		TestScreenEffectFramebufferObject.cpp
+		${UNITY_SRC}/ScreenEffectFramebufferObject.cpp
+		${UNITY_SRC}/BackgroundEffectHelper.cpp)
+
+target_link_libraries (screen-effect-fbo glfuncloader ${OPENGL_gl_LIBRARY})
+add_dependencies (screen-effect-fbo unity-core-${UNITY_API_VERSION})
+
+>>>>>>> MERGE-SOURCE
 add_subdirectory (test-input-remover)
 add_subdirectory (test-minimize-window-handler)
 add_subdirectory (test-get-transients)

=== added file 'tests/GLFuncLoader.cpp'
--- tests/GLFuncLoader.cpp	1970-01-01 00:00:00 +0000
+++ tests/GLFuncLoader.cpp	2012-01-18 19:37:39 +0000
@@ -0,0 +1,51 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "GLFuncLoader.h"
+#include <dlfcn.h>
+
+unity::GLLoader::FuncPtr unity::GLLoader::getProcAddr(const std::string &name)
+{
+  static void *dlhand = NULL;
+  FuncPtr funcPtr = NULL;
+
+  glGetError ();
+
+  if (!funcPtr)
+  {
+    if (!dlhand)
+      dlhand = dlopen ("libglfuncloader.so", RTLD_LAZY);
+
+    char *error =  dlerror ();
+
+    if (dlhand)
+    {
+      dlerror ();
+      funcPtr = (FuncPtr) dlsym (dlhand, name.c_str ());
+
+      error = dlerror ();
+      if (error != NULL)
+        funcPtr = NULL;
+    }
+  }
+
+  return funcPtr;
+}
+
+

=== added file 'tests/GLFuncLoader.h'
--- tests/GLFuncLoader.h	1970-01-01 00:00:00 +0000
+++ tests/GLFuncLoader.h	2012-01-18 19:37:39 +0000
@@ -0,0 +1,33 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include <string>
+#include <GL/gl.h>
+#include <GL/glx.h>
+
+namespace unity
+{
+namespace GLLoader
+{
+typedef void (*FuncPtr) (void);
+typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
+
+FuncPtr getProcAddr(const std::string &name);
+}
+}

=== added file 'tests/TestScreenEffectFramebufferObject.cpp'
--- tests/TestScreenEffectFramebufferObject.cpp	1970-01-01 00:00:00 +0000
+++ tests/TestScreenEffectFramebufferObject.cpp	2012-01-18 19:37:39 +0000
@@ -0,0 +1,671 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "ScreenEffectFramebufferObject.h"
+#include "BackgroundEffectHelper.h"
+#include "GLFuncLoader.h"
+#include <Nux/Nux.h>
+#include <Nux/VLayout.h>
+#include <Nux/View.h>
+#include <Nux/BaseWindow.h>
+#include <Nux/WindowCompositor.h>
+#include <NuxCore/Logger.h>
+#include <NuxCore/Object.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <GL/glx.h>
+#include <GL/gl.h>
+#include <dlfcn.h>
+#include <sys/poll.h>
+#include <unistd.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <cmath>
+
+using namespace unity::GLLoader;
+
+namespace
+{
+  nux::logging::Logger logger ("unity.test-screeneffectframebufferobject");
+
+  const static int attributes[] = { GLX_RENDER_TYPE, GLX_RGBA_BIT,
+                                    GLX_X_RENDERABLE, True,
+                                    GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+                                    GLX_DOUBLEBUFFER, True,
+                                    GLX_RED_SIZE, 8,
+                                    GLX_GREEN_SIZE, 8,
+                                    GLX_BLUE_SIZE, 8, 0};
+}
+
+namespace GLFuncs
+{
+  GLXGetProcAddressProc           glXGetProcAddressP;
+  PFNGLXCHOOSEFBCONFIGPROC        glXChooseFBConfigP;
+  PFNGLXGETVISUALFROMFBCONFIGPROC glXGetVisualFromFBConfigP;
+  PFNGLXCREATEWINDOWPROC          glXCreateWindowP;
+  PFNGLXDESTROYWINDOWPROC         glXDestroyWindowP;
+  PFNGLXMAKECONTEXTCURRENTPROC    glXMakeContextCurrentP;
+
+  void init ()
+  {
+    glXGetProcAddressP = (GLXGetProcAddressProc) getProcAddr ("glXGetProcAddress");
+    glXChooseFBConfigP = (PFNGLXCHOOSEFBCONFIGPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXChooseFBConfig");
+    glXGetVisualFromFBConfigP = (PFNGLXGETVISUALFROMFBCONFIGPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXGetVisualFromFBConfig");
+    glXCreateWindowP = (PFNGLXCREATEWINDOWPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXCreateWindow");
+    glXMakeContextCurrentP = (PFNGLXMAKECONTEXTCURRENTPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXMakeContextCurrent");
+    glXDestroyWindowP      = (PFNGLXDESTROYWINDOWPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXDestroyWindow");
+  }
+}
+
+class EffectView :
+  public nux::View
+{
+public:
+  EffectView (NUX_FILE_LINE_PROTO);
+  virtual ~EffectView ();
+
+  void Draw (nux::GraphicsEngine &context, bool force) { return; };
+  void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+private:
+  BackgroundEffectHelper bg_effect_helper_;
+};
+
+class Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Shape> Ptr;
+
+    Shape ();
+    virtual ~Shape ();
+
+    float rotation () { return mRotation; }
+
+    void draw (unsigned int width, unsigned int height) { glDraw (width, height); }
+    void rotate () { applyRotation (); }
+
+  protected:
+
+    float mRotation;
+
+    virtual void glDraw (unsigned int width, unsigned int height) = 0;
+    virtual void applyRotation () = 0;
+    virtual void getRotationAxes (float &x, float &y, float &z) = 0;
+};
+
+Shape::Shape () :
+ mRotation (0.0f)
+{
+}
+
+Shape::~Shape ()
+{
+}
+
+class Triangle :
+  public Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Triangle> Ptr;
+
+  protected:
+
+    void glDraw (unsigned int width, unsigned int height);
+    void applyRotation () { mRotation += 5.0f; }
+    void getRotationAxes (float &x, float &y, float &z) { x = 0.0f; y = 1.0f; z = 0.0f; }
+};
+
+void
+Triangle::glDraw (unsigned int width, unsigned int height)
+{
+  glBegin(GL_TRIANGLES);
+      glColor3f(1.0f, 0.0f, 0.0f);
+      glVertex3f(width / 4, height, 0.0f);
+      glColor3f(0.0f, 1.0f, 0.0f);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glColor3f(0.0f, 0.0f, 1.0f);
+      glVertex3f(width / 2, 0.0f, 0.0f);
+  glEnd();
+}
+
+class Square :
+  public Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Square> Ptr;
+
+  protected:
+
+    void glDraw (unsigned int width, unsigned int height);
+    void applyRotation () { mRotation -= 2.5f; }
+    void getRotationAxes (float &x, float &y, float &z) { x = 1.0f; y = 0.0f; z = 0.0f; }
+    
+};
+
+void
+Square::glDraw (unsigned int width, unsigned int height)
+{
+  glBegin(GL_QUADS);
+    glColor3f(sin (rotation () / 100.0f), -sin (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width / 2, height, 0.0f);
+    glColor3f(-sin (rotation () / 100.0f), sin (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width, height, 0.0f);
+    glColor3f(sin (rotation () / 100.0f), sin (rotation () / 100.0f), sin (rotation () / 100.0f));
+    glVertex3f(width, 0.0f, 0.0f);
+    glColor3f(-sin (rotation () / 100.0f), cos (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width / 2, 0.0f, 0.0f);
+  glEnd();
+}
+
+class BaseContext
+{
+  public:
+
+    BaseContext (Display *);
+    ~BaseContext ();
+
+    void run ();
+
+  protected:
+
+    bool eventHandler ();
+    bool paintDispatch ();
+
+    enum class ModifierApplication
+    {
+      Square,
+      Triangle,
+      Both
+    };
+
+    void nextWindowPosition ();
+    void nextShapeRotation ();
+    void setupContextForSize (unsigned int width,
+                              unsigned int height);
+    void drawShape (const Shape::Ptr &) {};
+
+  private:
+
+    static gboolean onNewEvents (GIOChannel   *channel,
+                                 GIOCondition condition,
+                                 gpointer     data);
+
+    static gboolean onPaintTimeout (gpointer data);
+
+    static void onWindowThreadCreation (nux::NThread *thread, void *d);
+
+    Display                                   *mDisplay;
+    Window                                    mWindow;
+    Colormap                                  mColormap;
+    nux::WindowThread                         *mWindowThread;
+    nux::View                                 *mRootView;
+    ScreenEffectFramebufferObject::Ptr mFbo;
+    GLXWindow                                 mGlxWindow;
+    GLXContext                                mContext;
+    ModifierApplication                       mRotating;
+    ModifierApplication                       mBlur;
+    unsigned int                              mWidth;
+    unsigned int                              mHeight;
+    bool                                      mNuxReady;
+    Shape::Ptr                                mTriangle;
+    Shape::Ptr                                mSquare;
+};
+
+BaseContext::BaseContext (Display *display) :
+  mDisplay (display),
+  mWindowThread (NULL),
+  mRotating (ModifierApplication::Both),
+  mBlur (ModifierApplication::Both),
+  mWidth (640),
+  mHeight (480),
+  mNuxReady (false),
+  mTriangle  (new Triangle ()),
+  mSquare (new Square ())
+{
+  int            numFBConfig = 0;  
+  GLXFBConfig    *fbConfigs = (*GLFuncs::glXChooseFBConfigP) (mDisplay,
+                                                              DefaultScreen (mDisplay),
+                                                              attributes,
+                                                              &numFBConfig);
+  XVisualInfo    *visinfo = (*GLFuncs::glXGetVisualFromFBConfigP) (mDisplay,
+                                                                   fbConfigs[0]);
+
+  mContext = glXCreateContext (mDisplay, visinfo, 0, GL_TRUE);
+  mColormap = XCreateColormap (mDisplay,
+                               DefaultRootWindow (mDisplay),
+                               visinfo->visual,
+                               AllocNone);
+
+  XSetWindowAttributes wa;
+
+  wa.colormap = mColormap;
+  wa.border_pixel = 0;
+  wa.event_mask = StructureNotifyMask | KeyPressMask | ExposureMask;
+
+  mWindow = XCreateWindow (mDisplay, DefaultRootWindow (mDisplay),
+                           0, 0, mWidth, mHeight, 0, visinfo->depth, InputOutput,
+                           visinfo->visual, CWColormap | CWEventMask | CWBorderPixel,
+                           &wa);
+
+  mGlxWindow = (*GLFuncs::glXCreateWindowP) (mDisplay, fbConfigs[0], mWindow, NULL);
+
+  XStoreName (mDisplay, mWindow, "F1: Toggle Effect, F2: Rotation, F3: Effect");
+  XMapWindow (mDisplay, mWindow);
+
+  bool ready = false;
+
+  do
+  {
+    XEvent ev;
+    XNextEvent (mDisplay, &ev);
+    switch (ev.type)
+    {
+      case MapNotify:
+      case ConfigureNotify:
+      case Expose:
+        ready = true;
+        break;
+      default:
+        break;
+    }
+
+  } while (!ready);
+
+  (*GLFuncs::glXMakeContextCurrentP) (mDisplay, mGlxWindow, mGlxWindow, mContext);
+
+  setupContextForSize (mWidth, mHeight);
+}
+
+void
+BaseContext::run ()
+{
+  GIOChannel        *channel;
+  mWindowThread = nux::CreateFromForeignWindow (mWindow,
+                                                mContext,
+                                                &BaseContext::onWindowThreadCreation,
+                                                (void *) this);
+
+  mWindowThread->Run(NULL);
+
+  while (!mNuxReady);
+  g_timeout_add (128, &BaseContext::onPaintTimeout, (gpointer) this);
+
+  channel = g_io_channel_unix_new (ConnectionNumber (mDisplay));
+
+  g_io_add_watch (channel, (GIOCondition) (G_IO_IN | G_IO_HUP | G_IO_ERR),
+                  &BaseContext::onNewEvents, (gpointer) this);
+  gtk_main ();
+}
+
+BaseContext::~BaseContext ()
+{
+  delete mWindowThread;
+
+  (*GLFuncs::glXMakeContextCurrentP) (mDisplay, None, None, mContext);
+  glXDestroyContext (mDisplay, mContext);
+  (*GLFuncs::glXDestroyWindowP) (mDisplay, mGlxWindow);
+
+  XFreeColormap (mDisplay, mColormap);
+  XDestroyWindow (mDisplay, mWindow);
+}
+
+void
+BaseContext::setupContextForSize (unsigned int width,
+                                  unsigned int height)
+{
+  mWidth = width;
+  mHeight = height;
+
+  glViewport(0, 0, width, height);
+  glDrawBuffer (GL_BACK);
+  glReadBuffer (GL_BACK);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluPerspective(60.0f, 1.0f, 0.1f, 100.0f);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity ();
+  glClearColor (1, 1, 1, 1);
+  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glXSwapBuffers (mDisplay, mGlxWindow);
+
+  if (mFbo)
+    mFbo.reset (new ScreenEffectFramebufferObject (GLFuncs::glXGetProcAddressP, nux::Geometry (0, 0, mWidth, mHeight)));
+
+  if (mRootView && mNuxReady)
+  {
+    switch (mBlur)
+    {
+      case ModifierApplication::Both:
+        mRootView->SetGeometry (nux::Geometry (0, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Triangle:
+        mRootView->SetGeometry (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Square:
+        mRootView->SetGeometry (nux::Geometry (0, 0, mWidth, mHeight));
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+bool
+BaseContext::eventHandler ()
+{
+  XEvent event;
+  XEvent *ev = &event;
+
+  XNextEvent (mDisplay, &event);
+
+  switch (ev->type)
+  {
+    case KeyPress:
+      if (XLookupKeysym (&ev->xkey, 0) == XK_Escape)
+        return false;
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F1)
+      {
+        if (!mFbo)
+        {
+          BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;
+          mFbo.reset (new ScreenEffectFramebufferObject (GLFuncs::glXGetProcAddressP, nux::Geometry (0, 0, mWidth, mHeight)));
+        }
+        else
+        {
+          BackgroundEffectHelper::blur_type = unity::BLUR_NONE;
+          mFbo.reset ();
+        }
+      }
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F2)
+        nextShapeRotation ();
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F3)
+        nextWindowPosition ();
+      break;
+    case ConfigureNotify:
+      setupContextForSize (ev->xconfigure.width, ev->xconfigure.height);
+    default:
+      break;
+  }
+
+  return true;
+}
+
+gboolean
+BaseContext::onNewEvents (GIOChannel   *channel,
+                          GIOCondition condition,
+                          gpointer     data)
+{
+  BaseContext *self = static_cast <BaseContext *> (data);
+
+  if (condition & G_IO_IN)
+  {
+    if (self->eventHandler ())
+      return TRUE;
+    else
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+gboolean
+BaseContext::onPaintTimeout (gpointer data)
+{
+  BaseContext *self = static_cast <BaseContext *> (data);
+
+  if (self->paintDispatch ())
+    return TRUE;
+
+  return FALSE;
+}
+
+void
+BaseContext::nextShapeRotation ()
+{
+  switch (mRotating)
+  {
+    case ModifierApplication::Both:
+      mRotating = ModifierApplication::Triangle;
+      break;
+    case ModifierApplication::Triangle:
+      mRotating = ModifierApplication::Square;
+      break;
+    case ModifierApplication::Square:
+      mRotating = ModifierApplication::Both;
+      break;
+    default:
+      break;
+  }
+}
+
+void
+BaseContext::nextWindowPosition ()
+{
+  switch (mBlur)
+  {
+    case ModifierApplication::Both:
+      mBlur = ModifierApplication::Triangle;
+      mRootView->SetGeometry (nux::Geometry (0, 0, mWidth / 2, mHeight));
+      break;
+    case ModifierApplication::Triangle:
+      mBlur = ModifierApplication::Square;
+      mRootView->SetGeometry (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+      break;
+    case ModifierApplication::Square:
+      mBlur = ModifierApplication::Both;
+      mRootView->SetGeometry (nux::Geometry (0, 0, mWidth, mHeight));
+      break;
+    default:
+      break;
+  }
+}
+
+EffectView::EffectView (NUX_FILE_LINE_DECL)
+  : View (NUX_FILE_LINE_PARAM)
+{
+  bg_effect_helper_.owner = this;
+}
+
+EffectView::~EffectView ()
+{
+}
+
+void EffectView::DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw)
+{
+  nux::Geometry base = GetGeometry();
+  GfxContext.PushClippingRectangle(base);
+  nux::Geometry blur_geo (base.x, base.y, base.width, base.height);
+
+  if (BackgroundEffectHelper::blur_type == unity::BLUR_ACTIVE)
+  {
+    bg_effect_helper_.enabled = true;
+
+    auto blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
+
+    if (blur_texture.IsValid ())
+    {
+      nux::TexCoordXForm texxform_blur_bg;
+      texxform_blur_bg.flip_v_coord = true;
+      texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform_blur_bg.uoffset = ((float) base.x) / (base.width);
+      texxform_blur_bg.voffset = ((float) base.y) / (base.height);
+
+      nux::ROPConfig rop;
+      rop.Blend = false;
+      rop.SrcBlend = GL_ONE;
+      rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+      gPainter.PushDrawTextureLayer(GfxContext, base,
+                                    blur_texture,
+                                    texxform_blur_bg,
+                                    nux::color::White,
+                                    true,
+                                    rop);
+    }
+  }
+  else
+    bg_effect_helper_.enabled = false;
+  GfxContext.PopClippingRectangle();
+}
+
+bool
+BaseContext::paintDispatch ()
+{
+  if (mFbo)
+  {
+    switch (mRotating)
+    {
+      case ModifierApplication::Both:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (0, 0, mWidth, mHeight));
+        break;
+      case ModifierApplication::Triangle:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (0, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Square:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+        break;
+    }
+
+    mFbo->bind (nux::Geometry (0, 0, mWidth, mHeight));
+
+    if (!mFbo->status ())
+    {
+      LOG_INFO (logger) << "FBO not ok!";
+    }
+  }
+
+  glClearColor (1, 1, 1, 1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glPushMatrix ();
+  glLoadIdentity();
+  glTranslatef(-0.5f, -0.5f, -0.866025404f);
+  glScalef (1.0f / mWidth, 1.0f / mHeight, 0.0f);
+  glTranslatef(mWidth * 0.25, 0, 0);
+  glRotatef(mTriangle->rotation (), 0.0f, 1.0f, 0.0f);
+  glTranslatef(-(mWidth * 0.25), 0, 0);
+
+  mTriangle->draw (mWidth, mHeight);
+
+  glLoadIdentity();
+  glTranslatef(-0.5f, -0.5f, -0.866025404f);
+  glScalef (1.0f / mWidth, 1.0f / mHeight, 0.0f);
+  glTranslatef(mWidth * 0.75, 0, 0);
+  glRotatef(mSquare->rotation (), 0.0f, 1.0f, 0.0f);
+  glTranslatef(-(mWidth * 0.75), 0, 0);
+
+  mSquare->draw (mWidth, mHeight);
+
+  glColor4f (1.0f, 1.0f, 1.0f, 5.0f);
+  glPopMatrix ();
+
+  if (mFbo)
+    mFbo->unbind ();
+
+  if (mFbo && mFbo->status ())
+  {
+    glClearColor (1, 1, 1, 1);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glPushMatrix ();
+    glLoadIdentity();
+    glTranslatef(-0.5f, 0.5f, -0.866025404f);
+    glScalef (1.0f / mWidth, -(1.0f / mHeight), 0.0f);
+    mFbo->paint (nux::Geometry (0, 0, mWidth, mHeight));
+    glPopMatrix ();
+
+    nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
+        nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID (mFbo->texture(),
+                                                                          mWidth, mHeight, 1, nux::BITFMT_R8G8B8A8);
+
+    nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
+
+    nux::Geometry geo = nux::Geometry (0, 0, mWidth, mHeight);
+    BackgroundEffectHelper::monitor_rect_ = geo;
+  }
+
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glPushAttrib(GL_VIEWPORT_BIT | GL_ENABLE_BIT |
+               GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT);
+  mRootView->ProcessDraw (mWindowThread->GetGraphicsEngine (), true);
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glPopMatrix();
+
+  glDrawBuffer(GL_BACK);
+  glReadBuffer(GL_BACK);
+
+  glPopAttrib();
+
+  glXSwapBuffers (mDisplay, mGlxWindow);
+
+  switch (mRotating)
+  {
+    case ModifierApplication::Both:
+      mTriangle->rotate ();
+      mSquare->rotate ();
+      break;
+    case ModifierApplication::Triangle:
+      mTriangle->rotate ();
+      break;
+    case ModifierApplication::Square:
+      mSquare->rotate ();
+      break;
+  }
+
+  return true;
+}
+
+void
+BaseContext::onWindowThreadCreation (nux::NThread *thread, void *data)
+{
+  BaseContext *bc = static_cast <BaseContext *> (data);
+
+  bc->mRootView = new EffectView ();
+  bc->mRootView->SetGeometry (nux::Geometry (0, 0, 640, 480));
+  bc->mNuxReady = true;
+  BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;
+}
+
+int main (int argc, char **argv)
+{
+  Display *display = XOpenDisplay (NULL);
+  nux::NuxInitialize (0);
+  GLFuncs::init ();
+	g_type_init ();
+  g_thread_init (NULL);
+  gtk_init(&argc, &argv);
+
+  BaseContext *bc = new BaseContext (display);
+
+  bc->run ();
+
+  delete bc;
+
+  XCloseDisplay (display);
+
+  return 0;
+}
+
+

=== modified file 'tests/test_lens.cpp'