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

[Florian Boucault]

[dash] Use a blurred background even when no compositor is available.

Unmerged revisions

641. By Florian Boucault on 2011-08-09

[dash] Use a blurred background even when no compositor is available.

640. By Florian Boucault on 2011-08-09

Merged from lp:unity-2d

639. By Didier Roche-Tolomelli on 2011-08-09

Enable storing subdir (like kde4/) in the gsettings schema.
For instance /usr/share/applications/kde4/konversation.desktop should be stored
as kde4-konversation.desktop.

This is valid for all .desktop file in XDG_DATA_DIR/applications.
Note that full path and relative path are still supported

638. By Felix H. Dahlke on 2011-08-09

[launcher] Added a "safely remove" option for USB sticks.

637. By Aurélien Gâteau on 2011-08-08

[panel] Use the window button pixmaps from the active window manager instead of using the hardcoded Ambiance theme.

It also provides a fallback in case the theme is not Ambiance or Radiance.

636. By Aurélien Gâteau on 2011-08-08

[panel] Add support for GIcon-based icons in indicators, using code from IconImageProvider

Brings back icons for power indicator.

635. By Felix H. Dahlke on 2011-08-03

[launcher] Changed quicklist item "Keep In Launcher" to "Keep in launcher" as well as "Remove From Launcher" to "Remove from launcher" per design

634. By Aurélien Gâteau on 2011-08-03

[panel] Fix build with Unity trunk -r1325

Indicators::on_menu_pointer_moved() signal has been removed. The code now
implements mouse polling to implement mouse scrubbing. This is more efficient
than waiting for unity-panel-service to ask for menus to show.

633. By Didier Roche-Tolomelli on 2011-08-02

releasing version 3.8.14.1-0ubuntu1

632. By Didier Roche-Tolomelli on 2011-08-02

* Few upstream fixes:
  - unity-2d-places crashed with SIGSEGV in
    QDeclarativePropertyPrivate::initProperty() (LP: #817896)
  - update resets unity launcher favorites (LP: #817954)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-27 09:42:32 +0000
+++ CMakeLists.txt	2011-08-09 17:30:25 +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/unity-2d.convert'
--- data/unity-2d.convert	2011-07-25 11:56:59 +0000
+++ data/unity-2d.convert	2011-08-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +0000
@@ -1,20 +1,33 @@
-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 (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 +45,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 +87,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 +130,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 +187,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 +245,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-09 17:30:25 +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.6.0),
+               libnux-1.0-dev (>= 1.0.8),
+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
@@ -90,7 +94,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-09 17:30:25 +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-09 17:30:25 +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-01-14 21:41:39 +0000
+++ debian/unity-2d-panel.install	2011-08-09 17:30:25 +0000
@@ -1,4 +1,2 @@
 usr/bin/unity-2d-panel
 usr/share/applications/unity-2d-panel.desktop
-usr/share/unity-2d/panel/artwork/background.png
-usr/share/unity-2d/panel/artwork/divider.png

=== 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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-07-14 11:17:30 +0000
+++ launcher/LauncherItem.qml	2011-08-09 17:30:25 +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-01 11:58:35 +0000
+++ launcher/LauncherList.qml	2011-08-09 17:30:25 +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-09 17:30:25 +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 'libunity-2d-private/CMakeLists.txt'
--- libunity-2d-private/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/CMakeLists.txt	2011-08-09 17:30:25 +0000
@@ -6,7 +6,7 @@
 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)
 
 set(libunity-2d-private_SOVERSION 0)

=== 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-09 17:30:25 +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-07-26 16:05:51 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-08-09 17:30:25 +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"

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-09 17:30:25 +0000
@@ -2,7 +2,9 @@
 
 # Sources
 set(lib${LIB_NAME}_SRCS
+    debug.cpp
     gconnector.cpp
+    gimageutils.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
     hotkeymonitor.cpp
@@ -64,6 +66,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}
@@ -93,6 +97,8 @@
     ${QT_QTNETWORK_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
+    ${GTK_LDFLAGS}
+    ${PANGO_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${GDK_LDFLAGS}
     ${GIO_LDFLAGS}

=== 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-09 17:30:25 +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-09 17:30:25 +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/gimageutils.cpp'
--- libunity-2d-private/src/gimageutils.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gimageutils.cpp	2011-08-09 17:30:25 +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-09 17:30:25 +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-07-29 13:49:34 +0000
+++ libunity-2d-private/src/iconimageprovider.cpp	2011-08-09 17:30:25 +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;
 }

=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
--- libunity-2d-private/src/launcherapplication.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherapplication.cpp	2011-08-09 17:30:25 +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>
 }
 
@@ -649,7 +646,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);
@@ -880,7 +878,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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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. */

=== 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-09 17:30:25 +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"

=== 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-09 17:30:25 +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-09 17:30:25 +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-09 17:30:25 +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/windowinfo.cpp'
--- libunity-2d-private/src/windowinfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/windowinfo.cpp	2011-08-09 17:30:25 +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-09 17:30:25 +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>

=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-06-27 13:40:51 +0000
+++ panel/CMakeLists.txt	2011-08-09 17:30:25 +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-04-04 16:41:15 +0000
+++ panel/app/CMakeLists.txt	2011-08-09 17:30:25 +0000
@@ -1,7 +1,6 @@
 set(panel_SRCS
     main.cpp
     panelmanager.cpp
-    unity2dstyle.cpp
     )
 
 qt4_automoc(${panel_SRCS})
@@ -10,14 +9,17 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GTK_INCLUDE_DIRS}
     ${uqapplets_SOURCE_DIR}
     ${uqapplets_SOURCE_DIR}/common
+    ${UNITYCORE_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
+    ${GTK_LDFLAGS}
     uqapplets
     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-09 17:30:25 +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-06-12 23:01:35 +0000
+++ panel/app/panelmanager.cpp	2011-08-09 17:30:25 +0000
@@ -24,6 +24,8 @@
 
 // Local
 #include <config.h>
+#include <panelstyle.h>
+#include <indicatorsmanager.h>
 
 // Applets
 #include <appindicator/appindicatorapplet.h>
@@ -42,70 +44,56 @@
 
 using namespace Unity2d;
 
-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 QLabel* createSeparator()
-{
-    QLabel* label = new QLabel;
-    QPixmap pix(unity2dDirectory() + "/panel/artwork/divider.png");
-    label->setPixmap(pix);
-    label->setFixedSize(pix.size());
-    return label;
-}
-
-static Unity2dPanel* instantiatePanel(int screen)
+static QWidget* createSeparator()
+{
+    // Just a quick-hack: homebutton is going away anyway
+    QWidget* widget = new QWidget;
+    widget->setFixedWidth(6);
+    return widget;
+}
+
+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);
 
+    IndicatorsManager* indicatorsManager = new IndicatorsManager(panel);
+
     int leftmost = QApplication::desktop()->screenNumber(QPoint());
     if (screen == leftmost) {
         panel->addWidget(new HomeButtonApplet);
         panel->addWidget(createSeparator());
     }
-    panel->addWidget(new AppNameApplet);
+    panel->addWidget(new AppNameApplet(indicatorsManager));
     if (screen == leftmost) {
         /* It doesn’t make sense to have more than one instance of the systray,
            XEmbed’ed windows can be displayed only once anyway. */
         panel->addWidget(new LegacyTrayApplet);
     }
-    panel->addWidget(new IndicatorApplet);
+    panel->addWidget(new IndicatorApplet(indicatorsManager));
     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-09 17:30:25 +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;
-};
-
-#endif /* UNITY2DSTYLE_H */

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-18 10:33:35 +0000
+++ panel/applets/CMakeLists.txt	2011-08-09 17:30:25 +0000
@@ -1,42 +1,28 @@
 project(uqapplets)
 
