Merge lp:~fboucault/unity-2d/dash_lenses_view_loader_camelify into lp:unity-2d/3.0

[Florian Boucault]

[dash] Removed unused tile renderers and simplified conversion of renderer name to QML file name.

Unmerged revisions

661. By Florian Boucault on 2011-08-24

[dash] Removed unused tile renderers and simplified conversion of renderer name to QML file name.

660. By Florian Boucault on 2011-08-23

Merged lp:unity-2d

659. By Florian Boucault on 2011-08-23

Merged lp:unity-2d

658. By Ugo Riboni on 2011-08-23

[panel] Dynamically load applets

Each applet is now a plugin implementing the PanelAppletProviderInterface.
In addition to porting the existing applets as plugins, the Homebutton and
Separator applets have been brought back as optional panel applets.

657. By Florian Boucault on 2011-08-23

[dash] Collapse categories by default.

656. By Alberto Mardegan on 2011-08-23

Add missing initializations of member variables

These were reported by valgrind complaining about "jump depends on value of uninitialized variable".

655. By Gerry Boland on 2011-08-23

[dash] (Unity 4.0) Update Toggle buttons to latest design spec

654. By Florian Boucault on 2011-08-22

* No change rebuild for the nux update abi break
* debian/control: update the nux requirement to be sure to pick the new one

653. By Florian Boucault on 2011-08-18

Merged lp:unity-2d

652. By Gerry Boland on 2011-08-12

[dash] Fix Lens bar icons so they scale correctly. Use correct Home lens icon.

=== modified file '.bzrignore'
--- .bzrignore	2011-08-19 10:38:19 +0000
+++ .bzrignore	2011-08-24 12:47:31 +0000
@@ -18,6 +18,8 @@
 panel/applets/appname/registraradaptor.*
 panel/applets/indicator/indicator-config.h
 panel/applets/libpanelplugin-*.so.*
+panel/lib/libuqpanel.so*
+panel/tests/Testing
 panel/tests/homebuttonapplettest
 
 libunity-2d-private/src/libunity-2d-private.so.*

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-27 09:42:32 +0000
+++ CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -25,10 +25,13 @@
 find_package(X11 REQUIRED)
 find_package(Gettext REQUIRED)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GDK REQUIRED gdk-2.0)
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
+pkg_check_modules(GDK REQUIRED gdk-3.0)
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
+pkg_check_modules(WNCK REQUIRED libwnck-3.0)
+pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(NUXCORE REQUIRED nux-core-1.0)
+pkg_check_modules(PANGO REQUIRED pango)
 
 
 # GSettings schemas

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-08-17 09:21:18 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-08-24 12:47:31 +0000
@@ -18,7 +18,7 @@
   </schema>
   <schema path="/com/canonical/unity-2d/panel/" id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
     <key type="as" name="applets">
-      <default>["!homebutton", "!separator", "appname", "!legacytray", "indicator"]</default>
+      <default>["appname", "!legacytray", "indicator"]</default>
       <summary>Applets to display in the panel</summary>
       <description>
         List of panel applets that should be displayed, in order, in the panel.

=== modified file 'data/unity-2d.convert'
--- data/unity-2d.convert	2011-07-25 11:56:59 +0000
+++ data/unity-2d.convert	2011-08-24 12:47:31 +0000
@@ -3,5 +3,3 @@
 hide-mode = /desktop/unity-2d/launcher/hide_mode
 use-strut = /desktop/unity-2d/launcher/use_strut
 
-[com.canonical.Unity.Launcher]
-favorites = /desktop/unity-2d/launcher/favorites

=== renamed file 'debian/20_unity-2d-gconf-default' => 'debian/20_ubuntu-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-07-25 11:56:59 +0000
+++ debian/20_ubuntu-2d-gconf-default	2011-08-24 12:47:31 +0000
@@ -1,13 +1,5 @@
-/apps/gnome-power-manager/lock/use_screensaver_settings true
-/apps/gnome-power-manager/general/use_time_for_policy false
-/desktop/gnome/applications/window_manager/default /usr/bin/metacity
-/desktop/gnome/applications/window_manager/current /usr/bin/metacity
 /apps/metacity/general/show_maximized_titlebars false
 /apps/metacity/general/auto_maximize_windows true
 /apps/metacity/general/capture_before_unmap true
 /apps/metacity/general/compositing_manager true
 /apps/metacity/general/compositor_effects false
-/apps/metacity/general/theme Ambiance
-/desktop/gnome/interface/gtk_theme Ambiance
-/desktop/gnome/interface/icon_theme ubuntu-mono-dark
-/desktop/gnome/peripherals/mouse/cursor_theme DMZ-White

=== renamed file 'debian/20_unity-2d-gconf-mandatory' => 'debian/20_ubuntu-2d-gconf-mandatory'
--- debian/20_unity-2d-gconf-mandatory	2011-06-15 13:05:38 +0000
+++ debian/20_ubuntu-2d-gconf-mandatory	2011-08-24 12:47:31 +0000
@@ -1,3 +1,2 @@
-/apps/nautilus/preferences/exit_with_last_window false
 /apps/metacity/global_keybindings/panel_main_menu disabled
 /apps/metacity/global_keybindings/panel_run_dialog disabled

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-29 14:05:54 +0000
+++ debian/changelog	2011-08-24 12:47:31 +0000
@@ -1,20 +1,65 @@
-unity-2d (3.8.14-0ubuntu1) UNRELEASED; urgency=low
-
-  * 
-
- -- Florian Boucault <[e-mail]>  Fri, 29 Jul 2011 16:05:25 +0200
-
-unity-2d (3.8.12-0ubuntu2) natty; urgency=low
+unity-2d (4.0.0-0ubuntu2) oneiric; urgency=low
+
+  * No change rebuild for the nux update abi break
+  * debian/control: update the nux requirement to be sure to pick the new one
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 19 Aug 2011 11:25:56 +0200
+
+unity-2d (4.0.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - [launcher] Impossible to keep KDE Apps in Launcher (LP: #741129)
+    - [dash] Background should be blurred (LP: #823326)
+    - No 'safely remove' option is present in the unity menu when a usb disk
+      is inserted (LP: #660010)
+    - Quicklist item "Keep In Launcher" should be "Keep in launcher" as design
+      (LP: #795422)
+    - [launcher] ESC doesn't dismiss launcher when activated with Alt+F1
+      (LP: #812792)
+    - [dash] Background wallpaper shifted when using a non compositing window
+      manager (LP: #823295)
+    - [launcher] Bottom gradient appears too early (LP: #823877)
+    - mute/unmute sound when user clicks on sound applet using scroll button
+      or middle mouse button (LP: #609860)
+    - Secondary activate (i.e. middle click) support for indicators advanced
+      usage (LP: #812933)
+    - Unused GConfItemQmlWrapper dep found (LP: #821880)
+  * debian/control:
+    - bump libunity-core-4.0-dev, libnux-1.0-dev
+    - recommends lenses and not places anymore. Adding music lens
+
+ -- Didier Roche <[e-mail]>  Thu, 11 Aug 2011 21:22:18 +0200
+
+unity-2d (3.8.14.1-0ubuntu1) oneiric; urgency=low
+
+  * Few upstream fixes:
+    - unity-2d-places crashed with SIGSEGV in
+      QDeclarativePropertyPrivate::initProperty() (LP: #817896)
+    - update resets unity launcher favorites (LP: #817954)
+
+ -- Didier Roche <[e-mail]>  Tue, 02 Aug 2011 16:08:27 +0200
+
+unity-2d (3.8.14-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - [launcher] Need to press Alt+F1 twice to show launcher (LP: #812787)
+  * debian/control:
+    - build on latest libunity-core-4.0-dev and latest libnux-1.0-dev
+
+ -- Didier Roche <[e-mail]>  Mon, 01 Aug 2011 19:53:40 +0200
+
+unity-2d (3.8.12-0ubuntu2) oneiric; urgency=low
 
   * debian/control:
     - enforcing latest libunity-private0 to be installed for each local
       consumer
+    - don't recommends indicator-me, it's deprecated
   * debian/libunity-2d-private0.lintian-overrides:
     - remove a qml-related exported symbol warning wrongly detected
 
- -- Didier Roche <[e-mail]>  Fri, 29 Jul 2011 08:01:51 +0200
+ -- Didier Roche <[e-mail]>  Fri, 29 Jul 2011 15:19:11 +0200
 
-unity-2d (3.8.12-0ubuntu1) natty; urgency=low
+unity-2d (3.8.12-0ubuntu1) oneiric; urgency=low
 
   [ Florian Boucault ]
   * Upstreamed patch 01_build_with_new_indicator.patch
@@ -32,6 +77,7 @@
     - remove default value for /desktop/unity-2d/launcher/favorites
   * debian/control:
     - add dependency on libdconf-qt-dev
+    - add dependency on libnux-1.0-dev
 
   [ Didier Roche ]
   * New upstream release:
@@ -73,13 +119,27 @@
   * Fix typo in trigger (debian/unity-2d.triggers): (LP: #807358)
   * Install the apport hook in the right directory so that it's not launched
     unconditionally (LP: #712343)
+  * debian/control:
+    - dep on latest libqtdee-dev
+    - dep now on gtk3 indicator version
+    - dep on versionned libnux-1.0-dev
+    - dep on versionned libunity-core-4.0-dev
   * debian/control, debian/rules, debian/libunity-2d-private-dev:
     - add new -dev project (LP: #814709)
     - add an upstream pc file
 
- -- Florian Boucault <[e-mail]>  Thu, 28 Jul 2011 12:05:05 +0200
-
-unity-2d (3.8.10-0ubuntu1) natty; urgency=low
+ -- Didier Roche <[e-mail]>  Thu, 28 Jul 2011 12:05:38 +0200
+
+unity-2d (3.8.10-0ubuntu2) oneiric; urgency=low
+
+  * debian/control:
+    - rebuild with new indicator 0.4
+  * 01_build_with_new_indicator.patch:
+    - patch to build with the new indicator 0.4 stack
+
+ -- Didier Roche <[e-mail]>  Sun, 10 Jul 2011 23:48:01 +0200
+
+unity-2d (3.8.10-0ubuntu1) oneiric; urgency=low
 
   [ Florian Boucault ]
   * debian/unity-2d-launcher.install:
@@ -102,10 +162,17 @@
     - Missing a GConf schema file for the /desktop/unity-2d/… keys
       (LP: #750303)
     - [dash] home screen search hint should be 'Search' (LP: #797825)
-
- -- Florian Boucault <[e-mail]>  Wed, 13 Jul 2011 11:59:29 +0200
-
-unity-2d (3.8.8-0ubuntu1) natty; urgency=low
+  * debian/unity-2d.gconf-defaults,
+    debian/20_ubuntu-2d-gconf-default:
+    - transition some gconf keys from session-wide to system-wide
+      (LP: #797672, #797676)
+  * debian/control:
+    - ensure we are still using gtk2 indicator for alpha2 (LP: #804938)
+    - bump standards-version
+
+ -- Didier Roche <[e-mail]>  Mon, 04 Jul 2011 11:05:54 +0200
+
+unity-2d (3.8.8-0ubuntu1) oneiric; urgency=low
 
   [ Didier Roche ]
   * new upstream release:
@@ -152,7 +219,21 @@
 
  -- Didier Roche <[e-mail]>  Tue, 14 Jun 2011 16:14:18 +0200
 
-unity-2d (3.8.6-0ubuntu1) natty; urgency=low
+unity-2d (3.8.6-0ubuntu3~ppa1) oneiric; urgency=low
+
+  * Rebuild with new gcc
+
+ -- Didier Roche <[e-mail]>  Tue, 07 Jun 2011 15:00:32 +0200
+
+unity-2d (3.8.6-0ubuntu2) oneiric; urgency=low
+
+  * debian/unity-2d.postinst, debian/unity-2d.postrm:
+    - remove the magic to set unity-2d in oneiric as the default session in gdm
+      as it's now installed on the ubuntu CD.
+
+ -- Didier Roche <[e-mail]>  Wed, 01 Jun 2011 09:42:21 +0200
+
+unity-2d (3.8.6-0ubuntu1) oneiric; urgency=low
 
   * New upstream release:
     - [launcher] Support static shortcuts in the quicklists. (LP: #669923)
@@ -196,6 +277,18 @@
   * debian/libunity-2d-private0.post*
     - removed: ldconfig is generated directly by dh_makeshlibs as we don't pass
       -n anymore
+  * don't install unity-2d session as it's in gnome-session now
+  * debian/unity-2d.install
+    debian/20_ubuntu-2d-gconf-default
+    debian/20_ubuntu-2d-gconf-mandatory
+    debian/gconf/ubuntu-2d.default.path
+    debian/gconf/ubuntu-2d.mandatory.path:
+    - remove uneeded defaults and mandatory
+    - remove some deprecated keys
+    - the session is now called ubuntu-2d and not unity-2d anymore
+  * debian/unity-2d.preinst, debian/unity-2d.postinst
+    debian/unity-2d.postrm:
+    - take into account the natty -> oneiric migration with session name change
 
  -- Didier Roche <[e-mail]>  Wed, 25 May 2011 12:19:25 +0200
 

=== modified file 'debian/control'
--- debian/control	2011-07-29 11:55:03 +0000
+++ debian/control	2011-08-24 12:47:31 +0000
@@ -10,19 +10,22 @@
                libqt4-dev,
                libqt4-opengl-dev,
                libglib2.0-dev,
-               libwnck-dev,
+               libwnck-3-dev,
+               libpango1.0-dev,
                libqtgconf-dev,
                libdconf-qt-dev,
                libqtbamf-dev,
-               libqtdee-dev,
+               libqtdee-dev (>= 0.2.3),
                libdbusmenu-qt-dev,
                libx11-dev,
-               libindicator-dev,
-               libgtk2.0-dev,
+               libindicator3-dev,
+               libgtk-3-dev,
                libutouch-geis-dev,
-               libstartup-notification0-dev
-Standards-Version: 3.9.1
-Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/trunk
+               libstartup-notification0-dev,
+               libunity-core-4.0-dev (>= 4.8.0),
+               libnux-1.0-dev (>= 1.2.2),
+Standards-Version: 3.9.2
+Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/oneiric
 
 Package: unity-2d
 Architecture: all
@@ -56,9 +59,10 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libunity-2d-private0 (= ${binary:Version}),
-         libgtk2.0-dev,
-         libwnck-dev,
+         libgtk-3-dev,
+         libwnck-3-dev,
          libglib2.0-dev,
+         libpango1.0-dev,
 Description: Unity 2D shared library - development files
  This library is used to host common code used by several Unity 2D components
  It is only used internally, there is no use case for it outside of the unity-2d
@@ -73,8 +77,9 @@
          unity-asset-pool,
          libunity-2d-private0 (= ${binary:Version}),
          libqt4-svg,
-Recommends: unity-place-files,
-            unity-place-applications
+Recommends: unity-lens-files,
+            unity-lens-applications,
+            unity-lens-music,
 Description: Unity 2D Launcher
  The Unity 2D launcher displays a list of running applications as well as a
  list of favorite applications in a panel at the left of the screen.
@@ -90,7 +95,6 @@
 Recommends: indicator-application,
             indicator-appmenu,
             indicator-datetime,
-            indicator-me,
             indicator-messages,
             indicator-session,
             indicator-sound,

=== renamed file 'debian/gconf/unity-2d.default.path' => 'debian/gconf/ubuntu-2d.default.path'
--- debian/gconf/unity-2d.default.path	2011-06-15 13:05:38 +0000
+++ debian/gconf/ubuntu-2d.default.path	2011-08-24 12:47:31 +0000
@@ -1,3 +1,3 @@
-# Additional mandatory path for unity-2d experience
-xml:readonly:/var/lib/gconf/unity-2d.default
+# Additional mandatory path for ubuntu-2d experience
+xml:readonly:/var/lib/gconf/ubuntu-2d.default
 

=== renamed file 'debian/gconf/unity-2d.mandatory.path' => 'debian/gconf/ubuntu-2d.mandatory.path'
--- debian/gconf/unity-2d.mandatory.path	2011-06-15 13:05:38 +0000
+++ debian/gconf/ubuntu-2d.mandatory.path	2011-08-24 12:47:31 +0000
@@ -1,3 +1,3 @@
-# Additional mandatory path for unity-2d experience
-xml:readonly:/var/lib/gconf/unity-2d.mandatory
+# Additional mandatory path for ubuntu-2d experience
+xml:readonly:/var/lib/gconf/ubuntu-2d.mandatory
 

=== modified file 'debian/unity-2d-panel.install'
--- debian/unity-2d-panel.install	2011-08-12 15:23:04 +0000
+++ debian/unity-2d-panel.install	2011-08-24 12:47:31 +0000
@@ -1,5 +1,3 @@
 usr/bin/unity-2d-panel
+usr/lib/unity-2d/plugins/panel/libpanelplugin-*.so*
 usr/share/applications/unity-2d-panel.desktop
-usr/share/unity-2d/panel/artwork/background.png
-usr/share/unity-2d/panel/artwork/divider.png
-usr/lib/unity-2d/plugins/panel/libpanelplugin-*.so*

=== added file 'debian/unity-2d.gconf-defaults'
--- debian/unity-2d.gconf-defaults	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.gconf-defaults	2011-08-24 12:47:31 +0000
@@ -0,0 +1,4 @@
+/desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
+/desktop/unity-2d/launcher/hide_mode 2
+/desktop/unity-2d/launcher/use_strut false
+/desktop/unity-2d/launcher/super_key_enable true

=== modified file 'debian/unity-2d.install'
--- debian/unity-2d.install	2011-07-22 14:44:57 +0000
+++ debian/unity-2d.install	2011-08-24 12:47:31 +0000
@@ -1,9 +1,7 @@
 debian/unity-2d.py /usr/share/apport/package-hooks
 debian/gconf/* /usr/share/gconf
-session/unity-2d.desktop /usr/share/xsessions
-session/2d-ubuntu.session /usr/share/gnome-session/sessions
-debian/20_unity-2d-gconf-mandatory /usr/share/gconf/unity-2d/mandatory
-debian/20_unity-2d-gconf-default /usr/share/gconf/unity-2d/default
+debian/20_ubuntu-2d-gconf-mandatory /usr/share/gconf/ubuntu-2d/mandatory
+debian/20_ubuntu-2d-gconf-default /usr/share/gconf/ubuntu-2d/default
 usr/share/locale/*/LC_MESSAGES/unity-2d.mo
 usr/share/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
 usr/share/GConf/gsettings

=== modified file 'debian/unity-2d.postinst'
--- debian/unity-2d.postinst	2011-06-15 13:05:38 +0000
+++ debian/unity-2d.postinst	2011-08-24 12:47:31 +0000
@@ -9,24 +9,21 @@
 
 case "$1" in
   configure|upgrade)
-    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
-        /usr/lib/gdm/gdm-set-default-session --keep-old unity-2d || true
-    fi
     if which update-gconf-defaults >/dev/null 2>&1 ; then
-        mkdir -p /var/lib/gconf/unity-2d.mandatory
-        mkdir -p /var/lib/gconf/unity-2d.default
+        mkdir -p /var/lib/gconf/ubuntu-2d.mandatory
+        mkdir -p /var/lib/gconf/ubuntu-2d.default
     fi
   ;;
   triggered)
     for trigger in $2; do
       case $trigger in
-        /usr/share/gconf/unity-2d/mandatory)
-          update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-          --destination /var/lib/gconf/unity-2d.mandatory --no-signal
+        /usr/share/gconf/ubuntu-2d/mandatory)
+          update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+          --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
         ;;
-        /usr/share/gconf/unity-2d/default)
-          update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-          --destination /var/lib/gconf/unity-2d.default --no-signal
+        /usr/share/gconf/ubuntu-2d/default)
+          update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+          --destination /var/lib/gconf/ubuntu-2d.default --no-signal
         ;;
       esac
     done
@@ -39,9 +36,9 @@
 
 # Upon installation/upgrade, regenerate all databases, because in this case 
 # there will be no trigger run
-update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-                      --destination /var/lib/gconf/unity-2d.mandatory --no-signal
-update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-                      --destination /var/lib/gconf/unity-2d.default --no-signal
+update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+                      --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
+update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+                      --destination /var/lib/gconf/ubuntu-2d.default --no-signal
 signal_daemons
 

=== modified file 'debian/unity-2d.postrm'
--- debian/unity-2d.postrm	2011-06-15 13:05:38 +0000
+++ debian/unity-2d.postrm	2011-08-24 12:47:31 +0000
@@ -3,20 +3,17 @@
 
 case "$1" in
   remove|purge)
-    if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/unity-2d ]; then
-        update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-        --destination /var/lib/gconf/unity-2d.mandatory
-        update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-        --destination /var/lib/gconf/unity-2d.default
-    fi
-    if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
-        rm -rf /var/lib/gconf/unity-2d.mandatory
-    fi
-    if [ -d /var/lib/gconf/unity-2d.default ]; then
-        rm -rf /var/lib/gconf/unity-2d.default
-    fi
-    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
-        /usr/lib/gdm/gdm-set-default-session --remove unity-2d || true
+    if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/ubuntu-2d ]; then
+        update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+        --destination /var/lib/gconf/ubuntu-2d.mandatory
+        update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+        --destination /var/lib/gconf/ubuntu-2d.default
+    fi
+    if [ -d /var/lib/gconf/ubuntu-2d.mandatory ]; then
+        rm -rf /var/lib/gconf/ubuntu-2d.mandatory
+    fi
+    if [ -d /var/lib/gconf/ubuntu-2d.default ]; then
+        rm -rf /var/lib/gconf/ubuntu-2d.default
     fi
     ;;
 esac

=== added file 'debian/unity-2d.preinst'
--- debian/unity-2d.preinst	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.preinst	2011-08-24 12:47:31 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  install|upgrade)
+    if dpkg --compare-versions "$2" le "3.8.6-0ubuntu1"; then
+        if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
+          mv /var/lib/gconf/unity-2d.mandatory /var/lib/gconf/ubuntu-2d.mandatory || true
+          mv /var/lib/gconf/unity-2d.default /var/lib/gconf/ubuntu-2d.default || true
+        fi
+    fi
+  ;;
+esac
+
+#DEBHELPER#
+

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-08-01 11:58:35 +0000
+++ launcher/Launcher.qml	2011-08-24 12:47:31 +0000
@@ -22,7 +22,10 @@
 LauncherDropItem {
     id: launcher
 
+    Accessible.name: "root"
+
     GnomeBackground {
+        Accessible.name: "background"
         anchors.fill: parent
         overlay_color: "black"
         overlay_alpha: 0.66
@@ -30,6 +33,7 @@
     }
 
     Rectangle {
+        Accessible.name: "background"
         anchors.fill: parent
         color: "black"
         opacity: 0.66
@@ -37,6 +41,7 @@
     }
     
     Image {
+        Accessible.name: "border"
         id: border
 
         width: 1
@@ -50,12 +55,16 @@
     onWebpageUrlDropped: applications.insertWebFavorite(url)
 
     FocusScope {
+        Accessible.name: "content"
+
         focus: true
         anchors.fill: parent
         z: 1 /* ensure the lists are always strictly on top of the background */
 
         LauncherList {
             id: main
+            Accessible.name: "main"
+
             anchors.top: parent.top
             anchors.bottom: shelf.top
             anchors.bottomMargin: itemPadding
@@ -75,6 +84,8 @@
 
         LauncherList {
             id: shelf
+            Accessible.name: "shelf"
+
             anchors.bottom: parent.bottom
             anchors.bottomMargin: main.anchors.bottomMargin
             height: (tileSize + itemPadding) * count
@@ -92,23 +103,14 @@
         }
     }
 
-    SortFilterProxyModel {
-        id: visiblePlaces
-        model: places
-        dynamicSortFilter: true
-
-        filterRole: Place.RoleShowEntry
-        filterRegExp: RegExp("^true$")
+    BfbModel {
+        id: bfbModel
     }
 
     LauncherApplicationsList {
         id: applications
     }
 
-    LauncherPlacesList {
-        id: places
-    }
-
     LauncherDevicesList {
         id: devices
     }
@@ -129,9 +131,9 @@
     }
 
     Component.onCompleted: {
+        items.appendModel(bfbModel);
         items.appendModel(applications);
         items.appendModel(workspaces);
-        items.appendModel(visiblePlaces);
         items.appendModel(devices);
         shelfItems.appendModel(trashes);
     }

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-07-14 11:17:30 +0000
+++ launcher/LauncherItem.qml	2011-08-24 12:47:31 +0000
@@ -48,6 +48,8 @@
 DropItem {
     id: item
 
+    Accessible.role: Accessible.PushButton
+
     anchors.horizontalCenter: parent.horizontalCenter
 
     property int padding

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-08-10 11:58:31 +0000
+++ launcher/LauncherList.qml	2011-08-24 12:47:31 +0000
@@ -77,6 +77,17 @@
     delegate: LauncherItem {
         id: launcherItem
 
+        function accessibleDescription() {
+            if (running) {
+                var windows = u2d.tr("%1 window opened", "%1 windows opened", item.windowCount).arg(item.windowCount)
+                return "%1 %2".arg(item.name).arg(windows)
+            } else {
+                return "%1 %2".arg(item.name).arg(u2d.tr("not running"))
+            }
+        }
+
+        Accessible.name: accessibleDescription()
+
         width: list.width
         tileSize: list.tileSize
         padding: list.itemPadding

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-08-09 13:33:24 +0000
+++ launcher/app/launcher.cpp	2011-08-24 12:47:31 +0000
@@ -78,6 +78,7 @@
 {
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication application(argc, argv);
+    application.setApplicationName("Unity 2D Launcher");
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-launcher.desktop");
@@ -91,6 +92,7 @@
     Unity2dPanel panel(true);
     panel.setEdge(Unity2dPanel::LeftEdge);
     panel.setFixedWidth(LauncherClient::MaximumWidth);
+    panel.setAccessibleName("Launcher");
 
     VisibilityController* visibilityController = new VisibilityController(&panel);
 

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-08-01 11:58:35 +0000
+++ launcher/app/launcherview.cpp	2011-08-24 12:47:31 +0000
@@ -56,8 +56,7 @@
 static const char* DASH_DBUS_PROPERTY_ACTIVE = "active";
 static const char* DASH_DBUS_METHOD_ACTIVATE_HOME = "activateHome";
 static const char* SPREAD_DBUS_METHOD_IS_SHOWN = "IsShown";
-static const char* APPLICATIONS_PLACE = "/usr/share/unity/places/applications.place";
-static const char* COMMANDS_PLACE_ENTRY = "Runner";
+static const char* COMMANDS_LENS_ID = "commands.lens";
 static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 LauncherView::LauncherView(QWidget* parent) :
@@ -79,9 +78,9 @@
     Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
     connect(altF1, SIGNAL(pressed()), SLOT(forceActivateWindow()));
 
-    /* Alt+F2 shows the dash with the commands place entry activated. */
+    /* Alt+F2 shows the dash with the commands lens activated. */
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
-    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsPlace()));
+    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsLens()));
 
     /* Super+{n} for 0 ≤ n ≤ 9 activates the item with index (n + 9) % 10. */
     for (Qt::Key key = Qt::Key_0; key <= Qt::Key_9; key = (Qt::Key) (key + 1)) {
@@ -232,10 +231,9 @@
 }
 
 void
-LauncherView::showCommandsPlace()
+LauncherView::showCommandsLens()
 {
     QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    dashInterface.asyncCall("activatePlaceEntry",
-                            APPLICATIONS_PLACE, COMMANDS_PLACE_ENTRY, 0);
+    dashInterface.asyncCall("activateLens", COMMANDS_LENS_ID);
 }
 

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-08-01 11:58:35 +0000
+++ launcher/app/launcherview.h	2011-08-24 12:47:31 +0000
@@ -57,7 +57,7 @@
     void updateSuperKeyMonitoring();
     void updateSuperKeyHoldState();
     void toggleDash();
-    void showCommandsPlace();
+    void showCommandsLens();
 
 protected:
     void focusInEvent(QFocusEvent* event);

=== modified file 'libunity-2d-private/CMakeLists.txt'
--- libunity-2d-private/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -6,8 +6,10 @@
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
+pkg_check_modules(UNITYCORE REQUIRED unity-core-4.0)
+pkg_check_modules(DEE REQUIRED dee-1.0)
 
 set(libunity-2d-private_SOVERSION 0)
 set(libunity-2d-private_VERSION ${libunity-2d-private_SOVERSION}.0.0)

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -30,6 +30,9 @@
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
     ${DCONFQT_INCLUDE_DIRS}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${DEE_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 

=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	2011-08-09 13:33:24 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-08-24 12:47:31 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 1.0
-import gconf 1.0
+import QConf 1.0
 /* Necessary to access the blended image provider and CacheEffect */
 import Unity2d 1.0
 
@@ -32,19 +32,9 @@
     property bool cached: true
     effect: (cached) ? cacheEffect : null
 
-    GConfItem {
-        id: primary_color
-        key: "/desktop/gnome/background/primary_color"
-    }
-
-    GConfItem {
-        id: picture_filename
-        key: "/desktop/gnome/background/picture_filename"
-    }
-
-    GConfItem {
-        id: picture_options
-        key: "/desktop/gnome/background/picture_options"
+    QConf {
+        id: desktopBackground
+        schema: "org.gnome.desktop.background"
     }
 
     Rectangle {
@@ -55,13 +45,13 @@
         }
 
         anchors.fill: parent
-        color: primary_color.value
+        color: desktopBackground.primaryColor
     }
 
     Image {
         id: picture
 
-        visible: picture_filename.value
+        visible: desktopBackground.pictureUri
         source: {
             if (!visible) return ""
             
@@ -74,8 +64,8 @@
                https://bugs.launchpad.net/ubuntu/+source/ubuntu-wallpapers/+bug/296538
                http://bugreports.qt.nokia.com/browse/QTBUG-7276
             */
-            var filename = picture_filename.value
-            if(filename == "/usr/share/backgrounds/warty-final-ubuntu.png")
+            var filename = desktopBackground.pictureUri
+            if(filename == "file:///usr/share/backgrounds/warty-final-ubuntu.png")
                 filename = "/usr/share/unity-2d/warty-final-ubuntu.jpg"
 
             if(overlay_alpha > 0.0)
@@ -99,13 +89,13 @@
             - "spanned" (NOT IMPLEMENTED)
         */
         fillMode: {
-            if(picture_options.value == "wallpaper")
+            if(desktopBackground.pictureOptions== "wallpaper")
                 return Image.Tile
-            else if(picture_options.value == "scaled")
+            else if(desktopBackground.pictureOptions == "scaled")
                 return Image.PreserveAspectFit
-            else if(picture_options.value == "stretched")
+            else if(desktopBackground.pictureOptions == "stretched")
                 return Image.Stretch
-            else if(picture_options.value == "zoom")
+            else if(desktopBackground.pictureOptions == "zoom")
                 return Image.PreserveAspectCrop
             else return Image.PreserveAspectFit
         }

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-08-23 09:42:44 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-08-24 12:47:31 +0000
@@ -20,10 +20,6 @@
 /* Required otherwise using wnck_set_client_type breaks linking with error:
    undefined reference to `wnck_set_client_type(WnckClientType)'
 */
-extern "C" {
-#include <libwnck/util.h>
-}
-
 #include "plugin.h"
 
 #include "launcherapplication.h"
@@ -60,6 +56,10 @@
 #include "autohidebehavior.h"
 #include "intellihidebehavior.h"
 #include "forcevisiblebehavior.h"
+#include "bfb.h"
+
+#include "lenses.h"
+#include "lens.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
@@ -108,6 +108,9 @@
 
     qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
 
+    qmlRegisterType<BfbModel>(uri, 0, 1, "BfbModel");
+    qmlRegisterType<BfbItem>(uri, 0, 1, "BfbItem");
+
     qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
     qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
 
@@ -133,6 +136,9 @@
     qmlRegisterType<IconUtilities>(); // Register the type as non creatable
 
     qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
+
+    qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");
+    qmlRegisterType<Lens>(uri, 1, 0, "Lens");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-08-16 10:40:14 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -2,7 +2,11 @@
 
 # Sources
 set(lib${LIB_NAME}_SRCS
+    bfb.cpp
+    dashclient.cpp
+    debug.cpp
     gconnector.cpp
+    gimageutils.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
     hotkeymonitor.cpp
@@ -53,7 +57,16 @@
     workspaces.cpp
     launcherdropitem.cpp
     iconutilities.cpp
+    lenses.cpp
+    lens.cpp
+    filter.cpp
+    ratingsfilter.cpp
+    cairoutils.cpp
+    indicatorentrywidget.cpp
+    indicatorsmanager.cpp
+    indicatorwidget.cpp
     panelapplet.cpp
+    panelstyle.cpp
     )
 
 # Build
@@ -65,6 +78,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GLIB_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${QTBAMF_INCLUDE_DIRS}
     ${QTGCONF_INCLUDE_DIRS}
@@ -76,6 +91,9 @@
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
     ${DCONFQT_INCLUDE_DIRS}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${DEE_INCLUDE_DIRS}
     )
 
 add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS})
@@ -94,6 +112,8 @@
     ${QT_QTNETWORK_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
+    ${GTK_LDFLAGS}
+    ${PANGO_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${GDK_LDFLAGS}
     ${GIO_LDFLAGS}
@@ -105,6 +125,9 @@
     ${STARTUPNOTIFICATION_LDFLAGS}
     ${INDICATOR_LDFLAGS}
     ${DCONFQT_LDFLAGS}
+    ${UNITYCORE_LDFLAGS}
+    ${NUXCORE_LDFLAGS}
+    ${DEE_LDFLAGS}
     )
 
 # Install

=== added file 'libunity-2d-private/src/bfb.cpp'
--- libunity-2d-private/src/bfb.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/bfb.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bfb.h"
+
+// libunity-2d
+#include <dashclient.h>
+#include <debug_p.h>
+#include <unity2dtr.h>
+
+// Qt
+
+BfbItem::BfbItem()
+: m_active(false)
+{
+    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
+        SLOT(slotActivePageChanged(const QString&)));
+}
+
+BfbItem::~BfbItem()
+{
+}
+
+bool BfbItem::active() const
+{
+    return m_active;
+}
+
+void BfbItem::slotActivePageChanged(const QString& page)
+{
+    bool active = !page.isEmpty();
+    if (m_active != active) {
+        m_active = active;
+        activeChanged(m_active);
+    }
+}
+
+bool BfbItem::running() const
+{
+    return false;
+}
+
+int BfbItem::windowCount() const
+{
+    return 0;
+}
+
+bool BfbItem::urgent() const
+{
+    return false;
+}
+
+QString BfbItem::name() const
+{
+    return u2dTr("Dash");
+}
+
+QString BfbItem::icon() const
+{
+    return "unity-icon-theme/distributor-logo";
+}
+
+bool BfbItem::launching() const
+{
+    return false;
+}
+
+void BfbItem::activate()
+{
+    DashClient::instance()->setActivePage(m_active ? "" : "home");
+}
+
+void BfbItem::createMenuActions()
+{
+}
+
+////////////////////////////////////////////////////////////
+BfbModel::BfbModel(QObject* parent)
+: QAbstractListModel(parent)
+, m_bfbItem(new BfbItem)
+{
+}
+
+BfbModel::~BfbModel()
+{
+    delete m_bfbItem;
+}
+
+int BfbModel::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 1;
+}
+
+QVariant BfbModel::data(const QModelIndex& index, int /*role*/) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    return QVariant::fromValue(m_bfbItem);
+}
+
+#include <bfb.moc>

=== added file 'libunity-2d-private/src/bfb.h'
--- libunity-2d-private/src/bfb.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/bfb.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BFB_H
+#define BFB_H
+
+#include "launcheritem.h"
+
+// Qt
+#include <QAbstractListModel>
+#include <QMetaType>
+
+class BfbItem : public LauncherItem
+{
+    Q_OBJECT
+public:
+    BfbItem();
+    ~BfbItem();
+
+    /* getters */
+    virtual bool active() const;
+    virtual bool running() const;
+    virtual int windowCount() const;
+    virtual bool urgent() const;
+    virtual QString name() const;
+    virtual QString icon() const;
+    virtual bool launching() const;
+
+    /* methods */
+    Q_INVOKABLE virtual void activate();
+    Q_INVOKABLE virtual void createMenuActions();
+
+private Q_SLOTS:
+    void slotActivePageChanged(const QString&);
+
+private:
+    Q_DISABLE_COPY(BfbItem)
+    bool m_active;
+};
+
+Q_DECLARE_METATYPE(BfbItem*)
+
+
+class BfbModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    BfbModel(QObject* parent = 0);
+    ~BfbModel();
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+private:
+    Q_DISABLE_COPY(BfbModel)
+    BfbItem* m_bfbItem;
+};
+
+#endif // BFB_H

=== added file 'libunity-2d-private/src/cairoutils.cpp'
--- libunity-2d-private/src/cairoutils.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/cairoutils.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "cairoutils.h"
+
+// Local
+
+// Qt
+#include <QImage>
+
+namespace CairoUtils {
+
+cairo_surface_t* createSurfaceForQImage(QImage* image)
+{
+    return cairo_image_surface_create_for_data(
+        image->bits(),
+        CAIRO_FORMAT_ARGB32,
+        image->width(),
+        image->height(),
+        image->bytesPerLine()
+        );
+}
+
+} // namespace

=== added file 'libunity-2d-private/src/cairoutils.h'
--- libunity-2d-private/src/cairoutils.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/cairoutils.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,47 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef CAIROUTILS_H
+#define CAIROUTILS_H
+
+// Local
+#include <gscopedpointer.h>
+
+// Qt
+
+// Cairo
+#include <cairo.h>
+
+class QImage;
+
+namespace CairoUtils {
+
+typedef GScopedPointer<cairo_surface_t, cairo_surface_destroy> SurfacePointer;
+typedef GScopedPointer<cairo_t, cairo_destroy> Pointer;
+
+/**
+ * Creates a Cairo surface for a QImage.
+ * QImage format must be Format_ARGB32_Premultiplied.
+ */
+cairo_surface_t* createSurfaceForQImage(QImage*);
+
+} // namespace
+
+#endif /* CAIROUTILS_H */

=== added file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashclient.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,155 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "dashclient.h"
+
+// Local
+
+// libunity-2d
+#include <debug_p.h>
+
+// Qt
+#include <QApplication>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+
+static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
+static const char* DASH_DBUS_PATH = "/Dash";
+static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
+
+DashClient::DashClient(QObject* parent)
+: QObject(parent)
+, m_dashDbusIface(0)
+, m_dashActive(false)
+{
+    /* Check if the dash is already up and running by asking the bus instead of
+       trying to create an instance of the interface. Creating an instance would
+       cause D-Bus to activate the dash and we don’t want this to happen, the
+       dash should be started on demand only. */
+    QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
+    QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(DASH_DBUS_SERVICE);
+    if (reply.isValid() && reply.value()) {
+        connectToDash();
+    } else {
+        /* The dash is not running: monitor its registration on the bus so we
+           can connect to it when it comes up. */
+        QDBusServiceWatcher* watcher = new QDBusServiceWatcher(DASH_DBUS_SERVICE,
+                                                               QDBusConnection::sessionBus(),
+                                                               QDBusServiceWatcher::WatchForRegistration,
+                                                               this);
+        connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
+    }
+}
+
+void DashClient::connectToDash()
+{
+    if (m_dashDbusIface) {
+        return;
+    }
+
+    m_dashDbusIface = new QDBusInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE,
+                                         QDBusConnection::sessionBus(), this);
+    connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
+            SLOT(slotDashActiveChanged(bool)));
+    connect(m_dashDbusIface, SIGNAL(activeLensChanged(const QString&)),
+            SLOT(slotDashActiveLensChanged(const QString&)));
+
+    QVariant value = m_dashDbusIface->property("active");
+    if (value.isValid()) {
+        m_dashActive = value.toBool();
+    } else {
+        UQ_WARNING << "Fetching Dash.active property failed";
+    }
+    value = m_dashDbusIface->property("activeLens");
+    if (value.isValid()) {
+        m_dashActiveLens = value.toString();
+    } else {
+        UQ_WARNING << "Fetching Dash.activeLens property failed";
+    }
+
+    updateActivePage();
+}
+
+DashClient* DashClient::instance()
+{
+    static DashClient* client = new DashClient(qApp);
+    return client;
+}
+
+void DashClient::slotDashActiveChanged(bool value)
+{
+    if (m_dashActive != value) {
+        m_dashActive = value;
+        updateActivePage();
+    }
+}
+
+void DashClient::slotDashActiveLensChanged(const QString& lens)
+{
+    if (m_dashActiveLens != lens) {
+        m_dashActiveLens = lens;
+        updateActivePage();
+    }
+}
+
+QString DashClient::activePage() const
+{
+    return m_activePage;
+}
+
+void DashClient::setActivePage(const QString& page, const QString& lensId)
+{
+    if (m_activePage == page) {
+        return;
+    }
+    if (page.isEmpty()) {
+        // Use m_dashDbusIface to close the dash, but only if it is running
+        if (m_dashDbusIface) {
+            m_dashDbusIface->setProperty("active", false);
+        }
+        return;
+    }
+    // Use a separate QDBusInterface so that the dash is started if it is not
+    // already running
+    QDBusInterface iface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
+    if (page == "home") {
+        iface.asyncCall("activateHome");
+    } else {
+        iface.asyncCall("activateLens", lensId);
+    }
+}
+
+void DashClient::updateActivePage()
+{
+    QString activePage;
+    if (m_dashActive) {
+        activePage = m_dashActiveLens.isEmpty() ? "home" : m_dashActiveLens;
+    }
+
+    if (m_activePage != activePage) {
+        m_activePage = activePage;
+        activePageChanged(m_activePage);
+    }
+}
+
+#include "dashclient.moc"

=== added file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashclient.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,68 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef DASHCLIENT_H
+#define DASHCLIENT_H
+
+// Local
+
+// Qt
+#include <QObject>
+
+class QDBusInterface;
+
+/**
+ * Monitors the dash and provide a single point of entry to its status
+ */
+class DashClient : public QObject
+{
+    Q_OBJECT
+public:
+    static DashClient* instance();
+
+    /**
+     * Returns the active page. This is either:
+     * - The lens id of the active lens
+     * - "home" if the home is visible
+     * - "" if the dash is not visible
+     */
+    QString activePage() const;
+
+    void setActivePage(const QString& page, const QString& lensId=QString());
+
+Q_SIGNALS:
+    void activePageChanged(const QString&);
+
+private Q_SLOTS:
+    void connectToDash();
+    void slotDashActiveChanged(bool);
+    void slotDashActiveLensChanged(const QString&);
+
+private:
+    DashClient(QObject* parent=0);
+    void updateActivePage();
+
+    QDBusInterface* m_dashDbusIface;
+    bool m_dashActive;
+    QString m_dashActiveLens;
+    QString m_activePage;
+};
+
+#endif /* DASHCLIENT_H */

=== added file 'libunity-2d-private/src/debug.cpp'
--- libunity-2d-private/src/debug.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/debug.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,23 @@
+/* This file is part of unity-2d
+   Copyright 2011 Canonical
+   Author: Aurelien Gateau <[e-mail]>
+
+   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; version 3.
+
+   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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include <debug_p.h>
+
+QDebug operator<<(QDebug& dbg, const std::string& str)
+{
+    return dbg << QString::fromUtf8(str.c_str());
+}

=== modified file 'libunity-2d-private/src/debug_p.h'
--- libunity-2d-private/src/debug_p.h	2011-03-28 14:06:14 +0000
+++ libunity-2d-private/src/debug_p.h	2011-08-24 12:47:31 +0000
@@ -17,8 +17,12 @@
 #ifndef DEBUG_P_H
 #define DEBUG_P_H
 
+// Qt
 #include <QDebug>
 
+// STL
+#include <string>
+
 #define _UQ_TRACE(level) (level().nospace() << __PRETTY_FUNCTION__ << ":").space()
 
 // Simple macros to get KDebug like support
@@ -62,5 +66,7 @@
 
 #define UQ_DEBUG_BLOCK Unity2dDebugBlock __unity2dDebugBlock__(__PRETTY_FUNCTION__)
 
+// Support for outputing std::string with qDebug
+QDebug operator<<(QDebug& dbg, const std::string& str);
 
 #endif /* DEBUG_P_H */

=== added file 'libunity-2d-private/src/filter.cpp'
--- libunity-2d-private/src/filter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filter.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "filter.h"
+
+Filter::Filter(QObject *parent) :
+    QObject(parent)
+{
+}
+
+
+QString Filter::id() const
+{
+    return QString::fromStdString(m_unityFilter->id());
+}
+
+QString Filter::name() const
+{
+    return QString::fromStdString(m_unityFilter->name());
+}
+
+QString Filter::iconHint() const
+{
+    return QString::fromStdString(m_unityFilter->icon_hint());
+}
+
+QString Filter::rendererName() const
+{
+    return QString::fromStdString(m_unityFilter->renderer_name());
+}
+
+bool Filter::visible() const
+{
+    return m_unityFilter->visible();
+}
+
+bool Filter::collapsed() const
+{
+    return m_unityFilter->collapsed();
+}
+
+bool Filter::filtering() const
+{
+    return m_unityFilter->filtering();
+}
+
+void Filter::clear()
+{
+    m_unityFilter->Clear();
+}
+
+
+void Filter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    if (m_unityFilter != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+    }
+
+    m_unityFilter = filter;
+
+    /* Property change signals */
+    m_unityFilter->id.changed.connect(sigc::mem_fun(this, &Filter::idChanged));
+    m_unityFilter->name.changed.connect(sigc::mem_fun(this, &Filter::nameChanged));
+    m_unityFilter->icon_hint.changed.connect(sigc::mem_fun(this, &Filter::iconHintChanged));
+    m_unityFilter->renderer_name.changed.connect(sigc::mem_fun(this, &Filter::rendererNameChanged));
+    m_unityFilter->visible.changed.connect(sigc::mem_fun(this, &Filter::visibleChanged));
+    m_unityFilter->collapsed.changed.connect(sigc::mem_fun(this, &Filter::collapsedChanged));
+    m_unityFilter->filtering.changed.connect(sigc::mem_fun(this, &Filter::filteringChanged));
+
+    /* Signals forwarding */
+    m_unityFilter->removed.connect(sigc::mem_fun(this, &Filter::removed));
+}
+
+
+#include "filter.moc"

=== added file 'libunity-2d-private/src/filter.h'
--- libunity-2d-private/src/filter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filter.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FILTER_H
+#define FILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/Filter.h>
+
+class Filter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
+    Q_PROPERTY(QString rendererName READ rendererName NOTIFY rendererNameChanged)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+    Q_PROPERTY(bool collapsed READ collapsed NOTIFY collapsedChanged)
+    Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)
+
+public:
+    explicit Filter(QObject *parent = 0);
+
+    /* getters */
+    QString id() const;
+    QString name() const;
+    QString iconHint() const;
+    QString rendererName() const;
+    bool visible() const;
+    bool collapsed() const;
+    bool filtering() const;
+
+    void clear();
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+Q_SIGNALS:
+    void idChanged(std::string);
+    void nameChanged(std::string);
+    void iconHintChanged(std::string);
+    void rendererNameChanged(std::string);
+    void visibleChanged(bool);
+    void collapsedChanged(bool);
+    void filteringChanged(bool);
+
+    void removed();
+
+protected:
+    unity::dash::Filter::Ptr m_unityFilter;
+};
+
+Q_DECLARE_METATYPE(Filter*)
+
+#endif // FILTER_H

=== added file 'libunity-2d-private/src/gimageutils.cpp'
--- libunity-2d-private/src/gimageutils.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gimageutils.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,102 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include <gimageutils.h>
+
+// Local
+#include <debug_p.h>
+#include <gscopedpointer.h>
+
+// Qt
+#include <QByteArray>
+#include <QImage>
+
+// GTK
+#include <gtk/gtk.h>
+
+namespace GImageUtils
+{
+
+QImage imageForIconString(const QString& name, int size, GtkIconTheme* theme)
+{
+    if (!theme) {
+        theme = gtk_icon_theme_get_default();
+    }
+    QByteArray utf8Name = name.toUtf8();
+
+    /* Load the icon by creating a GIcon from the string icon_name.
+       icon_name can contain more than a simple icon name but possibly
+       a string as returned by g_icon_to_string().
+    */
+    GObjectScopedPointer<GIcon> icon(g_icon_new_for_string(utf8Name.data(), NULL));
+    GScopedPointer<GtkIconInfo, gtk_icon_info_free> iconInfo;
+    iconInfo.reset(gtk_icon_theme_lookup_by_gicon(
+        theme,
+        icon.data(),
+        size,
+        (GtkIconLookupFlags)0)
+        );
+
+    if (!iconInfo) {
+        UQ_WARNING << "Failed to find icon:" << name;
+        return QImage();
+    }
+
+    GObjectScopedPointer<GdkPixbuf> pixbuf(gtk_icon_info_load_icon(iconInfo.data(), NULL));
+    if (!pixbuf) {
+        UQ_WARNING << "Failed to load icon:" << name;
+        return QImage();
+    }
+
+    return imageForPixbuf(pixbuf.data());
+}
+
+QImage imageForPixbuf(const GdkPixbuf* pixbuf)
+{
+    QImage image(gdk_pixbuf_get_pixels(pixbuf),
+                   gdk_pixbuf_get_width(pixbuf),
+                   gdk_pixbuf_get_height(pixbuf),
+                   gdk_pixbuf_get_rowstride(pixbuf),
+                   QImage::Format_ARGB32);
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+    /* ABGR → ARGB */
+    QImage swappedImage = image.rgbSwapped();
+#else
+    /* ABGR → BGRA */
+    /* Reference: https://bugs.launchpad.net/unity-2d/+bug/758782 */
+    QImage swappedImage(image.size(), image.format());
+    for (int i = 0; i < swappedImage.height(); ++i) {
+        QRgb* p = (QRgb*) image.constScanLine(i);
+        QRgb* q = (QRgb*) swappedImage.scanLine(i);
+        QRgb* end = p + image.width();
+        while (p < end) {
+            *q = qRgba(qAlpha(*p), qRed(*p), qGreen(*p), qBlue(*p));
+            p++;
+            q++;
+        }
+    }
+#endif
+
+    return swappedImage;
+}
+
+} // namespace

=== added file 'libunity-2d-private/src/gimageutils.h'
--- libunity-2d-private/src/gimageutils.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gimageutils.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,46 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef GIMAGEUTILS_H
+#define GIMAGEUTILS_H
+
+// Local
+
+// Qt
+
+class QImage;
+class QString;
+
+struct _GdkPixbuf;
+struct _GtkIconTheme;
+
+/**
+ * Helper methods to deal with GTK images
+ */
+namespace GImageUtils
+{
+
+QImage imageForIconString(const QString& name, int size, struct _GtkIconTheme* theme = 0);
+
+QImage imageForPixbuf(const struct _GdkPixbuf* pixbuf);
+
+} // namespace
+
+#endif /* GIMAGEUTILS_H */

=== modified file 'libunity-2d-private/src/iconimageprovider.cpp'
--- libunity-2d-private/src/iconimageprovider.cpp	2011-08-23 17:32:38 +0000
+++ libunity-2d-private/src/iconimageprovider.cpp	2011-08-24 12:47:31 +0000
@@ -23,6 +23,7 @@
 #include <QFile>
 
 #include <debug_p.h>
+#include <gimageutils.h>
 
 static const char* UNITY_RES_PATH = "/usr/share/unity/";
 
@@ -114,62 +115,9 @@
         icon_name.chop(4);
     }
 
-    /* Load the icon by creating a GIcon from the string icon_name.
-       icon_name can contain more than a simple icon name but possibly
-       a string as returned by g_icon_to_string().
-    */
-    QByteArray byte_array = icon_name.toUtf8();
-    gchar *g_icon_name = byte_array.data();
-
-    GIcon *g_icon = g_icon_new_for_string(g_icon_name, NULL);
-    GtkIconInfo *icon_info = gtk_icon_theme_lookup_by_gicon(theme, g_icon,
-                                                            requestedSize.width(),
-                                                            (GtkIconLookupFlags)0);
-    g_object_unref(g_icon);
-
-    if (icon_info == NULL) {
-        UQ_WARNING << "Failed to find icon:" << icon_name;
-        return QImage();
-    }
-
-    GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
-    gtk_icon_info_free(icon_info);
-
-    if (pixbuf == NULL) {
-        UQ_WARNING << "Failed to load icon:" << icon_name;
-        return QImage();
-    }
-
-    QImage image(gdk_pixbuf_get_pixels(pixbuf),
-                   gdk_pixbuf_get_width(pixbuf),
-                   gdk_pixbuf_get_height(pixbuf),
-                   gdk_pixbuf_get_rowstride(pixbuf),
-                   QImage::Format_ARGB32);
-
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-    /* ABGR → ARGB */
-    QImage swappedImage = image.rgbSwapped();
-#else
-    /* ABGR → BGRA */
-    /* Reference: https://bugs.launchpad.net/unity-2d/+bug/758782 */
-    QImage swappedImage(image.size(), image.format());
-    for (int i = 0; i < swappedImage.height(); ++i) {
-        QRgb* p = (QRgb*) image.constScanLine(i);
-        QRgb* q = (QRgb*) swappedImage.scanLine(i);
-        QRgb* end = p + image.width();
-        while (p < end) {
-            *q = qRgba(qAlpha(*p), qRed(*p), qGreen(*p), qBlue(*p));
-            p++;
-            q++;
-        }
-    }
-#endif
-
-    g_object_unref(pixbuf);
-
+    QImage image = GImageUtils::imageForIconString(icon_name, requestedSize.width(), theme);
     if (size) {
-        *size = swappedImage.size();
+        *size = image.size();
     }
-
-    return swappedImage;
+    return image;
 }

=== added file 'libunity-2d-private/src/indicatorentrywidget.cpp'
--- libunity-2d-private/src/indicatorentrywidget.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorentrywidget.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,378 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "indicatorentrywidget.h"
+
+// Local
+#include <cairoutils.h>
+#include <debug_p.h>
+#include <gscopedpointer.h>
+#include <gimageutils.h>
+#include <panelstyle.h>
+
+// Qt
+#include <QIcon>
+#include <QPainter>
+#include <QWheelEvent>
+
+// GTK
+#include <gtk/gtk.h>
+
+// libc
+#include <time.h>
+
+static const int SPACING = 3;
+static const int PADDING = 3;
+static const int ICON_SIZE = 22;
+
+using namespace unity::indicator;
+
+IndicatorEntryWidget::IndicatorEntryWidget(const Entry::Ptr& entry)
+: m_entry(entry)
+, m_padding(PADDING)
+, m_hasIcon(false)
+, m_hasLabel(false)
+, m_gtkWidgetPath(gtk_widget_path_new())
+{
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_WINDOW);
+    gtk_widget_path_iter_set_name(m_gtkWidgetPath, -1 , "UnityPanelWidget");
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_MENU_ITEM);
+
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+    m_entry->updated.connect(sigc::mem_fun(this, &IndicatorEntryWidget::updatePix));
+}
+
+IndicatorEntryWidget::~IndicatorEntryWidget()
+{
+    gtk_widget_path_free(m_gtkWidgetPath);
+}
+
+QSize IndicatorEntryWidget::minimumSizeHint() const
+{
+    return sizeHint();
+}
+
+QSize IndicatorEntryWidget::sizeHint() const
+{
+    return m_pix.size();
+}
+
+void IndicatorEntryWidget::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    updatePix();
+}
+
+void IndicatorEntryWidget::paintEvent(QPaintEvent*)
+{
+    if (!m_pix.isNull()) {
+        QPainter painter(this);
+        painter.drawPixmap(0, 0, m_pix);
+    }
+}
+
+
+void IndicatorEntryWidget::paintActiveBackground(QImage* image)
+{
+    // This code should be kept in sync with corresponding unityshell code from
+    // plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp
+
+    // Get a surface and a context
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+
+    // Init style
+    GtkStyleContext* styleContext = PanelStyle::instance()->styleContext();
+
+    gtk_style_context_save(styleContext);
+
+    gtk_style_context_set_path(styleContext, m_gtkWidgetPath);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUITEM);
+    gtk_style_context_set_state(styleContext, GTK_STATE_FLAG_PRELIGHT);
+
+    // Draw
+    // FIXME(Cimi) probably some padding is needed here.
+    gtk_render_background(styleContext, cr.data(), 0, 0, width(), height());
+    gtk_render_frame(styleContext, cr.data(), 0, 0, width(), height());
+
+    // Clean up
+    gtk_style_context_restore(styleContext);
+}
+
+void IndicatorEntryWidget::updatePix()
+{
+    bool oldIsEmpty = isEmpty();
+
+    int width = m_padding;
+    int iconX = m_padding;
+    int labelX = 0;
+
+    GObjectScopedPointer<PangoLayout> pangoLayout;
+
+    // Compute width, labelX and update m_has{Icon,Label}
+    QPixmap iconPix;
+    if (m_entry->image_visible()) {
+        iconPix = decodeIcon();
+        m_hasIcon = !iconPix.isNull();
+    } else {
+        m_hasIcon = false;
+    }
+    if (m_hasIcon) {
+        width += iconPix.width();
+    }
+
+    m_hasLabel = !m_entry->label().empty() && m_entry->label_visible();
+    if (m_hasLabel) {
+        if (m_hasIcon) {
+            width += SPACING;
+        }
+        labelX = width;
+        pangoLayout.reset(createPangoLayout());
+        int labelWidth;
+        int labelHeight;
+        pango_layout_get_pixel_size(pangoLayout.data(), &labelWidth, &labelHeight);
+
+        width += labelWidth;
+    }
+
+    width += m_padding;
+
+    // Paint
+    QPixmap oldPix = m_pix;
+    if (!m_hasIcon && !m_hasLabel) {
+        m_pix = QPixmap();
+    } else {
+        QImage img(width, height(), QImage::Format_ARGB32_Premultiplied);
+        QPainter painter(&img);
+        painter.initFrom(this);
+        painter.eraseRect(img.rect());
+        if (m_entry->active()) {
+            paintActiveBackground(&img);
+        }
+        if (m_hasIcon) {
+            bool disabled = !m_entry->image_sensitive();
+            if (disabled) {
+                painter.setOpacity(0.5);
+            }
+            painter.drawPixmap(iconX, (height() - iconPix.height()) / 2, iconPix);
+            if (disabled) {
+                painter.setOpacity(1);
+            }
+        }
+        if (m_hasLabel) {
+            paintLabel(&img, pangoLayout.data(), labelX);
+        }
+        m_pix = QPixmap::fromImage(img);
+    }
+
+    // Notify others we changed, but only trigger a layout update if necessary
+    if (m_pix.size() == oldPix.size()) {
+        update();
+    } else {
+        updateGeometry();
+    }
+    bool newIsEmpty = isEmpty();
+    if (newIsEmpty != oldIsEmpty) {
+        // If we emit isEmptyChanged() directly it won't reach any connected
+        // slot. I assume this is because this method is called as a response
+        // to a sigc++ signal.
+        QMetaObject::invokeMethod(this, "isEmptyChanged", Qt::QueuedConnection);
+    }
+}
+
+PangoLayout* IndicatorEntryWidget::createPangoLayout()
+{
+    // Parse
+    PangoAttrList* attrs = NULL;
+    if (m_entry->show_now()) {
+        if (!pango_parse_markup(m_entry->label().c_str(),
+                                 -1,
+                                 '_',
+                                 &attrs,
+                                 NULL,
+                                 NULL,
+                                 NULL))
+        {
+            UQ_WARNING << "pango_parse_markup failed";
+        }
+    }
+
+    // Create layout
+    GObjectScopedPointer<PangoContext> pangoContext(gdk_pango_context_get());
+    PangoLayout* layout = pango_layout_new(pangoContext.data());
+
+    if (attrs) {
+        pango_layout_set_attributes(layout, attrs);
+        pango_attr_list_unref(attrs);
+    }
+
+    // Set font
+    char* font_description = NULL;
+    GtkSettings *settings = gtk_settings_get_default();
+    g_object_get(settings,
+                  "gtk-font-name", &font_description,
+                  NULL);
+    PangoFontDescription* desc = pango_font_description_from_string(font_description);
+    pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
+    pango_layout_set_font_description(layout, desc);
+    pango_font_description_free(desc);
+    g_free(font_description);
+
+    // Set text
+    QString label = QString::fromUtf8(m_entry->label().c_str());
+    label.replace('_', QString());
+    QByteArray utf8Label = label.toUtf8();
+    pango_layout_set_text(layout, utf8Label.data(), -1);
+
+    return layout;
+}
+
+void IndicatorEntryWidget::paintLabel(QImage* image, PangoLayout* layout, int labelX)
+{
+    // This code should be kept in sync with corresponding unityshell code from
+    // plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp
+    int labelWidth, labelHeight;
+    pango_layout_get_pixel_size(layout, &labelWidth, &labelHeight);
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+    pango_cairo_update_layout(cr.data(), layout);
+
+    PanelStyle* style = PanelStyle::instance();
+    GtkStyleContext* styleContext = style->styleContext();
+
+    gtk_style_context_save(styleContext);
+
+    gtk_style_context_set_path(styleContext, m_gtkWidgetPath);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUITEM);
+
+    if (m_entry->active()) {
+        gtk_style_context_set_state(styleContext, GTK_STATE_FLAG_PRELIGHT);
+    }
+
+    gtk_render_layout(styleContext, cr.data(), labelX, (image->height() - labelHeight) / 2, layout);
+    gtk_style_context_restore(styleContext);
+}
+
+QPixmap IndicatorEntryWidget::decodeIcon()
+{
+    QPixmap pix;
+
+    int type = m_entry->image_type();
+
+    if (type == 0) {
+        // No icon
+    } else if (type == GTK_IMAGE_PIXBUF) {
+        QByteArray data = QByteArray::fromBase64(m_entry->image_data().c_str());
+        QImage image;
+        bool ok = image.loadFromData(data);
+        if (ok) {
+            pix = QPixmap::fromImage(image);
+        } else {
+            UQ_WARNING << "Failed to decode image";
+        }
+    } else if (type == GTK_IMAGE_ICON_NAME) {
+        QString name = QString::fromStdString(m_entry->image_data());
+        QIcon icon = QIcon::fromTheme(name);
+        pix = icon.pixmap(ICON_SIZE, ICON_SIZE);
+    } else if (type == GTK_IMAGE_GICON) {
+        QString name = QString::fromStdString(m_entry->image_data());
+        QImage image = GImageUtils::imageForIconString(name, ICON_SIZE);
+        if (image.isNull()) {
+            UQ_WARNING << "Failed to load icon from" << name;
+            return QPixmap();
+        }
+        return QPixmap::fromImage(image);
+    } else {
+        UQ_WARNING << "Unknown image type" << m_entry->image_type();
+    }
+    return pix;
+}
+
+void IndicatorEntryWidget::mousePressEvent(QMouseEvent* event)
+{
+    UQ_RETURN_IF_FAIL(m_hasIcon || m_hasLabel);
+    if (event->button() != Qt::MiddleButton)
+	    showMenu(Qt::LeftButton);
+}
+
+void IndicatorEntryWidget::mouseReleaseEvent(QMouseEvent* event)
+{
+    UQ_VAR(this);
+    update();
+
+    if (event->button() == Qt::MiddleButton && rect().contains(event->pos(), false))
+    	m_entry->SecondaryActivate(time(NULL));
+}
+
+void IndicatorEntryWidget::wheelEvent(QWheelEvent* event)
+{
+    m_entry->Scroll(event->delta());
+}
+
+void IndicatorEntryWidget::showMenu(Qt::MouseButton qtButton)
+{
+    if (m_entry->active()) {
+        return;
+    }
+    int nuxButton = qtButton == Qt::NoButton ? 0 : 1;
+    QPoint pos = mapToGlobal(rect().bottomLeft());
+    m_entry->ShowMenu(pos.x(), pos.y(),
+        time(NULL),
+        nuxButton
+        );
+}
+
+void IndicatorEntryWidget::setPadding(int padding)
+{
+    if (m_padding != padding) {
+        m_padding = padding;
+        updatePix();
+    }
+}
+
+bool IndicatorEntryWidget::event(QEvent* ev)
+{
+    bool ret = QWidget::event(ev);
+    switch (ev->type()) {
+    case QEvent::FontChange:
+    case QEvent::PaletteChange:
+        updatePix();
+        break;
+    default:
+        break;
+    }
+    return ret;
+}
+
+bool IndicatorEntryWidget::isEmpty() const
+{
+    return !m_hasIcon && !m_hasLabel;
+}
+
+unity::indicator::Entry::Ptr IndicatorEntryWidget::entry() const
+{
+    return m_entry;
+}
+
+#include "indicatorentrywidget.moc"