-macro(read_pkg_variable cmake_var pkg pkg_var)
-    execute_process(
-        COMMAND pkg-config --variable=${pkg_var} ${pkg}
-        OUTPUT_VARIABLE tmp
-        )
-    # Remove trailing newline from ${tmp}
-    string(STRIP "${tmp}" ${cmake_var})
-endmacro(read_pkg_variable)
-
 # Dependencies
 include(FindPkgConfig)
 
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(INDICATOR REQUIRED indicator)
-
-# Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
-configure_file(indicator-config.h.in indicator-config.h)
 
 # Sources
 set(uqapplets_SRCS
     appindicator/appindicatorapplet.cpp
     appindicator/sniitem.cpp
     appname/appnameapplet.cpp
+    appname/croppedlabel.cpp
     appname/menubarwidget.cpp
-    appname/registrar.cpp
     appname/windowhelper.cpp
     common/applet.cpp
+    common/indicatorentrywidget.cpp
+    common/indicatorsmanager.cpp
+    common/indicatorwidget.cpp
+    common/cairoutils.cpp
+    common/panelstyle.cpp
     homebutton/homebuttonapplet.cpp
     homebutton/homebutton.cpp
-    indicator/abstractindicator.cpp
-    indicator/datetimeindicator.cpp
     indicator/indicatorapplet.cpp
-    indicator/indicatorservicemanager.cpp
-    indicator/indicator.c
     legacytray/legacytrayapplet.cpp
     legacytray/fdoselectionmanager.cpp
     legacytray/fdotask.cpp
@@ -45,10 +31,6 @@
     legacytray/x11embedpainter.cpp
     )
 
-qt4_add_dbus_adaptor(uqapplets_SRCS appname/com.canonical.AppMenu.Registrar.xml
-    registrar.h Registrar
-    )
-
 qt4_automoc(${uqapplets_SRCS})
 
 # Build
@@ -58,13 +40,17 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/homebutton
     ${CMAKE_CURRENT_SOURCE_DIR}/indicator
+    ${CMAKE_CURRENT_SOURCE_DIR}/unitycore
     ${QTBAMF_INCLUDE_DIRS}
+    ${QTGCONF_INCLUDE_DIRS}
     ${DBUSMENUQT_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
-    ${INDICATOR_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${X11_INCLUDE_DIR}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -75,13 +61,16 @@
     ${QT_QTCORE_LIBRARIES}
     ${DBUSMENUQT_LDFLAGS}
     ${QTBAMF_LDFLAGS}
+    ${QTGCONF_LDFLAGS}
     ${GTK_LDFLAGS}
-    ${INDICATOR_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${X11_LIBRARIES}
     ${X11_Xrender_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xfixes_LIB}
+    ${UNITYCORE_LDFLAGS}
+    ${NUXCORE_LDFLAGS}
+    ${PANGO_LDFLAGS}
     unity-2d-private
     )

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-08-09 17:30:25 +0000
@@ -23,7 +23,9 @@
 #include "appnameapplet.h"
 
 // Local
+#include "croppedlabel.h"
 #include "menubarwidget.h"
+#include "panelstyle.h"
 #include "windowhelper.h"
 
 // Unity-2d
@@ -45,13 +47,9 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-static const char* METACITY_DIR = "/usr/share/themes/Ambiance/metacity-1";
-
 static const int WINDOW_BUTTONS_RIGHT_MARGIN = 4;
 
-static const int APPNAME_LABEL_LEFT_MARGIN = 12;
-
-static const int FADEOUT_WIDTH = 16;
+static const int APPNAME_LABEL_LEFT_MARGIN = 6;
 
 namespace Unity2d
 {
@@ -59,13 +57,11 @@
 class WindowButton : public QAbstractButton
 {
 public:
-    WindowButton(const QString& prefix, QWidget* parent = 0)
+    WindowButton(const PanelStyle::WindowButtonType& buttonType, QWidget* parent = 0)
     : QAbstractButton(parent)
-    , m_prefix(prefix)
-    , m_normalPix(loadPix("normal"))
-    , m_hoverPix(loadPix("prelight"))
-    , m_downPix(loadPix("pressed"))
+    , m_buttonType(buttonType)
     {
+        loadPixmaps();
         setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
         setAttribute(Qt::WA_Hover);
     }
@@ -76,6 +72,14 @@
     }
 
 protected:
+    bool event(QEvent* ev)
+    {
+        if (ev->type() == QEvent::PaletteChange) {
+            loadPixmaps();
+        }
+        return QAbstractButton::event(ev);
+    }
+
     void paintEvent(QPaintEvent*)
     {
         QPainter painter(this);
@@ -91,62 +95,17 @@
     }
 
 private:
-    QString m_prefix;
+    PanelStyle::WindowButtonType m_buttonType;
     QPixmap m_normalPix;
     QPixmap m_hoverPix;
     QPixmap m_downPix;
 
-    QPixmap loadPix(const QString& name)
-    {
-        QString path = QString("%1/%2_focused_%3.png")
-            .arg(METACITY_DIR)
-            .arg(m_prefix)
-            .arg(name);
-        return QPixmap(path);
-    }
-};
-
-/**
- * This label makes sure minimumSizeHint() is not set. This ensures the applet
- * does not get wider if a window title is very long
- */
-class CroppedLabel : public QLabel
-{
-public:
-    CroppedLabel(QWidget* parent = 0)
-    : QLabel(parent)
-    {}
-
-    QSize minimumSizeHint() const
-    {
-        return QWidget::minimumSizeHint();
-    }
-
-protected:
-    void paintEvent(QPaintEvent* event)
-    {
-        QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
-        {
-            QPainter painter(&image);
-            painter.initFrom(this);
-            painter.setCompositionMode(QPainter::CompositionMode_Source);
-            painter.fillRect(rect(), Qt::transparent);
-
-            painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-            painter.drawText(contentsRect(), Qt::AlignLeft | Qt::AlignVCenter, text());
-
-            if (QLabel::minimumSizeHint().width() > contentsRect().width()) {
-                // Text does not fit, fade the end
-                painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-                QRect gradientRect(width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, height());
-                QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
-                gradient.setColorAt(0, Qt::white);
-                gradient.setColorAt(1, Qt::transparent);
-                painter.fillRect(gradientRect, gradient);
-            }
-        }
-        QPainter painter(this);
-        painter.drawImage(0, 0, image);
+    void loadPixmaps()
+    {
+        PanelStyle* style = PanelStyle::instance();
+        m_normalPix = style->windowButtonPixmap(m_buttonType, PanelStyle::NormalState);
+        m_hoverPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PrelightState);
+        m_downPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PressedState);
     }
 };
 
@@ -180,9 +139,9 @@
         QHBoxLayout* layout = new QHBoxLayout(m_windowButtonWidget);
         layout->setContentsMargins(0, 0, WINDOW_BUTTONS_RIGHT_MARGIN, 0);
         layout->setSpacing(0);
-        m_closeButton = new WindowButton("close");
-        m_minimizeButton = new WindowButton("minimize");
-        m_maximizeButton = new WindowButton("unmaximize");
+        m_closeButton = new WindowButton(PanelStyle::CloseWindowButton);
+        m_minimizeButton = new WindowButton(PanelStyle::MinimizeWindowButton);
+        m_maximizeButton = new WindowButton(PanelStyle::UnmaximizeWindowButton);
         layout->addWidget(m_closeButton);
         layout->addWidget(m_minimizeButton);
         layout->addWidget(m_maximizeButton);
@@ -200,10 +159,10 @@
             q, SLOT(updateWidgets()));
     }
 
-    void setupMenuBarWidget()
+    void setupMenuBarWidget(IndicatorsManager* manager)
     {
-        m_menuBarWidget = new MenuBarWidget(0 /* Window menu */);
-        QObject::connect(m_menuBarWidget, SIGNAL(menuBarClosed()),
+        m_menuBarWidget = new MenuBarWidget(manager);
+        QObject::connect(m_menuBarWidget, SIGNAL(isOpenedChanged()),
             q, SLOT(updateWidgets()));
         QObject::connect(m_menuBarWidget, SIGNAL(isEmptyChanged()),
             q, SLOT(updateWidgets()));
@@ -216,21 +175,16 @@
     }
 };
 