=== added file 'libunity-2d-private/src/indicatorentrywidget.h'
--- libunity-2d-private/src/indicatorentrywidget.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorentrywidget.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,90 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INDICATORENTRYWIDGET_H
+#define INDICATORENTRYWIDGET_H
+
+// Local
+
+// libunity-core
+#include <UnityCore/IndicatorEntry.h>
+
+// Qt
+#include <QWidget>
+
+struct _GtkWidgetPath;
+struct _PangoLayout;
+
+class QPainter;
+
+class IndicatorEntryWidget : public QWidget, public sigc::trackable
+{
+Q_OBJECT
+public:
+    IndicatorEntryWidget(const unity::indicator::Entry::Ptr& entry);
+    ~IndicatorEntryWidget();
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+    void setPadding(int);
+
+    bool isEmpty() const;
+
+    unity::indicator::Entry::Ptr entry() const;
+
+    /**
+     * Shows the menu.
+     *
+     * When this method is called because of a click, button
+     * must be set to Qt::LeftButton.
+     *
+     * When it is called because user previously clicked an indicator and moved the
+     * mouse to another indicator, button must be set to Qt::NoButton.
+     */
+    void showMenu(Qt::MouseButton button);
+
+Q_SIGNALS:
+    void isEmptyChanged();
+
+protected:
+    void resizeEvent(QResizeEvent*);
+    void paintEvent(QPaintEvent*);
+    void mousePressEvent(QMouseEvent*);
+    void mouseReleaseEvent(QMouseEvent*);
+    void wheelEvent(QWheelEvent*);
+    bool event(QEvent*);
+
+private:
+    unity::indicator::Entry::Ptr m_entry;
+    QPixmap m_pix;
+    int m_padding;
+    bool m_hasIcon;
+    bool m_hasLabel;
+    struct _GtkWidgetPath* m_gtkWidgetPath;
+    void updatePix();
+    QPixmap decodeIcon();
+    void paintActiveBackground(QImage*);
+
+    struct _PangoLayout* createPangoLayout();
+    void paintLabel(QImage*, struct _PangoLayout*, int labelX);
+};
+
+#endif /* INDICATORENTRYWIDGET_H */