-AppNameApplet::AppNameApplet()
+AppNameApplet::AppNameApplet(IndicatorsManager* indicatorsManager)
 : d(new AppNameAppletPrivate)
 {
     d->q = this;
     setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
 
-    QPalette palette;
-    palette.setColor(QPalette::WindowText, Qt::white);
-    palette.setColor(QPalette::ButtonText, Qt::white);
-    setPalette(palette);
-
     d->setupWindowHelper();
     d->setupLabel();
     d->setupWindowButtonWidget();
-    d->setupMenuBarWidget();
+    d->setupMenuBarWidget(indicatorsManager);
     d->setupKeyboardModifiersMonitor();
 
     QHBoxLayout* layout = new QHBoxLayout(this);

=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-06-06 09:06:55 +0000
+++ panel/applets/appname/appnameapplet.h	2011-08-09 17:30:25 +0000
@@ -29,6 +29,8 @@
 
 class QEvent;
 
+class IndicatorsManager;
+
 namespace Unity2d
 {
 
@@ -37,7 +39,7 @@
 {
 Q_OBJECT
 public:
-    AppNameApplet();
+    AppNameApplet(IndicatorsManager*);
     ~AppNameApplet();
 
 protected:

=== removed file 'panel/applets/appname/com.canonical.AppMenu.Registrar.xml'
--- panel/applets/appname/com.canonical.AppMenu.Registrar.xml	2011-02-10 01:10:19 +0000
+++ panel/applets/appname/com.canonical.AppMenu.Registrar.xml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-	<dox:d><![CDATA[
-	  @mainpage
-	 
-	  An interface to register menus that are associated with a window in an application.  The
-	  main interface is docuemented here: @ref com::canonical::AppMenu::Registrar.
-	    
-	  The actual menus are transported using the dbusmenu protocol which is available
-	  here: @ref com::canonical::dbusmenu.
-	]]></dox:d>
-	<interface name="com.canonical.AppMenu.Registrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-		<dox:d>
-		  An interface to register a menu from an application's window to be displayed in another
-		  window.  This manages that association between XWindow Window IDs and the dbus
-		  address and object that provides the menu using the dbusmenu dbus interface.
-		</dox:d>
-		<method name="RegisterWindow">
-			<dox:d><![CDATA[
-			  Associates a dbusmenu with a window
-	     
-			  /note this method assumes that the connection from the caller is the DBus connection
-			    to use for the object.  Applications that use multiple DBus connections will need to
-			    ensure this method is called with the same connection that implmenets the object.
-			]]></dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="in">
-				<dox:d>The object on the dbus interface implementing the dbusmenu interface</dox:d>
-			</arg>
-		</method>
-		<method name="UnregisterWindow">
-			<dox:d>
-			  A method to allow removing a window from the database.  Windows will also be removed
-			  when the client drops off DBus so this is not required.  It is polite though.  And
-			  important for testing.
-			</dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-		</method>
-		<method name="GetMenuForWindow">
-			<dox:d>Gets the registered menu for a given window ID.</dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window to get</dox:d>
-			</arg>
-			<arg name="service" type="s" direction="out">
-				<dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="out">
-				<dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
-			</arg>
-		</method>
-		<method name="GetMenus">
-			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MenuInfoList"/>
-			<dox:d>Gets the information on all menus that the registrar knows about.  This
-			  is useful for debugging or bringing up a new renderer.</dox:d>
-			<arg name="menus" type="a(uso)" direction="out">
-				<dox:d>An array of structures containing the same parameters as @GetMenuForWindow.  Window ID, Service and ObjectPath.</dox:d>
-			</arg>
-		</method>
-		<signal name="WindowRegistered">
-			<dox:d>Signals when the registrar gets a new menu registered</dox:d>
-			<arg name="windowId" type="u" direction="out">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-			<arg name="service" type="s" direction="out">
-				<dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="out">
-				<dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
-			</arg>
-		</signal>
-		<signal name="WindowUnregistered">
-			<dox:d>Signals when the registrar removes a menu registration</dox:d>
-			<arg name="windowId" type="u" direction="out">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-		</signal>
-	</interface>
-</node>

=== added file 'panel/applets/appname/croppedlabel.cpp'
--- panel/applets/appname/croppedlabel.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.cpp	2011-08-09 17:30:25 +0000
@@ -0,0 +1,140 @@
+/*
+ * 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 "croppedlabel.h"
+
+// Local
+#include <cairoutils.h>
+#include <panelstyle.h>
+
+// unity-2d
+#include <debug_p.h>
+
+// libqtgconf
+#include <gconfitem-qml-wrapper.h>
+
+// Qt
+#include <QImage>
+#include <QPainter>
+
+// GTK
+#include <gtk/gtk.h>
+
+static const int FADEOUT_WIDTH = 30;
+
+static const char* WINDOW_TITLE_FONT_KEY = "/apps/metacity/general/titlebar_font";
+
+CroppedLabel::CroppedLabel(QWidget* parent)
+: QLabel(parent)
+{
+}
+
+QSize CroppedLabel::minimumSizeHint() const
+{
+    return QWidget::minimumSizeHint();
+}
+
+static void paintFadeoutGradient(QImage* image)
+{
+    QPainter painter(image);
+    painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    QRect gradientRect(image->width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, image->height());
+    QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
+    gradient.setColorAt(0, Qt::white);
+    gradient.setColorAt(1, Qt::transparent);
+    painter.fillRect(gradientRect, gradient);
+}
+
+static QString getWindowTitleFontName()
+{
+    GConfItemQmlWrapper client;
+    client.setKey(WINDOW_TITLE_FONT_KEY);
+    return client.getValue().toString();
+}
+
+void CroppedLabel::paintEvent(QPaintEvent* event)
+{
+    // Create an image filled with background brush (to avoid subpixel hinting
+    // artefacts around text)
+    QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
+    {
+        QPainter painter(&image);
+        painter.initFrom(this);
+        painter.eraseRect(rect());
+    }
+
+    // Create a pango layout
+    GObjectScopedPointer<PangoContext> pangoContext(gdk_pango_context_get());
+    GObjectScopedPointer<PangoLayout> layout(pango_layout_new(pangoContext.data()));
+
+    // Set font
+    QByteArray fontName = getWindowTitleFontName().toUtf8();
+    PangoFontDescription* desc = pango_font_description_from_string(fontName.data());
+    pango_layout_set_font_description(layout.data(), desc);
+    pango_font_description_free(desc);
+
+    // Set text
+    QByteArray utf8Text = text().toUtf8();
+    pango_layout_set_text (layout.data(), utf8Text.data(), -1);
+
+    // Get text size
+    int textWidth = 0;
+    int textHeight = 0;
+    pango_layout_get_pixel_size(layout.data(), &textWidth, &textHeight);
+
+    // Draw text
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+
+    PanelStyle* style = PanelStyle::instance();
+    GtkStyleContext* style_context = style->styleContext();
+
+    gtk_style_context_save(style_context);
+
+    GtkWidgetPath* widget_path = gtk_widget_path_new();
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_ITEM);
+    gtk_widget_path_iter_set_name(widget_path, -1 , "UnityPanelWidget");
+
+    gtk_style_context_set_path(style_context, widget_path);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUITEM);
+
+    gtk_render_layout(style_context, cr.data(),
+        contentsRect().left(),
+        contentsRect().top() + (height() - textHeight) / 2,
+        layout.data());
+
+    gtk_widget_path_free(widget_path);
+
+    gtk_style_context_restore(style_context);
+
+    // Fade if necessary
+    if (textWidth > contentsRect().width()) {
+        paintFadeoutGradient(&image);
+    }
+
+    // Paint on our widget
+    QPainter painter(this);
+    painter.drawImage(0, 0, image);
+}
+
+#include "croppedlabel.moc"

=== added file 'panel/applets/appname/croppedlabel.h'
--- panel/applets/appname/croppedlabel.h	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.h	2011-08-09 17:30:25 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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 CROPPEDLABEL_H
+#define CROPPEDLABEL_H
+
+// Local
+
+// Qt
+#include <QLabel>
+
+/**
+ * This label makes sure minimumSizeHint() is not set. This ensures the applet
+ * does not get wider if a window title is very long
+ */
+class CroppedLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    CroppedLabel(QWidget* parent = 0);
+
+    QSize minimumSizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent*);
+};
+
+#endif /* CROPPEDLABEL_H */

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-08-09 17:30:25 +0000
@@ -20,299 +20,98 @@
  */
 
 // Self
-#include "menubarwidget.h"
+#include <menubarwidget.h>
 
 // Local
-#include "config.h"
-#include "debug_p.h"
-#include "keyboardmodifiersmonitor.h"
-#include "registrar.h"
-
-// dbusmenu-qt
-#include <dbusmenuimporter.h>
-
-// bamf
-#include <bamf-matcher.h>
-#include <bamf-window.h>
+#include <debug_p.h>
+#include <indicatorentrywidget.h>
+#include <indicatorsmanager.h>
 
 // Qt
-#include <QActionEvent>
 #include <QHBoxLayout>
-#include <QLabel>
-#include <QMenuBar>
-#include <QTimer>
-
-class MyDBusMenuImporter : public DBusMenuImporter
-{
-public:
-    MyDBusMenuImporter(const QString &service, const QString &path, QObject *parent)
-    : DBusMenuImporter(service, path, parent)
-    , m_service(service)
-    , m_path(path)
-    {}
-
-    QString service() const { return m_service; }
-    QString path() const { return m_path; }
-
-private:
-    QString m_service;
-    QString m_path;
-};
-
-MenuBarWidget::MenuBarWidget(QMenu* windowMenu, QWidget* parent)
+
+static const int MENU_ITEM_PADDING = 6;
+
+MenuBarWidget::MenuBarWidget(IndicatorsManager* indicatorsManager, QWidget* parent)
 : QWidget(parent)
-, m_windowMenu(windowMenu)
-{
-    m_activeWinId = 0;
-    setupRegistrar();
-    setupMenuBar();
-
-    connect(&BamfMatcher::get_default(), SIGNAL(ActiveWindowChanged(BamfWindow*, BamfWindow*)),
-        SLOT(slotActiveWindowChanged(BamfWindow*, BamfWindow*)));
-    /* Work around a bug in BAMF: the ActiveWindowChanged signal is not emitted
-       for some windows that open maximized. This is for example the case of the
-       LibreOffice startcenter. */
-    connect(&BamfMatcher::get_default(), SIGNAL(ViewOpened(BamfView*)),
-        SLOT(slotViewOpened()));
-    updateActiveWinId(BamfMatcher::get_default().active_window());
-}
-
-void MenuBarWidget::setupRegistrar()
-{
-    m_registrar = Registrar::instance();
-    if (!m_registrar->connectToBus()) {
-        UQ_WARNING << "could not connect registrar to DBus";
-    }
-
-    connect(m_registrar, SIGNAL(WindowRegistered(WId, const QString&, const QDBusObjectPath&)),
-        SLOT(slotWindowRegistered(WId, const QString&, const QDBusObjectPath&)));
-    connect(m_registrar, SIGNAL(WindowUnregistered(WId)),
-        SLOT(slotWindowUnregistered(WId)));
-}
-
-void MenuBarWidget::setupMenuBar()
-{
-    m_menuBar = new QMenuBar;
-    new MenuBarClosedHelper(this);
-
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->setSpacing(0);
-    layout->addWidget(m_menuBar);
-    m_menuBar->setNativeMenuBar(false);
-
-    m_updateMenuBarTimer = new QTimer(this);
-    m_updateMenuBarTimer->setSingleShot(true);
-    m_updateMenuBarTimer->setInterval(0);
-    connect(m_updateMenuBarTimer, SIGNAL(timeout()),
-        SLOT(updateMenuBar()));
-
-    // Repaint the menubar when modifiers change so that the shortcut underline
-    // is drawn or not
-    connect(KeyboardModifiersMonitor::instance(), SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
-        m_menuBar, SLOT(update()));
-}
-
-void MenuBarWidget::slotActiveWindowChanged(BamfWindow* /*former*/, BamfWindow* current)
-{
-    if (current) {
-        updateActiveWinId(current);
-    }
-}
-
-void MenuBarWidget::slotViewOpened()
-{
-    BamfWindow* active = BamfMatcher::get_default().active_window();
-    if (active != NULL) {
-        if (active->xid() != m_activeWinId) {
-            /* This shouldn’t be needed as BAMF should have emitted the
-               ActiveWindowChanged signal, but it sometimes doesn’t (e.g. when
-               LibreOffice startcenter starts automatically maximized). */
-            updateActiveWinId(active);
-        }
-    }
-}
-
-void MenuBarWidget::slotWindowRegistered(WId wid, const QString& service, const QDBusObjectPath& menuObjectPath)
-{
-    MyDBusMenuImporter* importer = new MyDBusMenuImporter(service, menuObjectPath.path(), this);
-    delete m_importers.take(wid);
-    m_importers.insert(wid, importer);
-    connect(importer, SIGNAL(menuUpdated()), SLOT(slotMenuUpdated()));
-    connect(importer, SIGNAL(actionActivationRequested(QAction*)), SLOT(slotActionActivationRequested(QAction*)));
-    QMetaObject::invokeMethod(importer, "updateMenu", Qt::QueuedConnection);
-}
-
-void MenuBarWidget::slotWindowUnregistered(WId wid)
-{
-    MyDBusMenuImporter* importer = m_importers.take(wid);
-    if (importer) {
-        importer->deleteLater();
-    }
-    if (wid == m_activeWinId) {
-        m_activeWinId = 0;
-        updateMenuBar();
-    }
-}
-
-void MenuBarWidget::slotMenuUpdated()
-{
-    DBusMenuImporter* importer = static_cast<DBusMenuImporter*>(sender());
-
-    if (m_importers.value(m_activeWinId) == importer) {
-        updateMenuBar();
-    }
-}
-
-void MenuBarWidget::slotActionActivationRequested(QAction* action)
-{
-    DBusMenuImporter* importer = static_cast<DBusMenuImporter*>(sender());
-
-    if (m_importers.value(m_activeWinId) == importer) {
-        m_menuBar->setActiveAction(action);
-    }
-}
-
-QMenu* MenuBarWidget::menuForWinId(WId wid) const
-{
-    MyDBusMenuImporter* importer = m_importers.value(wid);
-    return importer ? importer->menu() : 0;
-}
-
-void MenuBarWidget::updateActiveWinId(BamfWindow* bamfWindow)
-{
-    WId id = bamfWindow ? bamfWindow->xid() : 0;
-    if (id == m_activeWinId) {
-        return;
-    }
-    if (id == window()->winId()) {
-        // Do not update id if the active window is the one hosting this applet
-        return;
-    }
-    m_activeWinId = id;
-    updateMenuBar();
-}
-
-void MenuBarWidget::updateMenuBar()
-{
-    WId winId = m_activeWinId;
-    QMenu* menu = menuForWinId(winId);
-
-    if (!menu) {
-        if (winId) {
-            menu = m_windowMenu;
-        } else {
-            // No active window, show a desktop menubar
-            // FIXME: Empty menu
-            /*
-            menu = mEmptyMenu;
-            */
-        }
-    }
-
-    m_menuBar->clear();
-    // FIXME: Empty menu
-    if (!menu) {
-        return;
-    }
-    menu->installEventFilter(this);
-    Q_FOREACH(QAction* action, menu->actions()) {
-        if (action->isSeparator()) {
-            continue;
-        }
-        m_menuBar->addAction(action);
-    }
-}
-
-bool MenuBarWidget::eventFilter(QObject* object, QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::ActionAdded:
-    case QEvent::ActionRemoved:
-    case QEvent::ActionChanged:
-        m_updateMenuBarTimer->start();
-        break;
-    default:
-        break;
-    }
-    return false;
+, m_indicatorsManager(indicatorsManager)
+, m_layout(new QHBoxLayout(this))
+, m_isEmpty(true)
+, m_isOpened(false)
+{
+    m_layout->setMargin(0);
+    m_layout->setSpacing(0);
+    indicatorsManager->indicators()->on_object_added.connect(
+        sigc::mem_fun(this, &MenuBarWidget::onObjectAdded)
+        );
+    indicatorsManager->indicators()->on_entry_activated.connect(
+        sigc::mem_fun(this, &MenuBarWidget::onEntryActivated)
+        );
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+    m_layout->addStretch();
 }
 
 bool MenuBarWidget::isEmpty() const
 {
-    return m_menuBar->actions().isEmpty();
+    return m_isEmpty;
 }
 
 bool MenuBarWidget::isOpened() const
 {
-    return m_menuBar->activeAction();
-}
-
-// MenuBarClosedHelper ----------------------------------------
-MenuBarClosedHelper::MenuBarClosedHelper(MenuBarWidget* widget)
-: QObject(widget)
-, m_widget(widget)
-{
-    widget->m_menuBar->installEventFilter(this);
-}
-
-bool MenuBarClosedHelper::eventFilter(QObject* object, QEvent* event)
-{
-    if (object == m_widget->m_menuBar) {
-        switch (event->type()) {
-            case QEvent::ActionAdded:
-            case QEvent::ActionRemoved:
-            case QEvent::ActionChanged:
-                menuBarActionEvent(static_cast<QActionEvent*>(event));
-                break;
-            default:
-                break;
-        }
-    } else {
-        // Top-level menus
-        if (event->type() == QEvent::Hide) {
-            // menu hide themselves when the menubar is closed but also when
-            // one goes from one menu to another. The way to know this is to
-            // check the value of QMenuBar::activeAction(), but at this point
-            // it has not been updated yet, so we check in a delayed method.
-            QMetaObject::invokeMethod(this, "emitMenuBarClosed", Qt::QueuedConnection);
-        }
-    }
-    return false;
-}
-
-void MenuBarClosedHelper::emitMenuBarClosed()
-{
-    if (!m_widget->m_menuBar->activeAction()) {
-        QMetaObject::invokeMethod(m_widget, "menuBarClosed");
-    }
-}
-
-void MenuBarClosedHelper::menuBarActionEvent(QActionEvent* event)
-{
-    QMenu* menu = event->action()->menu();
-    if (menu) {
-        // Install/remove event filters on top level menus so that know when
-        // they hide themselves and can emit menuBarClosed()
-        switch (event->type()) {
-        case QEvent::ActionAdded:
-        case QEvent::ActionChanged:
-            menu->installEventFilter(this);
-            break;
-        case QEvent::ActionRemoved:
-            menu->removeEventFilter(this);
-            break;
-        default:
-            break;
-        }
-    }
-
-    // Emit isEmptyChanged() if necessary
-    QList<QAction*> actions = m_widget->m_menuBar->actions();
-    if (event->type() == QEvent::ActionAdded && actions.count() == 1) {
-        QMetaObject::invokeMethod(m_widget, "isEmptyChanged");
-    } else if (event->type() == QEvent::ActionRemoved && actions.isEmpty()) {
-        QMetaObject::invokeMethod(m_widget, "isEmptyChanged");
+    return m_isOpened;
+}
+
+void MenuBarWidget::onObjectAdded(const unity::indicator::Indicator::Ptr& indicator)
+{
+    QString name = QString::fromStdString(indicator->name());
+    if (name == "libappmenu.so") {
+        indicator->on_entry_added.connect(sigc::mem_fun(this, &MenuBarWidget::onEntryAdded));
+    }
+}
+
+void MenuBarWidget::onEntryAdded(const unity::indicator::Entry::Ptr& entry)
+{
+    IndicatorEntryWidget* widget = new IndicatorEntryWidget(entry);
+    widget->setPadding(MENU_ITEM_PADDING);
+    connect(widget, SIGNAL(isEmptyChanged()), SLOT(updateIsEmpty()));
+
+    m_widgetList.append(widget);
+    m_indicatorsManager->addIndicatorEntryWidget(widget);
+
+    // Insert *before* stretch
+    m_layout->insertWidget(m_layout->count() - 1, widget);
+}
+
+void MenuBarWidget::updateIsEmpty()
+{
+    bool empty = true;
+    Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
+        if (!widget->isEmpty()) {
+            empty = false;
+            break;
+        }
+    }
+    if (m_isEmpty != empty) {
+        m_isEmpty = empty;
+        isEmptyChanged();
+    }
+}
+
+void MenuBarWidget::onEntryActivated(const std::string& id)
+{
+    bool isOpened = false;
+    if (!id.empty()) {
+        // We only cares about menubar entries
+        Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
+            if (widget->entry()->id() == id) {
+                isOpened = true;
+                break;
+            }
+        }
+    }
+    if (m_isOpened != isOpened) {
+        m_isOpened = isOpened;
+        isOpenedChanged();
     }
 }
 