=== added file 'libunity-2d-private/src/indicatorsmanager.cpp'
--- libunity-2d-private/src/indicatorsmanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorsmanager.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,206 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "indicatorsmanager.h"
+
+// Local
+#include <debug_p.h>
+#include <indicatorentrywidget.h>
+
+// Qt
+#include <QApplication>
+#include <QTimer>
+#include <QX11Info>
+
+// X11
+#include <X11/Xlib.h>
+
+using namespace unity::indicator;
+
+IndicatorsManager::IndicatorsManager(QObject* parent)
+: QObject(parent)
+, m_indicators(new DBusIndicators)
+, m_geometrySyncTimer(new QTimer(this))
+, m_mouseTrackerTimer(new QTimer(this))
+{
+    m_geometrySyncTimer->setInterval(0);
+    m_geometrySyncTimer->setSingleShot(true);
+    connect(m_geometrySyncTimer, SIGNAL(timeout()), SLOT(syncGeometries()));
+
+    // m_mouseTrackerTimer is inspired from
+    // plugins/unityshell/src/PanelView.cpp in OnEntryActivated()
+    //
+    // Rationale copied from Unity source code:
+    // """
+    // Track menus being scrubbed at 60Hz (about every 16 millisec)
+    // It might sound ugly, but it's far nicer (and more responsive) than the
+    // code it replaces which used to capture motion events in another process
+    // (unity-panel-service) and send them to us over dbus.
+    // NOTE: The reason why we have to use a timer instead of tracking motion
+    // events is because the motion events will never be delivered to this
+    // process. All the motion events will go to unity-panel-service while
+    // scrubbing because the active panel menu has (needs) the pointer grab.
+    // """
+    m_mouseTrackerTimer->setInterval(16);
+    m_mouseTrackerTimer->setSingleShot(false);
+    connect(m_mouseTrackerTimer, SIGNAL(timeout()), SLOT(checkMousePosition()));
+
+    m_indicators->on_entry_show_menu.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onEntryShowMenu)
+        );
+
+    m_indicators->on_entry_activate_request.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onEntryActivateRequest)
+        );
+
+    m_indicators->on_entry_activated.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onEntryActivated)
+        );
+
+    m_indicators->on_synced.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onSynced)
+        );
+}
+
+unity::indicator::DBusIndicators::Ptr IndicatorsManager::indicators() const
+{
+    return m_indicators;
+}
+
+void IndicatorsManager::onEntryShowMenu(const std::string& /*entryId*/, int posX, int posY, int /*timestamp*/, int /*button*/)
+{
+    // Copied from plugins/unityshell/src/PanelView.cpp, in OnEntryShowMenu()
+    // Without this code, menus cannot be shown from mousePressEvent() (but can
+    // be shown from mouseReleaseEvent())
+    /*
+    Neil explanation:
+    On button down, X automatically gives Qt a passive grab on the mouse this
+    means that, if the panel service tries to grab the pointer to show the menu
+    (gtk does this automatically), it fails and the menu can't show.
+    We connect to the on_entry_show_menu signal, which is emitted before
+    DBusIndicators does anything else, and just break the grab.
+    */
+    Display* display = QX11Info::display();
+    XUngrabPointer(display, CurrentTime);
+    XFlush(display);
+
+    XButtonEvent event = {
+        ButtonRelease,
+        0,
+        False,
+        display,
+        0,
+        0,
+        0,
+        CurrentTime,
+        posX, posY,
+        posX, posY,
+        0,
+        Button1,
+        True
+    };
+    qApp->x11ProcessEvent(reinterpret_cast<XEvent*>(&event));
+}
+
+void IndicatorsManager::checkMousePosition()
+{
+    // Called by m_mouseTrackerTimer to implement mouse scrubbing
+    // (Assuming item A menu is opened, move mouse over item B => item B menu opens)
+    QWidget* widget = QApplication::widgetAt(QCursor::pos());
+    IndicatorEntryWidget* entryWidget = qobject_cast<IndicatorEntryWidget*>(widget);
+    if (!entryWidget) {
+        return;
+    }
+    entryWidget->showMenu(Qt::NoButton);
+}
+
+void IndicatorsManager::onEntryActivateRequest(const std::string& entryId)
+{
+    if (entryId.empty()) {
+        return;
+    }
+    IndicatorEntryWidget* widget = 0;
+    Q_FOREACH(widget, m_widgetList) {
+        if (widget->entry()->id() == entryId) {
+            break;
+        }
+    }
+    if (!widget) {
+        UQ_WARNING << "Could not find a widget for IndicatorEntry with id" << QString::fromStdString(entryId);
+        return;
+    }
+    widget->showMenu(Qt::NoButton);
+}
+
+void IndicatorsManager::onEntryActivated(const std::string& entryId)
+{
+    if (entryId.empty()) {
+        m_mouseTrackerTimer->stop();
+    } else {
+        m_mouseTrackerTimer->start();
+    }
+}
+
+void IndicatorsManager::onSynced()
+{
+    QMetaObject::invokeMethod(m_geometrySyncTimer, "start", Qt::QueuedConnection);
+}
+
+void IndicatorsManager::addIndicatorEntryWidget(IndicatorEntryWidget* widget)
+{
+    m_widgetList.append(widget);
+    widget->installEventFilter(this);
+}
+
+bool IndicatorsManager::eventFilter(QObject*, QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::Show:
+    case QEvent::Hide:
+    case QEvent::Move:
+    case QEvent::Resize:
+        m_geometrySyncTimer->start();
+        break;
+    default:
+        break;
+    }
+    return false;
+}
+
+void IndicatorsManager::syncGeometries()
+{
+    EntryLocationMap locations;
+    Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
+        if (!widget->isVisible()) {
+            continue;
+        }
+        Entry::Ptr entry = widget->entry();
+        if (entry->IsUnused()) {
+            continue;
+        }
+        QPoint topLeft = widget->mapToGlobal(QPoint(0, 0));
+        nux::Rect rect(topLeft.x(), topLeft.y(), widget->width(), widget->height());
+        locations[widget->entry()->id()] = rect;
+    }
+    m_indicators->SyncGeometries("Panel", locations);
+}
+
+#include "indicatorsmanager.moc"

=== added file 'libunity-2d-private/src/indicatorsmanager.h'
--- libunity-2d-private/src/indicatorsmanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorsmanager.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,72 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INDICATORSMANAGER_H
+#define INDICATORSMANAGER_H
+
+// Local
+
+// Qt
+#include <QMap>
+#include <QObject>
+
+// libunity-core
+#include <UnityCore/DBusIndicators.h>
+
+class QTimer;
+
+class IndicatorEntryWidget;
+
+/**
+ * Instantiates DBusIndicators and implement common behavior
+ */
+class IndicatorsManager : public QObject, public sigc::trackable
+{
+    Q_OBJECT
+public:
+    IndicatorsManager(QObject* parent);
+
+    unity::indicator::DBusIndicators::Ptr indicators() const;
+
+    void addIndicatorEntryWidget(IndicatorEntryWidget* widget);
+
+protected:
+    bool eventFilter(QObject*, QEvent*);
+
+private Q_SLOTS:
+    void syncGeometries();
+    void checkMousePosition();
+
+private:
+    Q_DISABLE_COPY(IndicatorsManager)
+    unity::indicator::DBusIndicators::Ptr m_indicators;
+    QTimer* m_geometrySyncTimer;
+    QTimer* m_mouseTrackerTimer;
+
+    typedef QList<IndicatorEntryWidget*> IndicatorEntryWidgetList;
+    IndicatorEntryWidgetList m_widgetList;
+
+    void onSynced();
+    void onEntryShowMenu(const std::string&, int x, int y, int timestamp, int button);
+    void onEntryActivateRequest(const std::string& entryId);
+    void onEntryActivated(const std::string& entryId);
+};
+
+#endif /* INDICATORSMANAGER_H */

=== added file 'libunity-2d-private/src/indicatorwidget.cpp'
--- libunity-2d-private/src/indicatorwidget.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorwidget.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,53 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "indicatorwidget.h"
+
+// Local
+#include <debug_p.h>
+#include <indicatorentrywidget.h>
+#include <indicatorsmanager.h>
+
+// Qt
+#include <QHBoxLayout>
+
+using namespace unity::indicator;
+
+IndicatorWidget::IndicatorWidget(const Indicator::Ptr& indicator, IndicatorsManager* manager)
+: m_layout(new QHBoxLayout(this))
+, m_indicatorsManager(manager)
+, m_indicator(indicator)
+{
+    m_layout->setMargin(0);
+    m_layout->setSpacing(0);
+
+    m_indicator->on_entry_added.connect(sigc::mem_fun(this, &IndicatorWidget::onEntryAdded));
+}
+
+void IndicatorWidget::onEntryAdded(const Entry::Ptr& entry)
+{
+    IndicatorEntryWidget* widget = new IndicatorEntryWidget(entry);
+    m_indicatorsManager->addIndicatorEntryWidget(widget);
+    m_layout->addWidget(widget);
+}
+
+
+#include "indicatorwidget.moc"

=== added file 'libunity-2d-private/src/indicatorwidget.h'
--- libunity-2d-private/src/indicatorwidget.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/indicatorwidget.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INDICATORWIDGET_H
+#define INDICATORWIDGET_H
+
+// Local
+
+// libunity-core
+#include <UnityCore/Indicator.h>
+#include <UnityCore/IndicatorEntry.h>
+
+// Qt
+#include <QWidget>
+
+class QHBoxLayout;
+
+class IndicatorEntryWidget;
+class IndicatorsManager;
+
+class IndicatorWidget : public QWidget, public sigc::trackable
+{
+Q_OBJECT
+public:
+    IndicatorWidget(const unity::indicator::Indicator::Ptr& indicator, IndicatorsManager* manager);
+
+private:
+    QHBoxLayout* m_layout;
+    IndicatorsManager* m_indicatorsManager;
+    unity::indicator::Indicator::Ptr m_indicator;
+
+    void onEntryAdded(const unity::indicator::Entry::Ptr& entry);
+};
+
+#endif /* INDICATORWIDGET_H */

=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
--- libunity-2d-private/src/launcherapplication.cpp	2011-08-09 11:28:45 +0000
+++ libunity-2d-private/src/launcherapplication.cpp	2011-08-24 12:47:31 +0000
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Those have to be included before any QObject-style header to avoid
-   compilation errors. */
-#include <gdk/gdk.h>
-
 /* Note regarding the use of wnck: it is critically important that the client
    type be set to pager because wnck will pass that type over to the window
    manager through XEvents.
@@ -59,6 +55,7 @@
 #include <QX11Info>
 
 extern "C" {
+#include <gdk/gdk.h>
 #include <libsn/sn.h>
 }
 
@@ -662,7 +659,8 @@
     GTimeVal timeval;
 
     g_get_current_time (&timeval);
-    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_app_launch_context_new());
+    GdkDisplay* display = gdk_display_get_default();
+    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
     /* Using GDK_CURRENT_TIME doesn’t seem to work, launched windows
        sometimes don’t get focus (see https://launchpad.net/bugs/643616). */
     gdk_app_launch_context_set_timestamp(context.data(), timeval.tv_sec);
@@ -893,7 +891,7 @@
         QAction* keep = new QAction(m_menu);
         keep->setCheckable(is_running);
         keep->setChecked(sticky());
-        keep->setText(is_running ? u2dTr("Keep In Launcher") : u2dTr("Remove From Launcher"));
+        keep->setText(is_running ? u2dTr("Keep in launcher") : u2dTr("Remove from launcher"));
         actions.append(keep);
         QObject::connect(keep, SIGNAL(triggered()), this, SLOT(onKeepTriggered()));
     }

=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
--- libunity-2d-private/src/launcherapplicationslist.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherapplicationslist.cpp	2011-08-24 12:47:31 +0000
@@ -101,6 +101,16 @@
         application->installX11EventFilter(this);
     }
 
+    /* Get the system applications data dirs and be flexible if / is not at the
+       end of each path. */
+    QString xdgDataDir = QFile::decodeName(getenv("XDG_DATA_DIRS"));
+    if (xdgDataDir.isEmpty()) {
+        xdgDataDir = "/usr/local/share/:/usr/share/";
+    }
+    Q_FOREACH(const QString& dirName, xdgDataDir.split(':')) {
+      m_xdgApplicationDirs << QDir::cleanPath(dirName + "/applications") + "/";
+    }
+
     load();
 }
 
@@ -178,9 +188,17 @@
 }
 
 QString
-LauncherApplicationsList::favoriteFromDesktopFilePath(QString desktop_file)
+LauncherApplicationsList::favoriteFromDesktopFilePath(const QString& _desktopFile) const
 {
-    return QDir(desktop_file).dirName();
+    QString desktopFile(_desktopFile);
+    Q_FOREACH(const QString& applicationDir, m_xdgApplicationDirs) {
+        if (_desktopFile.startsWith(applicationDir)) {
+            desktopFile.remove(applicationDir);
+            desktopFile.replace("/", "-");
+            break;
+        }
+    }
+    return desktopFile;
 }
 
 void

=== modified file 'libunity-2d-private/src/launcherapplicationslist.h'
--- libunity-2d-private/src/launcherapplicationslist.h	2011-08-06 10:42:04 +0000
+++ libunity-2d-private/src/launcherapplicationslist.h	2011-08-24 12:47:31 +0000
@@ -70,7 +70,7 @@
     void insertApplication(LauncherApplication* application);
     void removeApplication(LauncherApplication* application);
 
-    static QString favoriteFromDesktopFilePath(QString desktop_file);
+    QString favoriteFromDesktopFilePath(const QString& desktop_file) const;
 
     void writeFavoritesToGConf();
 
@@ -89,6 +89,7 @@
     */
     QHash<QString, LauncherApplication*> m_applicationForExecutable;
     QConf* m_dconf_launcher;
+    QStringList m_xdgApplicationDirs;
 
     /* Startup notification support */
     SnDisplay *m_snDisplay;

=== modified file 'libunity-2d-private/src/launcherdevice.cpp'
--- libunity-2d-private/src/launcherdevice.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherdevice.cpp	2011-08-24 12:47:31 +0000
@@ -186,35 +186,65 @@
 }
 
 void
+LauncherDevice::unmount(GMountOperation* mountOperation)
+{
+    if (m_volume == NULL) {
+        return;
+    }
+
+    GObjectScopedPointer<GMount> mount(g_volume_get_mount(m_volume));
+
+    if (mount.isNull()) {
+        return;
+    }
+
+    if (g_mount_can_unmount(mount.data())) {
+        g_mount_unmount_with_operation(mount.data(), G_MOUNT_UNMOUNT_NONE, mountOperation, NULL,
+                                       (GAsyncReadyCallback) LauncherDevice::onMountUnmounted,
+                                       NULL);
+    }
+}
+
+void
 LauncherDevice::eject()
 {
     if (m_volume == NULL) {
         return;
     }
 
-    GMountOperation *mountOperation;
-    mountOperation = gtk_mount_operation_new(NULL);
+    GObjectScopedPointer<GMountOperation> mountOperation(gtk_mount_operation_new(NULL));
 
     if (g_volume_can_eject(m_volume)) {
-        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, mountOperation,
-            NULL, (GAsyncReadyCallback) LauncherDevice::onVolumeEjected, NULL);
-    } else {
-        GMount* mount = g_volume_get_mount(m_volume);
-
-        if (mount == NULL) {
-            return;
-        }
-
-        if (g_mount_can_unmount(mount)) {
-            g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, mountOperation,
-                NULL, (GAsyncReadyCallback) LauncherDevice::onMountUnmounted,
-                NULL);
-        } else {
-            g_object_unref(mount);
-        }
-    }
-
-    g_object_unref(mountOperation);
+        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, mountOperation.data(),
+                                      NULL,
+                                      (GAsyncReadyCallback) LauncherDevice::onVolumeEjected,
+                                      NULL);
+    } else {
+        unmount(mountOperation.data());
+    }
+}
+
+void
+LauncherDevice::stop()
+{
+    if (m_volume == NULL) {
+        return;
+    }
+
+    GObjectScopedPointer<GDrive> drive(g_volume_get_drive(m_volume));
+
+    if (drive.isNull()) {
+        return;
+    }
+
+    GObjectScopedPointer<GMountOperation> mountOperation(gtk_mount_operation_new(NULL));
+
+    if (g_drive_can_stop(drive.data())) {
+        g_drive_stop(drive.data(), G_MOUNT_UNMOUNT_NONE, mountOperation.data(), NULL,
+                     (GAsyncReadyCallback) LauncherDevice::onDriveStopped, NULL);
+    } else {
+        unmount(mountOperation.data());
+    }
 }
 
 void
@@ -224,6 +254,12 @@
 }
 
 void