=== modified file 'panel/applets/appname/menubarwidget.h'
--- panel/applets/appname/menubarwidget.h	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/menubarwidget.h	2011-08-09 17:30:25 +0000
@@ -23,86 +23,45 @@
 #define MENUBARWIDGET_H
 
 // Qt
-#include <QHash>
 #include <QWidget>
 
-class BamfWindow;
-
-class QActionEvent;
-class QDBusObjectPath;
-class QMenu;
-class QMenuBar;
-class QTimer;
-
-class MyDBusMenuImporter;
-class Registrar;
-
-typedef QHash<WId, MyDBusMenuImporter*> ImporterForWId;
-
-class MenuBarWidget;
-
-/**
- * An helper class which monitors the menubar and emits MenuBarWidget::menuBarClosed()
- * when necessary
- */
-class MenuBarClosedHelper : public QObject
-{
-Q_OBJECT
-public:
-    MenuBarClosedHelper(MenuBarWidget*);
-
-protected:
-    bool eventFilter(QObject*, QEvent*); //reimp
-
-private Q_SLOTS:
-    void emitMenuBarClosed();
-
-private:
-    MenuBarWidget* m_widget;
-    void menuBarActionEvent(QActionEvent*);
-};
-
-class MenuBarWidget : public QWidget
-{
-Q_OBJECT
-public:
-    MenuBarWidget(QMenu* windowMenu, QWidget* parent = 0);
+// libunity-core
+#include <UnityCore/Indicator.h>
+#include <UnityCore/IndicatorEntry.h>
+
+class QHBoxLayout;
+
+class IndicatorEntryWidget;
+class IndicatorsManager;
+
+class MenuBarWidget : public QWidget, public sigc::trackable
+{
+Q_OBJECT
+public:
+    MenuBarWidget(IndicatorsManager*, QWidget* parent = 0);
 
     bool isEmpty() const;
     bool isOpened() const;
 
 Q_SIGNALS:
-    void menuBarClosed();
+    void isOpenedChanged();
     void isEmptyChanged();
 
-protected:
-    bool eventFilter(QObject*, QEvent*); // reimp
-
 private Q_SLOTS:
-    void slotActiveWindowChanged(BamfWindow*, BamfWindow*);
-    void slotViewOpened();
-    void slotWindowRegistered(WId, const QString& service, const QDBusObjectPath& menuObjectPath);
-    void slotWindowUnregistered(WId);
-    void slotMenuUpdated();
-    void slotActionActivationRequested(QAction* action);
-    void updateMenuBar();
+    void updateIsEmpty();
 
 private:
     Q_DISABLE_COPY(MenuBarWidget)
 
-    QMenuBar* m_menuBar;
-    Registrar* m_registrar;
-    ImporterForWId m_importers;
-    WId m_activeWinId;
-    QMenu* m_windowMenu;
-    QTimer* m_updateMenuBarTimer;
-
-    void setupRegistrar();
-    void setupMenuBar();
-    QMenu* menuForWinId(WId) const;
-    void updateActiveWinId(BamfWindow*);
-
-    friend class MenuBarClosedHelper;
+    IndicatorsManager* m_indicatorsManager;
+    QHBoxLayout* m_layout;
+    bool m_isEmpty;
+    bool m_isOpened;
+    QList<IndicatorEntryWidget*> m_widgetList;
+
+    void onObjectAdded(const unity::indicator::Indicator::Ptr&);
+    void onEntryAdded(const unity::indicator::Entry::Ptr&);
+    void onEntryActivated(const std::string&);
 };
 
 #endif /* MENUBARWIDGET_H */

=== removed file 'panel/applets/appname/registrar.cpp'
--- panel/applets/appname/registrar.cpp	2011-04-04 16:46:14 +0000
+++ panel/applets/appname/registrar.cpp	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-/*
- * Plasma applet to display application window menus
- *
- * 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/>.
- */
-
-// Self
-#include "registrar.h"
-
-// Qt
-#include <QApplication>
-#include <QDBusMessage>
-#include <QDBusObjectPath>
-#include <QDBusServiceWatcher>
-
-// Local
-#include "registraradaptor.h"
-
-static const char* DBUS_SERVICE = "com.canonical.AppMenu.Registrar";
-static const char* DBUS_OBJECT_PATH = "/com/canonical/AppMenu/Registrar";
-
-// Marshalling code for MenuInfo
-QDBusArgument& operator<<(QDBusArgument& argument, const MenuInfo& info)
-{
-    argument.beginStructure();
-    argument << info.winId << info.service << info.path;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, MenuInfo& info)
-{
-    argument.beginStructure();
-    argument >> info.winId >> info.service >> info.path;
-    argument.endStructure();
-    return argument;
-}
-
-Registrar::Registrar()
-: QObject()
-, mServiceWatcher(new QDBusServiceWatcher(this))
-{
-    qDBusRegisterMetaType<MenuInfo>();
-    qDBusRegisterMetaType<MenuInfoList>();
-    mServiceWatcher->setConnection(QDBusConnection::sessionBus());
-    mServiceWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
-    connect(mServiceWatcher, SIGNAL(serviceUnregistered(const QString&)), SLOT(slotServiceUnregistered(const QString&)));
-}
-
-Registrar::~Registrar()
-{
-    QDBusConnection::sessionBus().unregisterService(mService);
-}
-
-Registrar* Registrar::instance()
-{
-    static Registrar singleton;
-    return &singleton;
-}
-
-bool Registrar::connectToBus(const QString& _service, const QString& _path)
-{
-    mService = _service.isEmpty() ? DBUS_SERVICE : _service;
-    QString path = _path.isEmpty() ? DBUS_OBJECT_PATH : _path;
-
-    bool ok = QDBusConnection::sessionBus().registerService(mService);
-    if (!ok) {
-        return false;
-    }
-    new RegistrarAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(path, this);
-
-    return true;
-}
-
-void Registrar::RegisterWindow(WId wid, const QDBusObjectPath& menuObjectPath)
-{
-    MenuInfo info;
-    info.winId = wid;
-    info.service = message().service();
-    info.path = menuObjectPath;
-    mDb.insert(wid, info);
-    mServiceWatcher->addWatchedService(info.service);
-    WindowRegistered(wid, info.service, info.path);
-}
-
-void Registrar::UnregisterWindow(WId wid)
-{
-    mDb.remove(wid);
-    WindowUnregistered(wid);
-}
-
-QString Registrar::GetMenuForWindow(WId winId, QDBusObjectPath& menuObjectPath)
-{
-    MenuInfo info = mDb.value(winId);
-    QString service = info.service;
-    menuObjectPath = info.path;
-    return service;
-}
-
-MenuInfoList Registrar::GetMenus()
-{
-    return mDb.values();
-}
-
-void Registrar::slotServiceUnregistered(const QString& service)
-{
-    MenuInfoDb::Iterator
-        it = mDb.begin(),
-        end = mDb.end();
-    for (;it != end;) {
-        if (it.value().service == service) {
-            WId id = it.key();
-            it = mDb.erase(it);
-            WindowUnregistered(id);
-        } else {
-            ++it;
-        }
-    }
-    mServiceWatcher->removeWatchedService(service);
-}
-
-#include "registrar.moc"

=== removed file 'panel/applets/appname/registrar.h'
--- panel/applets/appname/registrar.h	2011-04-04 16:47:28 +0000
+++ panel/applets/appname/registrar.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Plasma applet to display application window menus
- *
- * 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 REGISTRAR_H
-#define REGISTRAR_H
-
-// Qt
-#include <QDBusContext>
-#include <QDBusObjectPath>
-#include <QObject>
-#include <QWidget> // For WId
-
-class QDBusObjectPath;
-class QDBusServiceWatcher;
-class QMenu;
-
-struct MenuInfo
-{
-    MenuInfo()
-    : winId(0)
-    , path("/")
-    {}
-
-    uint winId;
-    QString service;
-    QDBusObjectPath path;
-};
-Q_DECLARE_METATYPE(MenuInfo)
-
-typedef QList<MenuInfo> MenuInfoList;
-Q_DECLARE_METATYPE(MenuInfoList)
-
-class Registrar : public QObject, protected QDBusContext
-{
-    Q_OBJECT
-
-public:
-    /* The registrar is a singleton shared between all instances of MenuBarWidget. */
-    static Registrar* instance();
-
-    bool connectToBus(const QString& service = QString(), const QString& objectPath = QString());
-
-Q_SIGNALS:
-    void WindowRegistered(WId wid, const QString& service, const QDBusObjectPath&);
-    void WindowUnregistered(WId wid);
-
-public Q_SLOTS:
-    Q_NOREPLY void RegisterWindow(WId wid, const QDBusObjectPath& menuObjectPath);
-    Q_NOREPLY void UnregisterWindow(WId wid);
-    QString GetMenuForWindow(WId wid, QDBusObjectPath& menuObjectPath);
-    MenuInfoList GetMenus();
-
-private Q_SLOTS:
-    void slotServiceUnregistered(const QString& service);
-
-private:
-    Registrar();
-    Q_DISABLE_COPY(Registrar)
-    ~Registrar();
-
-    QDBusServiceWatcher* mServiceWatcher;
-    typedef QHash<WId, MenuInfo> MenuInfoDb;
-    MenuInfoDb mDb;
-    QString mService;
-};
-
-#endif /* REGISTRAR_H */

=== added file 'panel/applets/common/cairoutils.cpp'
--- panel/applets/common/cairoutils.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.cpp	2011-08-09 17:30:25 +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 'panel/applets/common/cairoutils.h'
--- panel/applets/common/cairoutils.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.h	2011-08-09 17:30:25 +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 'panel/applets/common/indicatorentrywidget.cpp'
--- panel/applets/common/indicatorentrywidget.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorentrywidget.cpp	2011-08-09 17:30:25 +0000
@@ -0,0 +1,374 @@
+/*
+ * 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*)
+{
+    UQ_RETURN_IF_FAIL(m_hasIcon || m_hasLabel);
+    showMenu(Qt::LeftButton);
+}
+
+void IndicatorEntryWidget::mouseReleaseEvent(QMouseEvent*)
+{
+    UQ_VAR(this);
+    update();
+}
+
+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 'panel/applets/common/indicatorentrywidget.h'
--- panel/applets/common/indicatorentrywidget.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorentrywidget.h	2011-08-09 17:30:25 +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 'panel/applets/common/indicatorsmanager.cpp'
--- panel/applets/common/indicatorsmanager.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorsmanager.cpp	2011-08-09 17:30:25 +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 'panel/applets/common/indicatorsmanager.h'
--- panel/applets/common/indicatorsmanager.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorsmanager.h	2011-08-09 17:30:25 +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 'panel/applets/common/indicatorwidget.cpp'
--- panel/applets/common/indicatorwidget.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorwidget.cpp	2011-08-09 17:30:25 +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 'panel/applets/common/indicatorwidget.h'
--- panel/applets/common/indicatorwidget.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/indicatorwidget.h	2011-08-09 17:30:25 +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 */

=== added file 'panel/applets/common/panelstyle.cpp'
--- panel/applets/common/panelstyle.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/panelstyle.cpp	2011-08-09 17:30:25 +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 'panel/applets/common/panelstyle.h'
--- panel/applets/common/panelstyle.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/panelstyle.h	2011-08-09 17:30:25 +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 'panel/applets/homebutton/homebutton.cpp'
--- panel/applets/homebutton/homebutton.cpp	2011-05-26 16:41:04 +0000
+++ panel/applets/homebutton/homebutton.cpp	2011-08-09 17:30:25 +0000
@@ -40,8 +40,10 @@
     setStyleSheet(
             "QToolButton { border: none; margin: 0; padding: 0; width: 61 }"
             "QToolButton:checked, QToolButton:pressed {"
-            // Use border-image here, not background-image, because bfb_bg_active.png is 56px wide
-            "     border-image: url(theme:/bfb_bg_active.png);"
+            "   padding-top: 1px;"
+            "   padding-left: 1px;"
+            "   padding-right: -1px;"
+            "   padding-bottom: -1px;"
             "}"
     );
 }

=== added directory 'panel/applets/indicator'
=== removed directory 'panel/applets/indicator'
=== removed file 'panel/applets/indicator-config.h.in'
--- panel/applets/indicator-config.h.in	2011-03-01 09:04:13 +0000
+++ panel/applets/indicator-config.h.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#ifndef INDICATOR_CONFIG_H
-#define INDICATOR_CONFIG_H
-
-#define INDICATOR_ICONS_DIR "${INDICATOR_ICONS_DIR}"
-#define INDICATOR_DIR "${INDICATOR_DIR}"
-
-#endif /* INDICATOR_CONFIG_H */

=== removed file 'panel/applets/indicator/abstractindicator.cpp'
--- panel/applets/indicator/abstractindicator.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/abstractindicator.cpp	1970-01-01 00:00:00 +0000
@@ -1,43 +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/>.
- */
-
-// Self
-#include "abstractindicator.h"
-
-// Local
-
-// Qt
-#include <QAction>
-
-AbstractIndicator::AbstractIndicator(QObject* parent)
-: QObject(parent)
-{
-}
-
-AbstractIndicator::~AbstractIndicator()
-{
-}
-
-void AbstractIndicator::init()
-{
-}
-
-#include "abstractindicator.moc"

=== removed file 'panel/applets/indicator/abstractindicator.h'
--- panel/applets/indicator/abstractindicator.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/abstractindicator.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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 ABSTRACTINDICATOR_H
-#define ABSTRACTINDICATOR_H
-
-// Local
-
-// Qt
-#include <QObject>
-
-class QAction;
-
-class AbstractIndicator : public QObject
-{
-    Q_OBJECT
-public:
-    AbstractIndicator(QObject* parent=0);
-    ~AbstractIndicator();
-
-    /**
-     * Called when the indicator has been constructed and its owner is connected to signals.
-     * It's the right place to emit actionAdded()
-     */
-    virtual void init();
-
-Q_SIGNALS:
-    void actionAdded(QAction*);
-    void actionRemoved(QAction*);
-
-private:
-    Q_DISABLE_COPY(AbstractIndicator)
-};
-
-#endif /* ABSTRACTINDICATOR_H */