+LauncherDevice::onDriveStopped(GDrive* drive, GAsyncResult* res)
+{
+    g_drive_stop_finish(drive, res, NULL);
+}
+
+void
 LauncherDevice::onMountUnmounted(GMount* mount, GAsyncResult* res)
 {
     g_mount_unmount_with_operation_finish(mount, res, NULL);
@@ -237,6 +273,15 @@
     eject->setText(u2dTr("Eject"));
     m_menu->addAction(eject);
     QObject::connect(eject, SIGNAL(triggered()), this, SLOT(onEjectTriggered()));
+
+    GObjectScopedPointer<GDrive> drive(g_volume_get_drive(m_volume));
+
+    if (!drive.isNull() && g_drive_can_stop(drive.data())) {
+        QAction* stop = new QAction(m_menu);
+        stop->setText(u2dTr("Safely remove"));
+        m_menu->addAction(stop);
+        QObject::connect(stop, SIGNAL(triggered()), this, SLOT(onStopTriggered()));
+    }
 }
 
 void
@@ -246,4 +291,11 @@
     eject();
 }
 
+void
+LauncherDevice::onStopTriggered()
+{
+    m_menu->hide();
+    stop();
+}
+
 #include "launcherdevice.moc"

=== modified file 'libunity-2d-private/src/launcherdevice.h'
--- libunity-2d-private/src/launcherdevice.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherdevice.h	2011-08-24 12:47:31 +0000
@@ -51,18 +51,22 @@
     Q_INVOKABLE GVolume* getVolume();
     Q_INVOKABLE void setVolume(GVolume* volume);
     Q_INVOKABLE void open();
+    Q_INVOKABLE void unmount(GMountOperation* mountOperation);
     Q_INVOKABLE void eject();
+    Q_INVOKABLE void stop();
 
     Q_INVOKABLE virtual void createMenuActions();
 
 private Q_SLOTS:
     void onEjectTriggered();
+    void onStopTriggered();
 
 private:
     GVolume* m_volume;
 
     static void onVolumeMounted(GVolume* volume, GAsyncResult* res);
     static void onVolumeEjected(GVolume* volume, GAsyncResult* res);
+    static void onDriveStopped(GDrive* drive, GAsyncResult* res);
     static void onMountUnmounted(GMount* mount, GAsyncResult* res);
 };
 

=== modified file 'libunity-2d-private/src/launchermenu.cpp'
--- libunity-2d-private/src/launchermenu.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launchermenu.cpp	2011-08-24 12:47:31 +0000
@@ -96,6 +96,7 @@
 void
 LauncherContextualMenu::setTitle(const QString& title)
 {
+    setAccessibleName(title);
     m_title = title;
     /* Escaping ampersands so that they are not considered as keyboard
        accelerators. */

=== added file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lens.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "lens.h"
+
+// libunity-2d
+#include <debug_p.h>
+#include "launcherapplication.h"
+
+// Qt
+#include <QUrl>
+#include <QDesktopServices>
+
+Lens::Lens(QObject *parent) :
+    QObject(parent)
+{
+    m_results = new DeeListModel;
+    m_globalResults = new DeeListModel;
+    m_categories = new DeeListModel;
+}
+
+QString Lens::id() const
+{
+    return QString::fromStdString(m_unityLens->id());
+}
+
+QString Lens::dbusName() const
+{
+    return QString::fromStdString(m_unityLens->dbus_name());
+}
+
+QString Lens::dbusPath() const
+{
+    return QString::fromStdString(m_unityLens->dbus_path());
+}
+
+QString Lens::name() const
+{
+    return QString::fromStdString(m_unityLens->name());
+}
+
+QString Lens::iconHint() const
+{
+    return QString::fromStdString(m_unityLens->icon_hint());
+}
+
+QString Lens::description() const
+{
+    return QString::fromStdString(m_unityLens->description());
+}
+
+QString Lens::searchHint() const
+{
+    return QString::fromStdString(m_unityLens->search_hint());
+}
+
+bool Lens::visible() const
+{
+    return m_unityLens->visible();
+}
+
+bool Lens::searchInGlobal() const
+{
+    return m_unityLens->search_in_global();
+}
+
+QString Lens::shortcut() const
+{
+    return QString::fromStdString(m_unityLens->shortcut());
+}
+
+bool Lens::connected() const
+{
+    return m_unityLens->connected();
+}
+
+DeeListModel* Lens::results() const
+{
+    return m_results;
+}
+
+DeeListModel* Lens::globalResults() const
+{
+    return m_globalResults;
+}
+
+DeeListModel* Lens::categories() const
+{
+    return m_categories;
+}
+
+bool Lens::active() const
+{
+    return m_unityLens->active();
+}
+
+QString Lens::searchQuery() const
+{
+    return m_searchQuery;
+}
+
+QString Lens::globalSearchQuery() const
+{
+    return m_globalSearchQuery;
+}
+
+void Lens::setActive(bool active)
+{
+    m_unityLens->active = active;
+}
+
+void Lens::setSearchQuery(const QString& search_query)
+{
+    if (search_query != m_searchQuery) {
+        m_searchQuery = search_query;
+        m_unityLens->Search(search_query.toStdString());
+        Q_EMIT searchQueryChanged();
+    }
+}
+
+void Lens::setGlobalSearchQuery(const QString& search_query)
+{
+    if (search_query != m_globalSearchQuery) {
+        m_globalSearchQuery = search_query;
+        m_unityLens->GlobalSearch(search_query.toStdString());
+        Q_EMIT globalSearchQueryChanged();
+    }
+}
+
+void Lens::activate(const QString& uri)
+{
+    m_unityLens->Activate(uri.toStdString());
+}
+
+void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
+{
+    if (type == unity::dash::NOT_HANDLED) {
+        fallbackActivate(QString::fromStdString(uri));
+    }
+}
+
+void Lens::fallbackActivate(const QString& uri)
+{
+    /* FIXME: stripping all content before the first column because for some
+              reason the lenses give uri with junk content at their beginning.
+    */
+    QString tweakedUri = uri;
+    int firstColumnAt = tweakedUri.indexOf(":");
+    tweakedUri.remove(0, firstColumnAt+1);
+
+    /* Tries various methods to trigger a sensible action for the given 'uri'.
+       If it has no understanding of the given scheme it falls back on asking
+       Qt to open the uri.
+    */
+    QUrl url(tweakedUri);
+    if (url.scheme() == "file") {
+        /* Override the files place's default URI handler: we want the file
+           manager to handle opening folders, not the dash.
+
+           Ref: https://bugs.launchpad.net/upicek/+bug/689667
+        */
+        QDesktopServices::openUrl(url);
+        return;
+    }
+    if (url.scheme() == "application") {
+        LauncherApplication application;
+        /* Cannot set the desktop file to url.host(), because the QUrl constructor
+           converts the host name to lower case to conform to the Nameprep
+           RFC (see http://doc.qt.nokia.com/qurl.html#FormattingOption-enum).
+           Ref: https://bugs.launchpad.net/unity-place-applications/+bug/784478 */
+        QString desktopFile = tweakedUri.mid(tweakedUri.indexOf("://") + 3);
+        application.setDesktopFile(desktopFile);
+        application.activate();
+        return;
+    }
+
+    UQ_WARNING << "FIXME: Possibly no handler for scheme: " << url.scheme();
+    UQ_WARNING << "Trying to open" << tweakedUri;
+    /* Try our luck */
+    QDesktopServices::openUrl(url);
+}
+
+void Lens::setUnityLens(unity::dash::Lens::Ptr lens)
+{
+    if (m_unityLens != NULL) {
+        // FIXME: should disconnect from m_unityLens's signals
+    }
+
+    // FIXME: should emit change notification signals for all properties
+
+    m_unityLens = lens;
+
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+
+    /* Property change signals */
+    m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));
+    m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));
+    m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));
+    m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));
+    m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));
+    m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));
+    m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));
+    m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));
+    m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));
+    m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));
+    m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));
+    m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));
+    m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));
+    m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));
+    m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));
+    m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));
+    m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));
+    m_unityLens->active.changed.connect(sigc::mem_fun(this, &Lens::activeChanged));
+
+    /* Signals forwarding */
+    m_unityLens->search_finished.connect(sigc::mem_fun(this, &Lens::searchFinished));
+    m_unityLens->global_search_finished.connect(sigc::mem_fun(this, &Lens::globalSearchFinished));
+
+    /* FIXME: signal should be forwarded instead of calling the handler directly */
+    m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));
+}
+
+void Lens::onResultsSwarmNameChanged(std::string swarm_name)
+{
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+}
+
+void Lens::onResultsChanged(unity::dash::Results::Ptr results)
+{
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+}
+
+void Lens::onGlobalResultsSwarmNameChanged(std::string swarm_name)
+{
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+}
+
+void Lens::onGlobalResultsChanged(unity::dash::Results::Ptr global_results)
+{
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+}
+
+void Lens::onCategoriesSwarmNameChanged(std::string swarm_name)
+{
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+}
+
+void Lens::onCategoriesChanged(unity::dash::Categories::Ptr categories)
+{
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+}
+
+#include "lens.moc"

=== added file 'libunity-2d-private/src/lens.h'
--- libunity-2d-private/src/lens.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lens.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LENS_H
+#define LENS_H
+
+// Qt
+#include <QObject>
+#include <QString>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/Lens.h>
+
+// dee-qt
+#include "deelistmodel.h"
+
+
+class Lens : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)
+    Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
+    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
+    Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+    Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)
+    Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
+    Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
+    Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
+    Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)
+    Q_PROPERTY(DeeListModel* categories READ categories NOTIFY categoriesChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
+    Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
+
+public:
+    explicit Lens(QObject *parent = 0);
+
+    /* getters */
+    QString id() const;
+    QString dbusName() const;
+    QString dbusPath() const;
+    QString name() const;
+    QString iconHint() const;
+    QString description() const;
+    QString searchHint() const;
+    bool visible() const;
+    bool searchInGlobal() const;
+    QString shortcut() const;
+    bool connected() const;
+    DeeListModel* results() const;
+    DeeListModel* globalResults() const;
+    DeeListModel* categories() const;
+    bool active() const;
+    QString searchQuery() const;
+    QString globalSearchQuery() const;
+
+    /* setters */
+    void setActive(bool active);
+    void setSearchQuery(const QString& search_query);
+    void setGlobalSearchQuery(const QString& search_query);
+
+    Q_INVOKABLE void activate(const QString& uri);
+    void setUnityLens(unity::dash::Lens::Ptr lens);
+
+Q_SIGNALS:
+    void idChanged(std::string);
+    void dbusNameChanged(std::string);
+    void dbusPathChanged(std::string);
+    void nameChanged(std::string);
+    void iconHintChanged(std::string);
+    void descriptionChanged(std::string);
+    void searchHintChanged(std::string);
+    void visibleChanged(bool);
+    void searchInGlobalChanged(bool);
+    void shortcutChanged(std::string);
+    void connectedChanged(bool);
+    void resultsChanged();
+    void globalResultsChanged();
+    void categoriesChanged();
+    void activeChanged(bool);
+    void searchFinished(std::string const&);
+    void globalSearchFinished(std::string const&);
+    void searchQueryChanged();
+    void globalSearchQueryChanged();
+
+private:
+    void onResultsSwarmNameChanged(std::string);
+    void onResultsChanged(unity::dash::Results::Ptr);
+    void onGlobalResultsSwarmNameChanged(std::string);
+    void onGlobalResultsChanged(unity::dash::Results::Ptr);
+    void onCategoriesSwarmNameChanged(std::string);
+    void onCategoriesChanged(unity::dash::Categories::Ptr);
+
+    void onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&);
+    void fallbackActivate(const QString& uri);
+
+    unity::dash::Lens::Ptr m_unityLens;
+    DeeListModel* m_results;
+    DeeListModel* m_globalResults;
+    DeeListModel* m_categories;
+    QString m_searchQuery;
+    QString m_globalSearchQuery;
+};
+
+Q_DECLARE_METATYPE(Lens*)
+
+#endif // LENS_H

=== added file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lenses.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "lenses.h"
+
+// Local
+#include "lens.h"
+
+// Qt
+
+// libunity-core
+#include <UnityCore/FilesystemLenses.h>
+
+Lenses::Lenses(QObject *parent) :
+    QAbstractListModel(parent)
+{
+    QHash<int, QByteArray> roles;
+    roles[Lenses::RoleItem] = "item";
+    roles[Lenses::RoleVisible] = "visible";
+    setRoleNames(roles);
+
+    m_unityLenses = new unity::dash::FilesystemLenses("/usr/share/unity/lenses");
+    for (unsigned int i=0; i<m_unityLenses->count(); i++) {
+        unity::dash::Lens::Ptr unityLens = m_unityLenses->GetLensAtIndex(i);
+        addUnityLens(unityLens, i);
+    }
+    m_unityLenses->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+}
+
+Lenses::~Lenses()
+{
+    delete m_unityLenses;
+}
+
+int Lenses::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_unityLenses->count();
+}
+
+QVariant Lenses::data(const QModelIndex& index, int role) const
+{
+    Q_UNUSED(role)
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    Lens* lens = m_lenses.at(index.row());
+
+    if (role == Lenses::RoleItem) {
+        return QVariant::fromValue(lens);
+    } else if (role == Lenses::RoleVisible) {
+        return QVariant::fromValue(lens->visible());
+    } else {
+        return QVariant();
+    }
+}
+
+QVariant Lenses::get(int row) const
+{
+    return data(QAbstractListModel::index(row), 0);
+}
+
+QVariant Lenses::get(const QString& lens_id) const
+{
+    Q_FOREACH(Lens* lens, m_lenses) {
+        if (lens->id() == lens_id) {
+            return QVariant::fromValue(lens);
+        }
+    }
+
+    return QVariant();
+}
+
+void Lenses::onLensAdded(unity::dash::Lens::Ptr& lens)
+{
+    int index = m_unityLenses->count()-1;
+    beginInsertRows(QModelIndex(), index, index);
+    addUnityLens(lens, index);
+    endInsertRows();
+}
+
+void Lenses::onLensPropertyChanged()
+{
+    QModelIndex lensIndex = index(m_lenses.indexOf(qobject_cast<Lens*>(sender())));
+    Q_EMIT dataChanged(lensIndex, lensIndex);
+}
+
+void Lenses::addUnityLens(unity::dash::Lens::Ptr unity_lens, int index)
+{
+    Lens* lens = new Lens();
+    lens->setUnityLens(unity_lens);
+    /* DOCME */
+    QObject::connect(lens, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
+    m_lenses.insert(index, lens);
+}
+
+void Lenses::removeUnityLens(int index)
+{
+    Lens* lens = m_lenses.takeAt(index);
+    delete lens;
+}
+
+#include "lenses.moc"

=== added file 'libunity-2d-private/src/lenses.h'
--- libunity-2d-private/src/lenses.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lenses.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LENSES_H
+#define LENSES_H
+
+// Qt
+#include <QAbstractListModel>
+#include <QList>
+
+// libunity-core
+#include <UnityCore/Lens.h>
+
+namespace unity
+{
+namespace dash
+{
+class Lenses;
+}
+}
+
+class Lens;
+
+class Lenses : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+    explicit Lenses(QObject *parent = 0);
+    ~Lenses();
+
+    enum Roles {
+        RoleItem,
+        RoleVisible
+    };
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+    Q_INVOKABLE QVariant get(int row) const;
+    Q_INVOKABLE QVariant get(const QString& lens_id) const;
+
+private Q_SLOTS:
+    void onLensAdded(unity::dash::Lens::Ptr& lens);
+    void onLensPropertyChanged();
+
+private:
+    unity::dash::Lenses* m_unityLenses;
+    QList<Lens*> m_lenses;
+
+    void addUnityLens(unity::dash::Lens::Ptr unity_lens, int index);
+    void removeUnityLens(int index);
+};
+
+#endif // LENSES_H

=== modified file 'libunity-2d-private/src/panelapplet.cpp'
--- libunity-2d-private/src/panelapplet.cpp	2011-08-17 09:21:18 +0000
+++ libunity-2d-private/src/panelapplet.cpp	2011-08-24 12:47:31 +0000
@@ -3,12 +3,30 @@
 namespace Unity2d
 {
 
-PanelApplet::PanelApplet(QWidget* parent) :
-    QWidget(parent)
-{
+class PanelAppletPrivate
+{
+    Unity2dPanel* m_panel;
+
+    PanelApplet* q_ptr;
+    Q_DECLARE_PUBLIC(PanelApplet)
+};
+
+PanelApplet::PanelApplet(Unity2dPanel* panel) :
+    QWidget(),
+    d_ptr(new PanelAppletPrivate)
+{
+    Q_D(PanelApplet);
+
+    d->m_panel = panel;
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
 }
 
+Unity2dPanel* PanelApplet::panel() const
+{
+    Q_D(const PanelApplet);
+    return d->m_panel;
+}
+
 } // namespace Unity2d
 
 #include "panelapplet.moc"

=== modified file 'libunity-2d-private/src/panelapplet.h'
--- libunity-2d-private/src/panelapplet.h	2011-08-16 12:58:45 +0000
+++ libunity-2d-private/src/panelapplet.h	2011-08-24 12:47:31 +0000
@@ -23,20 +23,28 @@
 #ifndef PANELAPPLET_H
 #define PANELAPPLET_H
 
+// Local
+class Unity2dPanel;
+
 // Qt
 #include <QWidget>
 
 namespace Unity2d
 {
 
+class PanelAppletPrivate;
 class PanelApplet : public QWidget
 {
     Q_OBJECT
 public:
-    explicit PanelApplet(QWidget* parent = 0);
+    explicit PanelApplet(Unity2dPanel* panel);
+
+    Unity2dPanel* panel() const;
 
 private:
     Q_DISABLE_COPY(PanelApplet)
+    PanelAppletPrivate* d_ptr;
+    Q_DECLARE_PRIVATE(PanelApplet)
 };
 
 } // namespace Unity2d

=== modified file 'libunity-2d-private/src/panelappletproviderinterface.h'
--- libunity-2d-private/src/panelappletproviderinterface.h	2011-08-16 12:58:45 +0000
+++ libunity-2d-private/src/panelappletproviderinterface.h	2011-08-24 12:47:31 +0000
@@ -31,7 +31,7 @@
 {
 public:
     virtual QString appletName() const = 0;
-    virtual PanelApplet* createApplet() const = 0;
+    virtual PanelApplet* createApplet(Unity2dPanel* panel) const = 0;
 };
 
 } // namespace Unity2d

=== added file 'libunity-2d-private/src/panelstyle.cpp'
--- libunity-2d-private/src/panelstyle.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelstyle.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,201 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include "panelstyle.h"
+
+// libunity-2d
+#include <cairoutils.h>
+#include <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
+
+// Qt
+#include <QApplication>
+#include <QPalette>
+#include <QStyle>
+
+// GTK
+#include <gtk/gtk.h>
+
+static const char* METACITY_THEME_DIR = "/usr/share/themes/%1/metacity-1";
+
+class PanelStylePrivate
+{
+public:
+    PanelStyle* q;
+    GObjectScopedPointer<GtkStyleContext> m_styleContext;
+    GConnector m_gConnector;
+
+    QString m_themeName;
+
+    static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
+    {
+        PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
+        priv->updatePalette();
+    }
+
+    void updatePalette()
+    {
+        gchar* themeName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-theme-name", &themeName, NULL);
+        m_themeName = QString::fromUtf8(themeName);
+        g_free(themeName);
+
+        GtkStyleContext* context = m_styleContext.data();
+        gtk_style_context_invalidate(context);
+
+        // Without this line, it seems the GtkStyleContext is not correctly
+        // initialized and we get some uninitialized pixels in the background
+        // brush.
+        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, NULL);
+
+        QPalette pal;
+        pal.setBrush(QPalette::Window, generateBackgroundBrush());
+        QApplication::setPalette(pal);
+    }
+
+    QBrush generateBackgroundBrush()
+    {
+        QImage image(100, 24, QImage::Format_ARGB32_Premultiplied); // FIXME: Hardcoded
+        image.fill(Qt::transparent);
+        CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
+        CairoUtils::Pointer cr(cairo_create(surface.data()));
+        gtk_render_background(m_styleContext.data(), cr.data(), 0, 0, image.width(), image.height());
+        return QBrush(image);
+    }
+
+    QPixmap windowButtonPixmapFromWMTheme(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+    {
+        QString dir = QString(METACITY_THEME_DIR).arg(m_themeName);
+
+        QString typeString, stateString;
+        switch (type) {
+        case PanelStyle::CloseWindowButton:
+            typeString = "close";
+            break;
+        case PanelStyle::MinimizeWindowButton:
+            typeString = "minimize";
+            break;
+        case PanelStyle::UnmaximizeWindowButton:
+            typeString = "unmaximize";
+            break;
+        }
+
+        switch (state) {
+        case PanelStyle::NormalState:
+            stateString = "";
+            break;
+        case PanelStyle::PrelightState:
+            stateString = "_focused_prelight";
+            break;
+        case PanelStyle::PressedState:
+            stateString = "_focused_pressed";
+            break;
+        }
+
+        QString path = QString("%1/%2%3.png")
+            .arg(dir)
+            .arg(typeString)
+            .arg(stateString);
+        return QPixmap(path);
+    }
+
+    QPixmap genericWindowButtonPixmap(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+    {
+        QStyle::StandardPixmap standardIcon;
+        switch (type) {
+        case PanelStyle::CloseWindowButton:
+            standardIcon = QStyle::SP_TitleBarCloseButton;
+            break;
+        case PanelStyle::MinimizeWindowButton:
+            standardIcon = QStyle::SP_TitleBarMinButton;
+            break;
+        case PanelStyle::UnmaximizeWindowButton:
+            standardIcon = QStyle::SP_TitleBarNormalButton;
+            break;
+        }
+
+        QIcon icon = QApplication::style()->standardIcon(standardIcon);
+        const int extent = 22;
+        switch (state) {
+        case PanelStyle::NormalState:
+            return icon.pixmap(extent);
+        case PanelStyle::PrelightState:
+            return icon.pixmap(extent, QIcon::Active);
+        case PanelStyle::PressedState:
+            return icon.pixmap(extent, QIcon::Active, QIcon::On);
+        }
+        // Silence compiler
+        return QPixmap();
+    }
+};
+
+PanelStyle::PanelStyle(QObject* parent)
+: d(new PanelStylePrivate)
+{
+    d->q = this;
+    d->m_styleContext.reset(gtk_style_context_new());
+
+    GtkWidgetPath* widgetPath = gtk_widget_path_new ();
+    gtk_widget_path_append_type(widgetPath, GTK_TYPE_WINDOW);
+    gtk_widget_path_iter_set_name(widgetPath, -1 , "UnityPanelWidget");
+
+    gtk_style_context_set_path(d->m_styleContext.data(), widgetPath);
+    gtk_style_context_add_class(d->m_styleContext.data(), "gnome-panel-menu-bar");
+    gtk_style_context_add_class(d->m_styleContext.data(), "unity-panel");
+
+    gtk_widget_path_free (widgetPath);
+
+    d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name",
+        G_CALLBACK(PanelStylePrivate::onThemeChanged), d);
+
+    d->updatePalette();
+}
+
+PanelStyle::~PanelStyle()
+{
+    delete d;
+}
+
+PanelStyle* PanelStyle::instance()
+{
+    static PanelStyle style;
+    return &style;
+}
+
+GtkStyleContext* PanelStyle::styleContext() const
+{
+    return d->m_styleContext.data();
+}
+
+QPixmap PanelStyle::windowButtonPixmap(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+{
+    // According to Unity PanelStyle code, the buttons of some WM themes do not
+    // match well with the panel background. So except for themes we provide,
+    // fallback to generic button pixmaps.
+    if (d->m_themeName == "Ambiance" || d->m_themeName == "Radiance") {
+        return d->windowButtonPixmapFromWMTheme(type, state);
+    } else {
+        return d->genericWindowButtonPixmap(type, state);
+    }
+}
+
+#include "panelstyle.moc"

=== added file 'libunity-2d-private/src/panelstyle.h'
--- libunity-2d-private/src/panelstyle.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelstyle.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,72 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef PANELSTYLE_H
+#define PANELSTYLE_H
+
+// Local
+
+// Qt
+#include <QObject>
+
+class QPixmap;
+
+struct _GtkStyleContext;
+
+class PanelStylePrivate;
+/**
+ * Provides easy access to panel style context and track platform theme to
+ * ensure we have the correct background brush.
+ *
+ * FIXME: This class does not have a very clear focus and has side-effects
+ * (background brush handling). It should be refactored.
+ */
+class PanelStyle : public QObject
+{
+    Q_OBJECT
+public:
+    PanelStyle(QObject* parent = 0);
+    ~PanelStyle();
+
+    enum WindowButtonType {
+        CloseWindowButton,
+        MinimizeWindowButton,
+        UnmaximizeWindowButton
+    };
+
+    enum WindowButtonState {
+        NormalState,
+        PrelightState,
+        PressedState
+    };
+
+    static PanelStyle* instance();
+
+    struct _GtkStyleContext* styleContext() const;
+
+    QPixmap windowButtonPixmap(WindowButtonType, WindowButtonState);
+
+private:
+    friend class PanelStylePrivate;
+    // Use a pimpl to avoid the need for gtk includes here
+    PanelStylePrivate* const d;
+};
+
+#endif /* PANELSTYLE_H */

=== modified file 'libunity-2d-private/src/placeentry.cpp'
--- libunity-2d-private/src/placeentry.cpp	2011-08-23 09:42:44 +0000
+++ libunity-2d-private/src/placeentry.cpp	2011-08-24 12:47:31 +0000
@@ -22,6 +22,7 @@
 #include "launchermenu.h"
 
 // libunity-2d
+#include <dashclient.h>
 #include <debug_p.h>
 
 // QtDee
@@ -30,9 +31,6 @@
 #include <QDBusMetaType>
 #include <QAction>
 #include <QDebug>
-#include <QDBusServiceWatcher>
-#include <QDBusConnectionInterface>
-#include <QDBusReply>
 
 // Marshall the RendererInfoStruct data into a D-Bus argument
 QDBusArgument &operator<<(QDBusArgument &argument, const RendererInfoStruct &r)
@@ -149,10 +147,6 @@
 static const char* UNITY_PLACE_ENTRY_INTERFACE = "com.canonical.Unity.PlaceEntry";
 static const char* SECTION_PROPERTY = "section";
 
-static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
-static const char* DASH_DBUS_PATH = "/Dash";
-static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
-
 PlaceEntry::PlaceEntry(QObject* parent) :
     LauncherItem(parent),
     m_position(0),
@@ -166,32 +160,15 @@
     m_entryResultsModel(NULL),
     m_globalGroupsModel(NULL),
     m_globalResultsModel(NULL),
-    m_dbusIface(NULL),
-    m_dashDbusIface(NULL),
-    m_dashActive(false)
+    m_dbusIface(NULL)
 {
     qDBusRegisterMetaType<RendererInfoStruct>();
     qDBusRegisterMetaType<PlaceEntryInfoStruct>();
     qDBusRegisterMetaType<QList<PlaceEntryInfoStruct> >();
     qDBusRegisterMetaType<QHash<QString, QString>>();
 
-    /* Check if the dash is already up and running by asking the bus instead of
-       trying to create an instance of the interface. Creating an instance would
-       cause D-Bus to activate the dash and we don’t want this to happen, the
-       dash should be started on demand only. */
-    QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
-    QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(DASH_DBUS_SERVICE);
-    if (reply.isValid() && reply.value()) {
-        connectToDash();
-    } else {
-        /* The dash is not running: monitor its registration on the bus so we
-           can connect to it when it comes up. */
-        QDBusServiceWatcher* watcher = new QDBusServiceWatcher(DASH_DBUS_SERVICE,
-                                                               QDBusConnection::sessionBus(),
-                                                               QDBusServiceWatcher::WatchForRegistration,
-                                                               this);
-        connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
-    }
+    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
+        SLOT(slotActivePageChanged(const QString&)));
 }
 
 PlaceEntry::PlaceEntry(const PlaceEntry& other) :
@@ -755,59 +732,12 @@
     Q_EMIT globalRendererHintsChanged();
 }
 
-void
-PlaceEntry::connectToDash()
-{
-    if (m_dashDbusIface != NULL) {
-        return;
-    }
-
-    m_dashDbusIface = new QDBusInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE,
-                                         QDBusConnection::sessionBus(), this);
-    connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
-            SLOT(slotDashActiveChanged(bool)));
-    connect(m_dashDbusIface, SIGNAL(activePlaceEntryChanged(const QString&)),
-            SLOT(slotDashActivePlaceEntryChanged(const QString&)));
-
-    QVariant value = m_dashDbusIface->property("active");
-    if (value.isValid()) {
-        m_dashActive = value.toBool();
-    } else {
-        UQ_WARNING << "Fetching Dash.active property failed";
-    }
-    value = m_dashDbusIface->property("activePlaceEntry");
-    if (value.isValid()) {
-        m_dashActivePlaceEntry = value.toString();
-    } else {
-        UQ_WARNING << "Fetching Dash.activePlaceEntry property failed";
-    }
-
-    updateActiveState();
-}
-
-void
-PlaceEntry::slotDashActiveChanged(bool value)
-{
-    if (m_dashActive != value) {
-        m_dashActive = value;
-        updateActiveState();
-    }
-}
-
-void
-PlaceEntry::slotDashActivePlaceEntryChanged(const QString& entry)
-{
-    if (m_dashActivePlaceEntry != entry) {
-        m_dashActivePlaceEntry = entry;
-        updateActiveState();
-    }
-}
-
-void
-PlaceEntry::updateActiveState()
+
+void
+PlaceEntry::slotActivePageChanged(const QString& page)
 {
     bool active = false;
-    if (m_dashActive && !m_dbusObjectPath.isEmpty() && (m_dashActivePlaceEntry == m_dbusObjectPath)) {
+    if (!m_dbusObjectPath.isEmpty() && page == m_dbusObjectPath) {
         active = true;
     }
 
@@ -830,8 +760,12 @@
         startRemotePlaceOnDemand();
     }
 
-    QDBusInterface iface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    iface.asyncCall(QLatin1String("activatePlaceEntry"), m_fileName, m_groupName, section);
+    if (m_active) {
+        DashClient::instance()->setActivePage(QString());
+    } else {
+        /* FIXME: DashClient::setActivePage has changed but PlaceEntry is deprecated anyway */
+        //DashClient::instance()->setActivePage(m_dbusObjectPath, m_fileName, m_groupName, section);
+    }
 }
 
 void

=== modified file 'libunity-2d-private/src/placeentry.h'
--- libunity-2d-private/src/placeentry.h	2011-08-23 09:42:44 +0000
+++ libunity-2d-private/src/placeentry.h	2011-08-24 12:47:31 +0000
@@ -262,9 +262,6 @@
     QMap<QString, QVariant> m_globalRendererHints;
 
     QDBusInterface* m_dbusIface;
-    QDBusInterface* m_dashDbusIface;
-    bool m_dashActive;
-    QString m_dashActivePlaceEntry;
 
     void setSection(const QString&);
     void activateEntry(const int section);
@@ -274,15 +271,12 @@
 private Q_SLOTS:
     void onRendererInfoChanged(const RendererInfoStruct&);
 
-    void connectToDash();
-    void updateActiveState();
-    void slotDashActiveChanged(bool);
-    void slotDashActivePlaceEntryChanged(const QString&);
-
     void startMonitoringSections();
     void stopMonitoringSections();
     void slotSectionsChanged();
 
+    void slotActivePageChanged(const QString& page);
+
     /* Contextual menu callbacks */
     void onSectionTriggered();
 };

=== added file 'libunity-2d-private/src/ratingsfilter.cpp'
--- libunity-2d-private/src/ratingsfilter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/ratingsfilter.cpp	2011-08-24 12:47:31 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "ratingsfilter.h"
+
+RatingsFilter::RatingsFilter(QObject *parent) :
+    Filter(parent)
+{
+}
+
+float RatingsFilter::rating() const
+{
+    return m_unityRatingsFilter->rating();
+}
+
+void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    if (m_unityFilter != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+    }
+
+    Filter::setUnityFilter(filter);
+    m_unityRatingsFilter = std::dynamic_pointer_cast<unity::dash::RatingsFilter>(m_unityFilter);
+
+    /* Property change signals */
+    m_unityRatingsFilter->rating.changed.connect(sigc::mem_fun(this, &RatingsFilter::ratingChanged));
+}
+
+#include "ratingsfilter.moc"

=== added file 'libunity-2d-private/src/ratingsfilter.h'
--- libunity-2d-private/src/ratingsfilter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/ratingsfilter.h	2011-08-24 12:47:31 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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; version 3.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RATINGSFILTER_H
+#define RATINGSFILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/RatingsFilter.h>
+
+// Local
+#include "filter.h"
+
+class RatingsFilter : public Filter
+{
+    Q_OBJECT
+
+    Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)
+
+public:
+    explicit RatingsFilter(QObject *parent = 0);
+
+    /* getters */
+    float rating() const;
+
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+Q_SIGNALS:
+    void ratingChanged(float);
+
+private:
+    unity::dash::RatingsFilter::Ptr m_unityRatingsFilter;
+};
+
+Q_DECLARE_METATYPE(RatingsFilter*)
+
+#endif // RATINGSFILTER_H