=== removed file 'panel/applets/indicator/datetimeindicator.cpp'
--- panel/applets/indicator/datetimeindicator.cpp	2011-02-10 01:10:19 +0000
+++ panel/applets/indicator/datetimeindicator.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +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/>.
- */
-
-// Self
-#include "datetimeindicator.h"
-
-// Local
-#include "indicatorservicemanager.h"
-
-// dbusmenu-qt
-#include "dbusmenuimporter.h"
-
-// Qt
-#include <QAction>
-#include <QDateTime>
-
-// From dbus-shared.h
-#define  SERVICE_NAME     "com.canonical.indicator.datetime"
-#define  SERVICE_IFACE    "com.canonical.indicator.datetime.service"
-#define  SERVICE_OBJ      "/com.canonical/indicator/datetime/service"
-#define  SERVICE_VERSION  1
-
-#define  MENU_OBJ      "/com.canonical/indicator/datetime/menu"
-
-#define  DBUSMENU_CALENDAR_MENUITEM_TYPE "x-canonical-calendar-item"
-////
-
-DateTimeIndicator::DateTimeIndicator(QObject* parent)
-: AbstractIndicator(parent)
-, m_action(new QAction(this))
-, m_timer(new QTimer(this))
-{
-    new IndicatorServiceManager(SERVICE_NAME, SERVICE_VERSION, this);
-
-    readConfig();
-    setupMenu();
-    setupTimer();
-    updateText();
-}
-
-void DateTimeIndicator::init()
-{
-    actionAdded(m_action);
-}
-
-void DateTimeIndicator::setupMenu()
-{
-    DBusMenuImporter* importer = new DBusMenuImporter(SERVICE_NAME, MENU_OBJ, this);
-    m_action->setMenu(importer->menu());
-}
-
-void DateTimeIndicator::setupTimer()
-{
-    m_timer->setSingleShot(false);
-    connect(m_timer, SIGNAL(timeout()), SLOT(updateText()));
-    updateTimer();
-    m_timer->start();
-}
-
-void DateTimeIndicator::updateTimer()
-{
-    m_timer->setInterval(1000);
-}
-
-void DateTimeIndicator::updateText()
-{
-    QString text = QDateTime::currentDateTime().toString(m_format);
-    m_action->setText(text);
-}
-
-void DateTimeIndicator::readConfig()
-{
-    m_format = "hh:mm:ss";
-}
-
-#include "datetimeindicator.moc"