=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2011-08-24 12:47:31 +0000
@@ -1,7 +1,5 @@
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include "bamf-matcher.h"
@@ -16,7 +14,8 @@
 #include <QDesktopWidget>
 
 ScreenInfo::ScreenInfo(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_activeWindow(0)
 {
     WnckScreen *screen = wnck_screen_get_default();
     g_signal_connect(G_OBJECT(screen), "active-window-changed",

=== modified file 'libunity-2d-private/src/unity-2d-private.pc.cmake'
--- libunity-2d-private/src/unity-2d-private.pc.cmake	2011-08-05 10:52:31 +0000
+++ libunity-2d-private/src/unity-2d-private.pc.cmake	2011-08-24 12:47:31 +0000
@@ -9,4 +9,4 @@
 Version: @VERSION@
 Libs: -L@LIBDIR@ -lunity-2d-private
 Cflags: -I@INCLUDEDIR@/unity-2d-private
-Requires: glib-2.0, gtk+-2.0, libwnck-1.0
+Requires: glib-2.0, gtk+-3.0, libwnck-3.0, pango

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 11:42:46 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-08-24 12:47:31 +0000
@@ -25,14 +25,62 @@
 
 // libunity-2d
 #include <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
 #include <unity2ddebug.h>
 
 // Qt
+#include <QFont>
 #include <QWindowsStyle>
+#include <QAccessible>
+#include <QAccessibleWidget>
+#include <QWidget>
 
 // GTK
 #include <gtk/gtk.h>
-
+#include <pango/pango.h>
+
+///////////////////////////////
+class PlatformFontTracker
+{
+public:
+    PlatformFontTracker()
+    {
+        m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
+            G_CALLBACK(PlatformFontTracker::onFontChanged), this);
+
+        updateFont();
+    }
+
+private:
+    void updateFont()
+    {
+        gchar* fontName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontName, NULL);
+        GScopedPointer<PangoFontDescription, pango_font_description_free> fontDescription(
+            pango_font_description_from_string(fontName)
+            );
+        g_free(fontName);
+
+        int size = pango_font_description_get_size(fontDescription.data());
+
+        QFont font = QFont(
+            pango_font_description_get_family(fontDescription.data()),
+            size / PANGO_SCALE
+            );
+
+        QApplication::setFont(font);
+    }
+
+    static void onFontChanged(GObject*, GParamSpec*, PlatformFontTracker* obj)
+    {
+        obj->updateFont();
+    }
+
+    GConnector m_gConnector;
+};
+
+///////////////////////////////
 AbstractX11EventFilter::~AbstractX11EventFilter()
 {
     Unity2dApplication* application = Unity2dApplication::instance();
@@ -41,6 +89,28 @@
     }
 }
 
+///////////////////////////////
+static bool arrayContains(char** begin, char** end, const char* string)
+{
+    for (char** ptr = begin; ptr != end; ++ptr) {
+        if (strcmp(*ptr, string) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+QAccessibleInterface *panelFactory(const QString &classname, QObject *object)
+{
+    QAccessibleInterface *interface = 0;
+
+    if (classname == "Unity2dPanel" && object && object->isWidgetType()) {
+        interface = new QAccessibleWidget(static_cast<QWidget *>(object), QAccessible::ToolBar);
+    }
+
+    return interface;
+}
+
 void Unity2dApplication::earlySetup(int& argc, char** argv)
 {
     // Parts of unity-2d uses GTK so it needs to be initialized
@@ -61,10 +131,19 @@
     if(getenv("QT_GRAPHICSSYSTEM") == 0) {
         QApplication::setGraphicsSystem("raster");
     }
+
+    /* Unless style has been specified in args, set default Qt style to
+     * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle
+     * because it uses libgtk2, which causes conflicts with our gtk3 code.
+     */
+    if (!arrayContains(argv, argv + argc, "-style")) {
+        QApplication::setStyle(new QWindowsStyle);
+    }
 }
 
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
+, m_platformFontTracker(new PlatformFontTracker)
 {
     /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
        where to look for Unity 2D's schemas.
@@ -73,11 +152,14 @@
     if (!isRunningInstalled()) {
         qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
     }
+
+    QAccessible::installFactory(panelFactory);
 }
 
 Unity2dApplication::~Unity2dApplication()
 {
     qDeleteAll(m_x11EventFilters);
+    delete m_platformFontTracker;
 }
 
 Unity2dApplication* Unity2dApplication::instance()

=== modified file 'libunity-2d-private/src/unity2dapplication.h'
--- libunity-2d-private/src/unity2dapplication.h	2011-07-18 13:47:29 +0000
+++ libunity-2d-private/src/unity2dapplication.h	2011-08-24 12:47:31 +0000
@@ -27,6 +27,8 @@
 
 class Unity2dApplication;
 
+class PlatformFontTracker;
+
 class AbstractX11EventFilter
 {
 public:
@@ -65,6 +67,7 @@
 
 private:
     QList<AbstractX11EventFilter*> m_x11EventFilters;
+    PlatformFontTracker* m_platformFontTracker;
 };
 
 #endif // UNITY2DAPPLICATION_H

=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2011-06-07 13:46:38 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2011-08-24 12:47:31 +0000
@@ -22,6 +22,7 @@
 // Self
 #include "unity2dpanel.h"
 #include <debug_p.h>
+#include <indicatorsmanager.h>
 
 // Qt
 #include <QApplication>
@@ -41,6 +42,7 @@
 {
     Unity2dPanel* q;
     Unity2dPanel::Edge m_edge;
+    mutable IndicatorsManager* m_indicatorsManager;
     QHBoxLayout* m_layout;
     QPropertyAnimation* m_slideInAnimation;
     QPropertyAnimation* m_slideOutAnimation;
@@ -137,6 +139,7 @@
 {
     d->q = this;
     d->m_edge = Unity2dPanel::TopEdge;
+    d->m_indicatorsManager = 0;
     d->m_useStrut = true;
     d->m_delta = 0;
     d->m_manualSliding = false;
@@ -189,6 +192,15 @@
     return d->m_edge;
 }
 
+IndicatorsManager* Unity2dPanel::indicatorsManager() const
+{
+    if (d->m_indicatorsManager == 0)
+        d->m_indicatorsManager =
+            new IndicatorsManager(const_cast<Unity2dPanel*>(this));
+
+    return d->m_indicatorsManager;
+}
+
 void Unity2dPanel::showEvent(QShowEvent* event)
 {
     QWidget::showEvent(event);

=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2011-06-06 17:24:29 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2011-08-24 12:47:31 +0000
@@ -23,6 +23,7 @@
 #define UNITY2DPANEL_H
 
 // Local
+class IndicatorsManager;
 
 // Qt
 #include <QWidget>
@@ -60,6 +61,8 @@
 
     void addSpacer();
 
+    IndicatorsManager* indicatorsManager() const;
+
     /**
      * Whether the panel should reserve space on the edge, preventing maximized
      * windows to overlap it.

=== modified file 'libunity-2d-private/src/windowinfo.cpp'
--- libunity-2d-private/src/windowinfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/windowinfo.cpp	2011-08-24 12:47:31 +0000
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 
 #include <glib-2.0/glib.h>
 

=== modified file 'libunity-2d-private/src/workspacesinfo.cpp'
--- libunity-2d-private/src/workspacesinfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/workspacesinfo.cpp	2011-08-24 12:47:31 +0000
@@ -4,9 +4,7 @@
 #include <debug_p.h>
 
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include <QAbstractEventDispatcher>
@@ -23,7 +21,13 @@
 Atom _NET_CURRENT_DESKTOP;
 
 WorkspacesInfo::WorkspacesInfo(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_count(0),
+    m_current(0),
+    m_rows(0),
+    m_columns(0),
+    m_orientation(OrientationHorizontal),
+    m_startingCorner(CornerTopLeft)
 {
     WorkspacesInfo::internX11Atoms();
 

=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-08-12 15:06:01 +0000
+++ panel/CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -1,5 +1,8 @@
 project(unity-2d-panel)
 
+# Dependencies
+pkg_check_modules(UNITYCORE REQUIRED unity-core-4.0)
+
 # Source
 include_directories(
     ${libunity-2d-private_SOURCE_DIR}/src
@@ -8,8 +11,3 @@
 add_subdirectory(applets)
 add_subdirectory(app)
 add_subdirectory(tests)
-
-# Install
-install(DIRECTORY artwork
-    DESTINATION ${UNITY_2D_DIR}/panel
-    )

=== modified file 'panel/app/CMakeLists.txt'
--- panel/app/CMakeLists.txt	2011-08-11 15:52:38 +0000
+++ panel/app/CMakeLists.txt	2011-08-24 12:47:31 +0000
@@ -3,7 +3,6 @@
 set(panel_SRCS
     main.cpp
     panelmanager.cpp
-    unity2dstyle.cpp
     )
 
 qt4_automoc(${panel_SRCS})
@@ -12,6 +11,8 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GTK_INCLUDE_DIRS}
+    ${UNITYCORE_INCLUDE_DIRS}
     ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
@@ -19,6 +20,7 @@
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
+    ${GTK_LDFLAGS}
     ${DCONFQT_LIBRARIES}
     unity-2d-private
     )

=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-07-18 13:47:29 +0000
+++ panel/app/main.cpp	2011-08-24 12:47:31 +0000
@@ -22,12 +22,12 @@
 // Local
 #include <config.h>
 #include <panelmanager.h>
+#include <panelstyle.h>
 
 // Unity
 #include <gnomesessionclient.h>
 #include <unity2ddebug.h>
 #include <unity2dapplication.h>
-#include <unity2dstyle.h>
 #include <unity2dtr.h>
 
 // Qt
@@ -54,7 +54,10 @@
     ThemeEngineHandler handler;
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
-    QApplication::setStyle(new Unity2dStyle);
+    app.setApplicationName("Unity 2D Panel");
+
+    // Instantiate a PanelStyle so that it configures QApplication
+    PanelStyle::instance();
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-panel.desktop");
     client.connectToSessionManager();

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-08-19 10:42:32 +0000
+++ panel/app/panelmanager.cpp	2011-08-24 12:47:31 +0000
@@ -24,6 +24,8 @@
 
 // Local
 #include <config.h>
+#include <panelstyle.h>
+#include <indicatorsmanager.h>
 
 // Unity
 #include <unity2dpanel.h>
@@ -49,21 +51,6 @@
 static const char* PANEL_DCONF_PROPERTY_APPLETS = "applets";
 static const char* PANEL_PLUGINS_DEV_DIR_ENV = "UNITY2D_PANEL_PLUGINS_PATH";
 
-static QPalette getPalette()
-{
-    QPalette palette;
-
-    /* Should use the panel's background provided by Unity but it turns
-       out not to be good. It would look like:
-
-         QBrush bg(QPixmap("theme:/panel_background.png"));
-    */
-    QBrush bg(QPixmap(unity2dDirectory() + "/panel/artwork/background.png"));
-    palette.setBrush(QPalette::Window, bg);
-    palette.setBrush(QPalette::Button, bg);
-    return palette;
-}
-
 static QHash<QString, PanelAppletProviderInterface*> loadPlugins()
 {
     QHash<QString, PanelAppletProviderInterface*> plugins;
@@ -130,11 +117,29 @@
     return appletsConfig.toStringList();
 }
 
-static Unity2dPanel* instantiatePanel(int screen)
+PanelManager::PanelManager(QObject* parent)
+: QObject(parent)
+{
+    QDesktopWidget* desktop = QApplication::desktop();
+    for(int i = 0; i < desktop->screenCount(); ++i) {
+        Unity2dPanel* panel = instantiatePanel(i);
+        m_panels.append(panel);
+        panel->show();
+        panel->move(desktop->screenGeometry(i).topLeft());
+    }
+    connect(desktop, SIGNAL(screenCountChanged(int)), SLOT(onScreenCountChanged(int)));
+}
+
+PanelManager::~PanelManager()
+{
+    qDeleteAll(m_panels);
+}
+
+Unity2dPanel* PanelManager::instantiatePanel(int screen)
 {
     Unity2dPanel* panel = new Unity2dPanel;
+    panel->setAccessibleName("Top Panel");
     panel->setEdge(Unity2dPanel::TopEdge);
-    panel->setPalette(getPalette());
     panel->setFixedHeight(24);
 
     int leftmost = QApplication::desktop()->screenNumber(QPoint());
@@ -156,7 +161,7 @@
                        << "installed plugin providing it.";
         } else {
             if (screen == leftmost || !onlyLeftmost) {
-                QWidget *applet = provider->createApplet();
+                QWidget *applet = provider->createApplet(panel);
                 if (applet == 0) {
                     qWarning() << "The panel applet plugin for" << appletName
                                << "did not return a valid plugin.";
@@ -170,24 +175,6 @@
     return panel;
 }
 
-PanelManager::PanelManager(QObject* parent)
-    : QObject(parent)
-{
-    QDesktopWidget* desktop = QApplication::desktop();
-    for(int i = 0; i < desktop->screenCount(); ++i) {
-        Unity2dPanel* panel = instantiatePanel(i);
-        m_panels.append(panel);
-        panel->show();
-        panel->move(desktop->screenGeometry(i).topLeft());
-    }
-    connect(desktop, SIGNAL(screenCountChanged(int)), SLOT(onScreenCountChanged(int)));
-}
-
-PanelManager::~PanelManager()
-{
-    qDeleteAll(m_panels);
-}
-
 void
 PanelManager::onScreenCountChanged(int newCount)
 {

=== modified file 'panel/app/panelmanager.h'
--- panel/app/panelmanager.h	2011-04-04 16:41:15 +0000
+++ panel/app/panelmanager.h	2011-08-24 12:47:31 +0000
@@ -40,6 +40,8 @@
     Q_DISABLE_COPY(PanelManager)
     QList<Unity2dPanel*> m_panels;
 
+    Unity2dPanel* instantiatePanel(int screen);
+
 private Q_SLOTS:
     void onScreenCountChanged(int newCount);
 };

=== removed file 'panel/app/unity2dstyle.cpp'
--- panel/app/unity2dstyle.cpp	2011-03-28 12:16:02 +0000
+++ panel/app/unity2dstyle.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/*
- * Plasma applet to display DBus global menu
- *
- * Copyright 2009 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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; version 3.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-// Self
-#include "unity2dstyle.h"
-
-// Local
-
-// libunity-2d-private
-#include <debug_p.h>
-#include <keyboardmodifiersmonitor.h>
-
-// Qt
-#include <QGtkStyle>
-#include <QMenu>
-#include <QPainter>
-#include <QStyleOptionFrame>
-#include <QWidget>
-
-Unity2dStyle::Unity2dStyle()
-: QProxyStyle(new QGtkStyle)
-{
-}
-
-void Unity2dStyle::drawControl(QStyle::ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget) const
-{
-    if (element == QStyle::CE_MenuBarItem && widget) {
-        QStyleOptionMenuItem opt = *qstyleoption_cast<const QStyleOptionMenuItem*>(option);
-        if (!(opt.state & QStyle::State_Enabled) && (opt.state & QStyle::State_Sunken)) {
-            // Reset State_Sunken flag to avoid drawing a frame on a disabled menu item
-            // See https://bugs.launchpad.net/unity-2d/+bug/717744
-            opt.state ^= QStyle::State_Sunken;
-        }
-        // Skip "widget" parameter to avoid solid gray background behind the menubar items
-        QProxyStyle::drawControl(element, &opt, painter, 0);
-    } else if (element == QStyle::CE_MenuBarEmptyArea) {
-        // Avoid gray borders around the menubar items
-    } else {
-        QProxyStyle::drawControl(element, option, painter, widget);
-    }
-}
-
-int Unity2dStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option, const QWidget* widget) const
-{
-    if (metric == QStyle::PM_MenuBarVMargin) {
-        // Avoid one-pixel gap above menuitem
-        return 0;
-    } else {
-        return QProxyStyle::pixelMetric(metric, option, widget);
-    }
-}
-
-QSize Unity2dStyle::sizeFromContents(QStyle::ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget) const
-{
-    QSize size = QProxyStyle::sizeFromContents(type, option, contentsSize, widget);
-    if (type == QStyle::CT_MenuBarItem && widget) {
-        // Avoid three-pixel gap below menuitem
-        size.setHeight(widget->height());
-    }
-    return size;
-}
-
-int Unity2dStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWidget* widget, QStyleHintReturn* returnData) const
-{
-    if (hint == QStyle::SH_UnderlineShortcut) {
-        // The shortcut of an opened menu can be triggered without holding Alt
-        // down, so we always show the underline. For all other widgets we only
-        // show the underlines if alt is down.
-        // Note that this is a bit hackish: it only works reliably if the
-        // widget repaints itself when alt is pressed or released. For now only
-        // the MenuBarWidget from the AppNameApplets does this.
-        if (qobject_cast<const QMenu*>(widget)) {
-            return true;
-        } else {
-            return KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier;
-        }
-    } else {
-        return QProxyStyle::styleHint(hint, option, widget, returnData);
-    }
-}

=== removed file 'panel/app/unity2dstyle.h'
--- panel/app/unity2dstyle.h	2011-01-26 15:50:26 +0000
+++ panel/app/unity2dstyle.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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; version 3.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#ifndef UNITY2DSTYLE_H
-#define UNITY2DSTYLE_H
-
-// Local
-
-// Qt
-#include <QProxyStyle>
-
-class Unity2dStyle : public QProxyStyle
-{
-public:
-    Unity2dStyle();
-
-    virtual void drawControl(ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget = 0) const;
-
-    virtual int pixelMetric(PixelMetric metric, const QStyleOption* option = 0, const QWidget* widget = 0) const;
-
-    virtual QSize sizeFromContents(ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget = 0) const;
-
-    virtual int styleHint(StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const;
-};