=== removed file 'panel/applets/indicator/datetimeindicator.h'
--- panel/applets/indicator/datetimeindicator.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/datetimeindicator.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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 DATETIMEINDICATOR_H
-#define DATETIMEINDICATOR_H
-
-// Local
-#include "abstractindicator.h"
-
-// Qt
-#include <QTimer>
-
-class DateTimeIndicator : public AbstractIndicator
-{
-    Q_OBJECT
-public:
-    DateTimeIndicator(QObject* parent=0);
-
-    virtual void init();
-
-private Q_SLOTS:
-    void updateText();
-private:
-    Q_DISABLE_COPY(DateTimeIndicator)
-    QAction* m_action;
-    QTimer* m_timer;
-    QString m_format;
-
-    void setupTimer();
-    void setupMenu();
-    void readConfig();
-    void updateTimer();
-};
-
-#endif /* DATETIMEINDICATOR_H */

=== removed file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-07-01 03:58:28 +0000
+++ panel/applets/indicator/indicator.c	1970-01-01 00:00:00 +0000
@@ -1,525 +0,0 @@
-/*  Copyright (c) 2009 Mark Trompell <[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; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <libindicator/indicator-object.h>
-
-#include "indicator.h"
-
-#include "indicator-config.h"
-
-/* default settings */
-#define DEFAULT_SETTING1 NULL
-#define DEFAULT_SETTING2 1
-#define DEFAULT_SETTING3 FALSE
-
-typedef enum {
-    PANEL_APPLET_ORIENT_LEFT,
-    PANEL_APPLET_ORIENT_RIGHT,
-    PANEL_APPLET_ORIENT_TOP,
-    PANEL_APPLET_ORIENT_BOTTOM
-} PanelAppletOrient;
-
-// <indicator-applet-copy>
-static gchar * indicator_order[] = {
-	"libappmenu.so",
-	"libapplication.so",
-	"libsoundmenu.so",
-	"libnetworkmenu.so",
-	"libmessaging.so",
-	"libdatetime.so",
-	"libme.so",
-	"libsession.so",
-	NULL
-};
-
-static GtkPackDirection packdirection;
-static PanelAppletOrient orient;
-
-#define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
-#define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
-
-#define  IO_DATA_ORDER_NUMBER        "indicator-order-number"
-
-static gint
-name2order (const gchar * name) {
-	int i;
-
-	for (i = 0; indicator_order[i] != NULL; i++) {
-		if (g_strcmp0(name, indicator_order[i]) == 0) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-typedef struct _incoming_position_t incoming_position_t;
-struct _incoming_position_t {
-	gint objposition;
-	gint entryposition;
-	gint menupos;
-	gboolean found;
-};
-
-/* This function helps by determining where in the menu list
-   this new entry should be placed.  It compares the objects
-   that they're on, and then the individual entries.  Each
-   is progressively more expensive. */
-static void
-place_in_menu (GtkWidget * widget, gpointer user_data)
-{
-	incoming_position_t * position = (incoming_position_t *)user_data;
-	if (position->found) {
-		/* We've already been placed, just finish the foreach */
-		return;
-	}
-
-	IndicatorObject * io = INDICATOR_OBJECT(g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_OBJECT));
-	g_assert(io != NULL);
-
-	gint objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
-	/* We've already passed it, well, then this is where
-	   we should be be.  Stop! */
-	if (objposition > position->objposition) {
-		position->found = TRUE;
-		return;
-	}
-
-	/* The objects don't match yet, keep looking */
-	if (objposition < position->objposition) {
-		position->menupos++;
-		return;
-	}
-
-	/* The objects are the same, let's start looking at entries. */
-	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-	gint entryposition = indicator_object_get_location(io, entry);
-
-	if (entryposition > position->entryposition) {
-		position->found = TRUE;
-		return;
-	}
-
-	if (entryposition < position->entryposition) {
-		position->menupos++;
-		return;
-	}
-
-	/* We've got the same object and the same entry.  Well,
-	   let's just put it right here then. */
-	position->found = TRUE;
-	return;
-}
-
-static void
-something_shown (GtkWidget * widget, gpointer user_data)
-{
-	GtkWidget * menuitem = GTK_WIDGET(user_data);
-	gtk_widget_show(menuitem);
-}
-
-static void
-something_hidden (GtkWidget * widget, gpointer user_data)
-{
-	GtkWidget * menuitem = GTK_WIDGET(user_data);
-	gtk_widget_hide(menuitem);
-}
-
-static void
-sensitive_cb (GObject * obj, GParamSpec * pspec, gpointer user_data)
-{
-	g_return_if_fail(GTK_IS_WIDGET(obj));
-	g_return_if_fail(GTK_IS_WIDGET(user_data));
-
-	gtk_widget_set_sensitive(GTK_WIDGET(user_data), gtk_widget_get_sensitive(GTK_WIDGET(obj)));
-	return;
-}
-
-static gboolean
-entry_scrolled (GtkWidget *menuitem, GdkEventScroll *event, gpointer data)
-{
-	IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
-	IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
-
-	g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
-
-	g_signal_emit_by_name (io, "scroll", 1, event->direction);
-	g_signal_emit_by_name (io, "scroll-entry", entry, 1, event->direction);
-
-	return FALSE;
-}
-
-static void
-entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
-{
-	g_debug("Signal: Entry Added");
-	gboolean something_visible = FALSE;
-	gboolean something_sensitive = FALSE;
-
-	GtkWidget * menuitem = gtk_menu_item_new();
-	GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-			gtk_hbox_new(FALSE, 3) : gtk_vbox_new(FALSE, 3);
-
-	g_object_set_data (G_OBJECT (menuitem), "indicator", io);
-	g_object_set_data (G_OBJECT (menuitem), "box", box);
-
-	if (entry->image != NULL) {
-		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
-		if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
-			something_visible = TRUE;
-		}
-
-		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->image))) {
-			something_sensitive = TRUE;
-		}
-
-		g_signal_connect(G_OBJECT(entry->image), "show", G_CALLBACK(something_shown), menuitem);
-		g_signal_connect(G_OBJECT(entry->image), "hide", G_CALLBACK(something_hidden), menuitem);
-
-		g_signal_connect(G_OBJECT(entry->image), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
-	}
-	if (entry->label != NULL) {
-		switch(packdirection) {
-			case GTK_PACK_DIRECTION_LTR:
-				gtk_label_set_angle(GTK_LABEL(entry->label), 0.0);
-				break;
-			case GTK_PACK_DIRECTION_TTB:
-				gtk_label_set_angle(GTK_LABEL(entry->label),
-						(orient == PANEL_APPLET_ORIENT_LEFT) ? 
-						270.0 : 90.0);
-				break;
-			default:
-				break;
-		}		
-		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
-
-		if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
-			something_visible = TRUE;
-		}
-
-		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->label))) {
-			something_sensitive = TRUE;
-		}
-
-		g_signal_connect(G_OBJECT(entry->label), "show", G_CALLBACK(something_shown), menuitem);
-		g_signal_connect(G_OBJECT(entry->label), "hide", G_CALLBACK(something_hidden), menuitem);
-
-		g_signal_connect(G_OBJECT(entry->label), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
-	}
-	gtk_container_add(GTK_CONTAINER(menuitem), box);
-	gtk_widget_show(box);
-
-	if (entry->menu != NULL) {
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
-	}
-
-	incoming_position_t position;
-	position.objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
-	position.entryposition = indicator_object_get_location(io, entry);
-	position.menupos = 0;
-	position.found = FALSE;
-
-	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
-
-	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
-
-	if (something_visible) {
-		gtk_widget_show(menuitem);
-	}
-	gtk_widget_set_sensitive(menuitem, something_sensitive);
-
-	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
-	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
-	g_signal_connect(G_OBJECT (menuitem), "scroll-event", G_CALLBACK(entry_scrolled), NULL);
-
-	return;
-}
-
-static void
-entry_removed_cb (GtkWidget * widget, gpointer userdata)
-{
-	gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-
-	if (data != userdata) {
-		return;
-	}
-
-	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
-	if (entry->label != NULL) {
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_shown), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_hidden), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(sensitive_cb), widget);
-	}
-	if (entry->image != NULL) {
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_shown), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_hidden), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(sensitive_cb), widget);
-	}
-
-	gtk_widget_destroy(widget);
-	return;
-}
-
-static void
-entry_removed (IndicatorObject * io G_GNUC_UNUSED, IndicatorObjectEntry * entry,
-               gpointer user_data)
-{
-	g_debug("Signal: Entry Removed");
-
-	gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry);
-
-	return;
-}
-
-static void
-entry_moved_find_cb (GtkWidget * widget, gpointer userdata)
-{
-	gpointer * array = (gpointer *)userdata;
-	if (array[1] != NULL) {
-		return;
-	}
-
-	gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-
-	if (data != array[0]) {
-		return;
-	}
-
-	array[1] = widget;
-	return;
-}
-
-/* Gets called when an entry for an object was moved. */
-static void
-entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry,
-             gint old G_GNUC_UNUSED, gint new G_GNUC_UNUSED, gpointer user_data)
-{
-	GtkWidget * menubar = GTK_WIDGET(user_data);
-