Merge lp:~agateau/unity-2d/unity-core into lp:unity-2d/3.0

[Aurélien Gâteau]

This branch is an heavy refactor of unity-2d-panel to use the new indicator-panel-service provided by Unity 3D. It has been developed on Oneiric and most likely will not build and work properly on Natty as it depends on GTK3 and UnityCore, a new library provided by Unity 3D.

(resubmitted to mark lp:~agateau/unity-2d/gtk3 as a prerequisite branch)

[Tim Penhey (thumper)]

Hi Aurélien,

I notice you have a GConnector class. It covers a very similar area to Neil's
latest work -
https://code.launchpad.net/~njpatel/unity/nicer-glib-signals/+merge/67439

I also notice you aren't using namespaces for your top level classes - like
the GConnector. Have you considered using one?

A slight niggle, <string> is in the C++ standard library, not the STL (they
don't say we work for pedantical for nothing).

Redeclaring nux::Color is a dangerous thing. Slightly convoluted due to the
actual nux Color being nux::color::Color, which is then used in the nux
namespace. That is probably the only reason you are not getting linker errors
with this.

review: Needs Information

[Aurélien Gâteau (agateau)]

> Hi Aurélien,
>
> I notice you have a GConnector class. It covers a very similar area to Neil's
> latest work -
> https://code.launchpad.net/~njpatel/unity/nicer-glib-signals/+merge/67439

Yes, I discussed it briefly with Neil during Platform Rally, but from what I
understand it imposes the use of sigc++ signals. We already deal with GObject
and Qt signals so I prefer not adding another signal system to our stack
(granted, the code in this branch uses sigc++ signals when we deal with
UnityCore so this may be a moot point)

> I also notice you aren't using namespaces for your top level classes - like
> the GConnector. Have you considered using one?

Not really. GConnector is in libunity-2d-private, which is not supposed to be
reused outside of unity-2d. Therefore I don't see an advantage in using
namespaces here.

> A slight niggle, <string> is in the C++ standard library, not the STL (they
> don't say we work for pedantical for nothing).

Will fix :)

> Redeclaring nux::Color is a dangerous thing. Slightly convoluted due to the
> actual nux Color being nux::color::Color, which is then used in the nux
> namespace. That is probably the only reason you are not getting linker errors
> with this.

Granted, this code is hackish. It cannot cause link errors though:
nux::Color is in Nux and we only link to NuxCore, not to Nux. I would have
used nux::Color directly instead of reimplementing it otherwise.

This code is part of a fake Cairo API used to draw the border behind the active
menubar item:

I expected the corresponding code in unity-3d to continue to evolve based on
adjustments from Design and more drawing code to be added later on. It would
have been a pain to catch up with it if I had rewritten the whole drawing code
using Qt painting API. Instead I opted to fake the Cairo API, this way I
expected to be able to catch up by simply copying the drawing code from
unity-3d.

It turned out to be a not-so-smart move in the end because by the time I was
done with my fake Cairo API, Cimi started redoing the panel drawing code using
GTK3 style API :/. I plan on investigating whether it is possible for us to
directly call the GTK3 style API to paint on QWidgets so that we can keep
rendering synchronized. At this point this whole fake Cairo code should be
scrapped.

[Tim Penhey (thumper)]

On Tue, 12 Jul 2011 21:12:39 you wrote:
> > I also notice you aren't using namespaces for your top level classes -
> > like the GConnector. Have you considered using one?
>
> Not really. GConnector is in libunity-2d-private, which is not supposed to
> be reused outside of unity-2d. Therefore I don't see an advantage in using
> namespaces here.

You could say the same about unity, but I'm pushing for "namespace unity" (and
implementing).

> > Redeclaring nux::Color is a dangerous thing. Slightly convoluted due to
> > the actual nux Color being nux::color::Color, which is then used in the
> > nux namespace. That is probably the only reason you are not getting
> > linker errors with this.
>
> Granted, this code is hackish. It cannot cause link errors though:
> nux::Color is in Nux and we only link to NuxCore, not to Nux. I would have
> used nux::Color directly instead of reimplementing it otherwise.

No. nux::Color is in NuxCore, not Nux.

> This code is part of a fake Cairo API used to draw the border behind the
> active menubar item:
>
> I expected the corresponding code in unity-3d to continue to evolve based
> on adjustments from Design and more drawing code to be added later on. It
> would have been a pain to catch up with it if I had rewritten the whole
> drawing code using Qt painting API. Instead I opted to fake the Cairo API,
> this way I expected to be able to catch up by simply copying the drawing
> code from unity-3d.
>
> It turned out to be a not-so-smart move in the end because by the time I
> was done with my fake Cairo API, Cimi started redoing the panel drawing
> code using GTK3 style API :/. I plan on investigating whether it is
> possible for us to directly call the GTK3 style API to paint on QWidgets
> so that we can keep rendering synchronized. At this point this whole fake
> Cairo code should be scrapped.

Sure.

[Aurélien Gâteau (agateau)]

> On Tue, 12 Jul 2011 21:12:39 you wrote:
> > > I also notice you aren't using namespaces for your top level classes -
> > > like the GConnector. Have you considered using one?
> >
> > Not really. GConnector is in libunity-2d-private, which is not supposed to
> > be reused outside of unity-2d. Therefore I don't see an advantage in using
> > namespaces here.
>
> You could say the same about unity, but I'm pushing for "namespace unity" (and
> implementing).

Not exactly, at least libunity-core is used by both unity-2d and unity-3d.

> > > Redeclaring nux::Color is a dangerous thing. Slightly convoluted due to
> > > the actual nux Color being nux::color::Color, which is then used in the
> > > nux namespace. That is probably the only reason you are not getting
> > > linker errors with this.
> >
> > Granted, this code is hackish. It cannot cause link errors though:
> > nux::Color is in Nux and we only link to NuxCore, not to Nux. I would have
> > used nux::Color directly instead of reimplementing it otherwise.
>
> No. nux::Color is in NuxCore, not Nux.

Oh. Will fix.

Aurélien

[lp:~agateau/unity-2d/unity-core]

680. By Aurélien Gâteau on 2011-07-25

Synced with gtk3 branch

681. By Aurélien Gâteau on 2011-07-26

[build] Fix build with libunity-core 4.4

UnityCore.h has been removed

[Florian Boucault (fboucault)]

lp:unity-2d/4.0 saw quite a few updates which caused a couple of conflicts. Do you mind fixing them while I do the code review?

[Florian Boucault (fboucault)]

It seems like quite a few panel bugs got fixed by this piece, nice!

I don't see any background gradient in the panel anymore, is that expected?
Also the datetime indicator is there but tiny (easy to spot by navigating with the keyboard in the panel).

[Florian Boucault (fboucault)]

> Also the datetime indicator is there but tiny (easy to spot by navigating with
> the keyboard in the panel).

This is fixed now for some reason.

[Florian Boucault (fboucault)]

* Height of 24 pixels is hardcoded in various places. It would be nice to define it only once.

* Texts in panel do not have a shadow (sunken) like in Unity 3D.
* In the indicator with the username displayed in it (is it called 'me menu'?), the icon is not vertically centered like in Unity 3D.

* In panel/applets/appname/menubarwidget.cpp:

bool MenuBarWidget::isOpened() const
{
    // FIXME
[...]

What is the FIXME about?

* Do you know why does the shared panel backend need to know about the geometry of the indicators?

Have you tested the new panel with multiple monitors? I don't have the means to do it at the moment unfortunately.

review: Needs Fixing

[Aurélien Gâteau (agateau)]

> lp:unity-2d/4.0 saw quite a few updates which caused a couple of conflicts. Do
> you mind fixing them while I do the code review?

I have a whole stack of branches right now but they are targeting trunk, not 4.0. Should I change this so they all target 4.0?

[Aurélien Gâteau (agateau)]

> It seems like quite a few panel bugs got fixed by this piece, nice!
>
> I don't see any background gradient in the panel anymore, is that expected?

This is fixed in the next branch (use-gtk-rendering)

[Aurélien Gâteau (agateau)]

> * Height of 24 pixels is hardcoded in various places. It would be nice to
> define it only once.

Yes, I got rid of a few of them in the use-gtk-rendering branch, but there are a few remainings.

> * Texts in panel do not have a shadow (sunken) like in Unity 3D.
> * In the indicator with the username displayed in it (is it called 'me
> menu'?), the icon is not vertically centered like in Unity 3D.

Both fixed in use-gtk-rendering.

> * In panel/applets/appname/menubarwidget.cpp:
>
> bool MenuBarWidget::isOpened() const
> {
> // FIXME
> [...]
>
> What is the FIXME about?

I just forgot to remove the comment. Fixed.

>
> * Do you know why does the shared panel backend need to know about the
> geometry of the indicators?

This is for accessibility support.

> Have you tested the new panel with multiple monitors? I don't have the means
> to do it at the moment unfortunately.

No I haven't. Will do.

[lp:~agateau/unity-2d/unity-core]

682. By Aurélien Gâteau on 2011-07-27

Remove forgotten FIXME comment

[Florian Boucault (fboucault)]

> > lp:unity-2d/4.0 saw quite a few updates which caused a couple of conflicts.
> Do
> > you mind fixing them while I do the code review?
>
> I have a whole stack of branches right now but they are targeting trunk, not
> 4.0. Should I change this so they all target 4.0?

Please do. 4.0 is basically the branch targetting oneiric.
For this MR you can drop the prerequisite lp:~agateau/unity-2d/gtk3 as this branch cannot be merged on its own: it basically breaks the indicators more than anything else and I reviewed its code changes as part of this MR.

[Florian Boucault (fboucault)]

Once you resubmitted this one and we are sure it works as before on multi monitors setup, it's good to merge (it will need a commit message).
I am onto https://code.launchpad.net/~agateau/unity-2d/use-gtk-rendering/+merge/69113 now.

[lp:~agateau/unity-2d/unity-core]

683. By Aurélien Gâteau on 2011-07-27

Sync with gtk3

684. By Aurélien Gâteau on 2011-07-27

Merge unity-2d/4.0 in

685. By Aurélien Gâteau on 2011-07-27

[panel] Empty commit to close bugs

686. By Aurélien Gâteau on 2011-07-27

Sync with unity-2d/4.0

687. By Aurélien Gâteau on 2011-07-27

[panel] Make sure indicators are present on hotplugged monitor

IndicatorsManager should not be shared among panels, otherwise when a new
monitor is plugged after unity-2d-panel startup, we don't get any indicators as
no on_object_added() signal is emitted.

[Tim Penhey (thumper)]

On Wed, 27 Jul 2011 23:39:33 you wrote:
> Please do. 4.0 is basically the branch targetting oneiric.
> For this MR you can drop the prerequisite lp:~agateau/unity-2d/gtk3 as this
> branch cannot be merged on its own: it basically breaks the indicators
> more than anything else and I reviewed its code changes as part of this
> MR.

Florian,

I regularly have dependent branches that can't be landed by themselves. It is
useful for review purposes. Showing particular changes in their own branch
can make reviews much easier. Merge proposals don't have to be landable by
themselves.

Launchpad knows when branches are merged, and when the subsequent merge
proposal is landed, the dependent merge proposal is marked as merged as well.

Tim

Unmerged revisions

687. By Aurélien Gâteau on 2011-07-27

[panel] Make sure indicators are present on hotplugged monitor

IndicatorsManager should not be shared among panels, otherwise when a new
monitor is plugged after unity-2d-panel startup, we don't get any indicators as
no on_object_added() signal is emitted.

686. By Aurélien Gâteau on 2011-07-27

Sync with unity-2d/4.0

685. By Aurélien Gâteau on 2011-07-27

[panel] Empty commit to close bugs

684. By Aurélien Gâteau on 2011-07-27

Merge unity-2d/4.0 in

683. By Aurélien Gâteau on 2011-07-27

Sync with gtk3

682. By Aurélien Gâteau on 2011-07-27

Remove forgotten FIXME comment

681. By Aurélien Gâteau on 2011-07-26

[build] Fix build with libunity-core 4.4

UnityCore.h has been removed

680. By Aurélien Gâteau on 2011-07-25

Synced with gtk3 branch

679. By Aurélien Gâteau on 2011-07-19

Cleanup

678. By Aurélien Gâteau on 2011-07-18

Merged gtk3 branch

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-27 12:33:12 +0000
+++ CMakeLists.txt	2011-07-27 12:33:15 +0000
@@ -24,38 +24,6 @@
 find_package(Qt4 REQUIRED)
 find_package(X11 REQUIRED)
 find_package(Gettext REQUIRED)
-<<<<<<< TREE
-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(GIO REQUIRED gio-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
-
-
-# GSettings schemas
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
-set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
-set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# Run the schemas validator and error if it fails
-execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${UNITY_2D_DATA_DIR} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if (_schemas_invalid)
-  message (SEND_ERROR "Schemas validation error: ${_schemas_invalid}")
-endif (_schemas_invalid)
-
-# Actually install and recompile the schemas
-message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_SCHEMAS} DESTINATION ${GSETTINGS_DIR})
-install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-install (CODE "execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_DIR})")
-
-# Install GConf to GSettings conversion file
-install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
-=======
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GDK REQUIRED gdk-3.0)
 pkg_check_modules(GTK REQUIRED gtk+-3.0)
@@ -86,7 +54,6 @@
 
 # Install GConf to GSettings conversion file
 install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
->>>>>>> MERGE-SOURCE
 
 include_directories(
     ${CMAKE_BINARY_DIR}
 
=== 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-07-27 12:33:15 +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-07-27 12:33:15 +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-22 16:57:49 +0000
+++ debian/changelog	2011-07-27 12:33:15 +0000
@@ -1,6 +1,7 @@
 unity-2d (3.8.12-0ubuntu1) UNRELEASED; urgency=low
 
   [ Florian Boucault ]
+  * Upstreamed patch 01_build_with_new_indicator.patch
   * do not run pkgbinarymangler to convert images to 8bit since this breaks
     the launcher icon background handling. (LP: #809205)
     (QT upstream bug: http://bugreports.qt.nokia.com/browse/QTBUG-4459)
@@ -23,7 +24,16 @@
 
  -- Florian Boucault <[e-mail]>  Fri, 22 Jul 2011 18:56:33 +0200
 
-unity-2d (3.8.10-0ubuntu1) natty; urgency=low
+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:
@@ -46,10 +56,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:
@@ -96,7 +113,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)
@@ -140,6 +171,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-27 12:33:12 +0000
+++ debian/control	2011-07-27 12:33:15 +0000
@@ -20,9 +20,10 @@
                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,
+Standards-Version: 3.9.2
+Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/oneiric
 
 Package: unity-2d
 Architecture: all
@@ -71,13 +72,13 @@
          ${misc:Depends},
          libunity-2d-private0
 Provides: indicator-renderer
-Recommends: indicator-application,
-            indicator-appmenu,
-            indicator-datetime,
-            indicator-me,
-            indicator-messages,
-            indicator-session,
-            indicator-sound,
+Recommends: indicator-application-gtk2,
+            indicator-appmenu-gtk2,
+            indicator-datetime-gtk2,
+            indicator-me-gtk2,
+            indicator-messages-gtk2,
+            indicator-session-gtk2,
+            indicator-sound-gtk2,
 Description: Unity 2D Panel
  The Unity 2D panel displays a top panel containing the application menu and
  various indicators. It is part of Unity 2D and can not run  as a standalone
 
=== 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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +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 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-27 12:33:12 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-27 12:33:15 +0000
@@ -4,13 +4,8 @@
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-<<<<<<< TREE
-pkg_check_modules(INDICATOR REQUIRED indicator)
-pkg_check_modules(DCONFQT REQUIRED dconf-qt)
-=======
 pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
->>>>>>> MERGE-SOURCE
 
 # Sources
 set(unity-2d-private-qml_SRCS
 
=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-27 12:33:12 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-07-27 12:33:15 +0000
@@ -1,5 +1,6 @@
 # Sources
 set(libunity-2d-private_SRCS
+    debug.cpp
     gconnector.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
 
=== 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-07-27 12:33:15 +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-07-27 12:33:15 +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 */
 
=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 12:33:12 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 12:33:15 +0000
@@ -41,30 +41,6 @@
     }
 }
 
-<<<<<<< TREE
-void Unity2dApplication::earlySetup(int& argc, char** argv)
-{
-    // Parts of unity-2d uses GTK so it needs to be initialized
-    gtk_init(&argc, &argv);
-
-    Unity2dDebug::installHandlers();
-
-    /* When the environment variable QT_GRAPHICSSYSTEM is not set, force
-     * graphics system to 'raster' instead of the default 'native' which on X11
-     * is 'XRender'.  'XRender' defaults to using a TrueColor visual. We do
-     * _not_ mimick that behaviour with 'raster' by calling
-     * QApplication::setColorSpec because of bugs where some pixmaps become
-     * blueish or black rectangular artifacts were appearing randomly:
-     *
-     *  https://bugs.launchpad.net/unity-2d/+bug/689877
-     *  https://bugs.launchpad.net/unity-2d/+bug/734143
-     */
-    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
-        QApplication::setGraphicsSystem("raster");
-    }
-}
-
-=======
 static bool arrayContains(char** begin, char** end, const char* string)
 {
     for (char** ptr = begin; ptr != end; ++ptr) {
@@ -105,7 +81,6 @@
     }
 }
 
->>>>>>> MERGE-SOURCE
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
 {
 
=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-06-27 13:40:51 +0000
+++ panel/CMakeLists.txt	2011-07-27 12:33:15 +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-07-27 12:33:12 +0000
+++ panel/app/CMakeLists.txt	2011-07-27 12:33:15 +0000
@@ -12,6 +12,7 @@
     ${GTK_INCLUDE_DIRS}
     ${uqapplets_SOURCE_DIR}
     ${uqapplets_SOURCE_DIR}/common
+    ${UNITYCORE_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 
=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-07-27 12:33:12 +0000
+++ panel/app/main.cpp	2011-07-27 12:33:15 +0000
@@ -22,6 +22,7 @@
 // Local
 #include <config.h>
 #include <panelmanager.h>
+#include <panelstyle.h>
 
 // Unity
 #include <gnomesessionclient.h>
@@ -54,6 +55,9 @@
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
 
+    // 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-07-27 12:33:15 +0000
@@ -24,6 +24,8 @@
 
 // Local
 #include <config.h>
+#include <panelstyle.h>
+#include <indicatorsmanager.h>
 
 // Applets
 #include <appindicator/appindicatorapplet.h>
@@ -42,35 +44,37 @@
 
 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)
+, m_indicatorsManager(new IndicatorsManager(this))
+{
+    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->setEdge(Unity2dPanel::TopEdge);
-    panel->setPalette(getPalette());
     panel->setFixedHeight(24);
 
     int leftmost = QApplication::desktop()->screenNumber(QPoint());
@@ -78,34 +82,16 @@
         panel->addWidget(new HomeButtonApplet);
         panel->addWidget(createSeparator());
     }
-    panel->addWidget(new AppNameApplet);
+    panel->addWidget(new AppNameApplet(m_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(m_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-07-27 12:33:15 +0000
@@ -26,6 +26,7 @@
 #include <QObject>
 #include <QList>
 
+class IndicatorsManager;
 class Unity2dPanel;
 
 class PanelManager : public QObject
@@ -38,8 +39,11 @@
 
 private:
     Q_DISABLE_COPY(PanelManager)
+    IndicatorsManager* m_indicatorsManager;
     QList<Unity2dPanel*> m_panels;
 
+    Unity2dPanel* instantiatePanel(int screen);
+
 private Q_SLOTS:
     void onScreenCountChanged(int newCount);
 };
 
=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-27 12:33:12 +0000
+++ panel/applets/CMakeLists.txt	2011-07-27 12:33:15 +0000
@@ -1,29 +1,11 @@
 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)
-<<<<<<< TREE
-pkg_check_modules(INDICATOR REQUIRED indicator)
-=======
-pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
->>>>>>> MERGE-SOURCE
-
-# Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator3 indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator3 iconsdir)
-configure_file(indicator-config.h.in indicator-config.h)
+pkg_check_modules(PANGO REQUIRED pango)
 
 # Sources
 set(uqapplets_SRCS
@@ -31,13 +13,15 @@
     appindicator/sniitem.cpp
     appname/appnameapplet.cpp
     appname/menubarwidget.cpp
-    appname/registrar.cpp
     appname/windowhelper.cpp
     common/applet.cpp
+    common/indicatorentrywidget.cpp
+    common/indicatorsmanager.cpp
+    common/indicatorwidget.cpp
+    common/panelstyle.cpp
     homebutton/homebuttonapplet.cpp
     homebutton/homebutton.cpp
     indicator/indicatorapplet.cpp
-    indicator/indicator.c
     legacytray/legacytrayapplet.cpp
     legacytray/fdoselectionmanager.cpp
     legacytray/fdotask.cpp
@@ -46,10 +30,6 @@
     legacytray/x11embedpainter.cpp
     )
 
-qt4_add_dbus_adaptor(uqapplets_SRCS appname/com.canonical.AppMenu.Registrar.xml
-    registrar.h Registrar
-    )
-
 qt4_automoc(${uqapplets_SRCS})
 
 # Build
@@ -59,13 +39,15 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/homebutton
     ${CMAKE_CURRENT_SOURCE_DIR}/indicator
+    ${CMAKE_CURRENT_SOURCE_DIR}/unitycore
     ${QTBAMF_INCLUDE_DIRS}
     ${DBUSMENUQT_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
-    ${INDICATOR_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${X11_INCLUDE_DIR}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -77,12 +59,13 @@
     ${DBUSMENUQT_LDFLAGS}
     ${QTBAMF_LDFLAGS}
     ${GTK_LDFLAGS}
-    ${INDICATOR_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${X11_LIBRARIES}
     ${X11_Xrender_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xfixes_LIB}
+    ${UNITYCORE_LDFLAGS}
+    ${PANGO_LDFLAGS}
     unity-2d-private
     )
 
=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-27 12:33:12 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-07-27 12:33:15 +0000
@@ -200,10 +200,10 @@
             q, SLOT(updateWidgets()));
     }
 
-    void setupMenuBarWidget()
+    void setupMenuBarWidget(IndicatorsManager* manager)
     {
-        m_menuBarWidget = new MenuBarWidget(0 /* Window menu */);
-        QObject::connect(m_menuBarWidget, SIGNAL(menuBarChanged()),
+        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 +216,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-07-27 12:33:15 +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>
 
=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-07-27 12:33:12 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-07-27 12:33:15 +0000
@@ -20,312 +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_isMenuOpen(false)
-{
-    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;
-    m_menuBarMonitor = 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()));
-
-    // Watch when the menubar's menus close so that it can be hidden
-    connect(m_menuBarMonitor, SIGNAL(menuBarClosed()), SLOT(slotMenuBarClosed()));
-}
-
-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_isMenuOpen = true;
-        Q_EMIT menuBarChanged();
-        m_menuBar->setActiveAction(action);
-    }
-}
-
-void MenuBarWidget::slotMenuBarClosed()
-{
-    m_isMenuOpen = false;
-    Q_EMIT menuBarChanged();
-}
-
-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_isMenuOpen;
-}
-
-// 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 there is still no menu action active, then menu must be closed.
-    if (!m_widget->m_menuBar->activeAction()) {
-        Q_EMIT 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-27 12:33:12 +0000
+++ panel/applets/appname/menubarwidget.h	2011-07-27 12:33:15 +0000
@@ -23,92 +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()
- * to indicate if the menu was closed or updated.
- */
-class MenuBarClosedHelper : public QObject
-{
-Q_OBJECT
-public:
-    MenuBarClosedHelper(MenuBarWidget*);
-
-Q_SIGNALS:
-    void menuBarClosed();
-
-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 menuBarChanged();
+    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 slotMenuBarClosed();
-    void updateMenuBar();
+    void updateIsEmpty();
 
 private:
     Q_DISABLE_COPY(MenuBarWidget)
 
-    QMenuBar* m_menuBar;
-    MenuBarClosedHelper* m_menuBarMonitor;
-    Registrar* m_registrar;
-    ImporterForWId m_importers;
-    WId m_activeWinId;
-    QMenu* m_windowMenu;
-    QTimer* m_updateMenuBarTimer;
-    bool m_isMenuOpen;
-
-    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/fakecairo.h'
--- panel/applets/common/fakecairo.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/fakecairo.h	2011-07-27 12:33:15 +0000
@@ -0,0 +1,125 @@
+/*
+ * 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 FAKECAIRO_H
+#define FAKECAIRO_H
+
+// NuxCore
+#include <NuxCore/Color.h>
+
+// Qt
+#include <QPainter>
+#include <QPainterPath>
+
+/*
+ * This module attempts to fake Cairo calls using QPainter, making it easier to
+ * port Cairo paint operations to Qt
+ */
+struct fcairo_t
+{
+    fcairo_t(QPainter* _painter)
+    : painter(_painter)
+    {
+        painter->save();
+    }
+
+    ~fcairo_t()
+    {
+        painter->restore();
+    }
+
+    QPainter* painter;
+    QPainterPath path;
+};
+
+inline void fcairo_arc(fcairo_t& cr, qreal xc, qreal yc, qreal radius, qreal angle1, qreal angle2)
+{
+    QRectF rect(xc - radius, yc - radius, radius * 2, radius * 2);
+
+    while (angle2 < angle1) {
+        angle2 += 2 * M_PI;
+    }
+
+    qreal start = (2. - angle1 / M_PI) * 180;
+    qreal stop  = (2. - angle2 / M_PI) * 180;
+    cr.path.arcTo(rect, start, stop - start);
+}
+
+inline void fcairo_move_to(fcairo_t& cr, qreal x, qreal y)
+{
+    cr.path.moveTo(x, y);
+}
+
+inline void fcairo_line_to(fcairo_t& cr, qreal x, qreal y)
+{
+    cr.path.lineTo(x, y);
+}
+
+inline void fcairo_fill_preserve(fcairo_t& cr)
+{
+    cr.painter->fillPath(cr.path, cr.painter->brush());
+}
+
+inline void fcairo_stroke(fcairo_t& cr)
+{
+    QPen pen(cr.painter->brush().color(), 1);
+    cr.painter->strokePath(cr.path, pen);
+    cr.path = QPainterPath();
+}
+
+typedef QGradient fcairo_pattern_t;
+
+inline fcairo_pattern_t* fcairo_pattern_create_linear (qreal x1, qreal y1, qreal x2, qreal y2)
+{
+    return new QLinearGradient(x1, y1, x2, y2);
+}
+
+inline void fcairo_pattern_destroy(fcairo_pattern_t* pattern)
+{
+    delete pattern;
+}
+
+inline void fcairo_pattern_add_color_stop_rgba(fcairo_pattern_t* pattern, qreal offset, qreal r, qreal g, qreal b, qreal a)
+{
+    pattern->setColorAt(offset, QColor::fromRgbF(r, g, b, a));
+}
+
+inline void fcairo_set_source(fcairo_t& cr, fcairo_pattern_t* pattern)
+{
+    cr.painter->setPen(Qt::NoPen);
+    cr.painter->setBrush(*pattern);
+}
+
+inline void fcairo_set_source_rgb(fcairo_t& cr, qreal r, qreal g, qreal b)
+{
+    cr.painter->setBrush(QColor::fromRgbF(r, g, b));
+}
+
+inline nux::color::Color nuxColorFromQColor(const QColor& qColor)
+{
+    nux::color::Color color;
+    color.red = qColor.redF();
+    color.green = qColor.greenF();
+    color.blue = qColor.blueF();
+    color.alpha = qColor.alphaF();
+    return color;
+}
+
+#endif /* FAKECAIRO_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-07-27 12:33:15 +0000
@@ -0,0 +1,388 @@
+/*
+ * 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 <debug_p.h>
+#include <fakecairo.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;
+
+using namespace unity::indicator;
+
+// Copied from libdbusmenu-qt
+static QString swapMnemonicChar(const QString &in, const char src, const char dst)
+{
+    QString out;
+    bool mnemonicFound = false;
+
+    for (int pos = 0; pos < in.length(); ) {
+        QChar ch = in[pos];
+        if (ch == src) {
+            if (pos == in.length() - 1) {
+                // 'src' at the end of string, skip it
+                ++pos;
+            } else {
+                if (in[pos + 1] == src) {
+                    // A real 'src'
+                    out += src;
+                    pos += 2;
+                } else if (!mnemonicFound) {
+                    // We found the mnemonic
+                    mnemonicFound = true;
+                    out += dst;
+                    ++pos;
+                } else {
+                    // We already have a mnemonic, just skip the char
+                    ++pos;
+                }
+            }
+        } else if (ch == dst) {
+            // Escape 'dst'
+            out += dst;
+            out += dst;
+            ++pos;
+        } else {
+            out += ch;
+            ++pos;
+        }
+    }
+
+    return out;
+}
+
+IndicatorEntryWidget::IndicatorEntryWidget(const Entry::Ptr& entry)
+: m_entry(entry)
+, m_padding(PADDING)
+, m_hasIcon(false)
+, m_hasLabel(false)
+{
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+    m_entry->updated.connect(sigc::mem_fun(this, &IndicatorEntryWidget::updatePix));
+    updatePix();
+}
+
+QSize IndicatorEntryWidget::minimumSizeHint() const
+{
+    return sizeHint();
+}
+
+QSize IndicatorEntryWidget::sizeHint() const
+{
+    return m_pix.size();
+}
+
+void IndicatorEntryWidget::paintEvent(QPaintEvent*)
+{
+    if (!m_pix.isNull()) {
+        QPainter painter(this);
+        if (m_entry->active()) {
+            paintActiveBackground(&painter);
+        }
+        painter.drawPixmap(0, 0, m_pix);
+    }
+}
+
+
+void IndicatorEntryWidget::paintActiveBackground(QPainter* painter)
+{
+    // This code should be kept in sync with the draw_menu_bg() function from
+    // plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp
+    int radius = 4;
+    double x = 0;
+    double y = 0;
+    double xos = 0.5;
+    double yos = 0.5;
+    /* FIXME */
+    double mpi = 3.14159265358979323846;
+
+    PanelStyle* style = PanelStyle::instance();
+    nux::color::Color bgtop = nuxColorFromQColor(style->backgroundTopColor());
+    nux::color::Color bgbot = nuxColorFromQColor(style->backgroundBottomColor());
+    nux::color::Color line = nuxColorFromQColor(style->lineColor());
+
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    fcairo_t cr(painter);
+
+    fcairo_move_to (cr, x+xos+radius, y+yos);
+    fcairo_arc (cr, x+xos+width()-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
+    fcairo_line_to (cr, x+xos+width()-xos*2, y+yos+height()-yos*2+2);
+    fcairo_line_to (cr, x+xos, y+yos+height()-yos*2+2);
+    fcairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
+
+    fcairo_pattern_t * pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+2);
+    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
+                                     bgtop.red,
+                                     bgtop.green,
+                                     bgtop.blue,
+                                     1.0f - bgbot.red);
+    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
+                                     bgbot.red,
+                                     bgbot.green,
+                                     bgbot.blue,
+                                     1.0f - bgtop.red);
+    fcairo_set_source (cr, pat);
+    fcairo_fill_preserve (cr);
+    fcairo_pattern_destroy (pat);
+
+    /*
+    pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+2);
+    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
+                                     line.red,
+                                     line.green,
+                                     line.blue,
+                                     1.0f);
+    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
+                                     line.red,
+                                     line.green,
+                                     line.blue,
+                                     1.0f);
+    fcairo_set_source (cr, pat);
+    */
+    fcairo_set_source_rgb (cr, line.red, line.green, line.blue);
+    fcairo_stroke (cr);
+    //fcairo_pattern_destroy (pat);
+
+    xos++;
+    yos++;
+
+    /* enlarging the area to not draw the lightborder at bottom, ugly trick :P */
+    fcairo_move_to (cr, x+radius+xos, y+yos);
+    fcairo_arc (cr, x+xos+width()-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
+    fcairo_line_to (cr, x+xos+width()-xos*2, y+yos+height()-yos*2+3);
+    fcairo_line_to (cr, x+xos, y+yos+height()-yos*2+3);
+    fcairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
+
+    /*
+    pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+3);
+    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
+                                     bgbot.red,
+                                     bgbot.green,
+                                     bgbot.blue,
+                                     1.0f);
+    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
+                                     bgbot.red,
+                                     bgbot.green,
+                                     bgbot.blue,
+                                     1.0f);
+    fcairo_set_source (cr, pat);
+    */
+    fcairo_set_source_rgb (cr, bgbot.red, bgbot.green, bgbot.blue);
+    fcairo_stroke (cr);
+    //fcairo_pattern_destroy (pat);
+}
+
+void IndicatorEntryWidget::updatePix()
+{
+    bool oldIsEmpty = isEmpty();
+
+    int width = m_padding;
+    int iconX = m_padding;
+    int labelX = 0;
+
+    // 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();
+    }
+
+    QString label = QString::fromUtf8(m_entry->label().c_str());
+    label = swapMnemonicChar(label, '_', '&');
+    m_hasLabel = !label.isEmpty() && m_entry->label_visible();
+    if (m_hasLabel) {
+        if (m_hasIcon) {
+            width += SPACING;
+        }
+        labelX = width;
+        QString visibleLabel = label;
+        visibleLabel.remove('&');
+        width += fontMetrics().width(visibleLabel);
+    }
+
+    width += m_padding;
+
+    // Paint
+    QPixmap oldPix = m_pix;
+    if (!m_hasIcon && !m_hasLabel) {
+        m_pix = QPixmap();
+    } else {
+        m_pix = QPixmap(width, 24);
+        m_pix.fill(Qt::transparent);
+        QPainter painter(&m_pix);
+        painter.initFrom(this);
+        if (m_hasIcon) {
+            bool disabled = !m_entry->image_sensitive();
+            if (disabled) {
+                painter.setOpacity(0.5);
+            }
+            painter.drawPixmap(iconX, 0, iconPix);
+            if (disabled) {
+                painter.setOpacity(1);
+            }
+        }
+        if (m_hasLabel) {
+            PanelStyle* style = PanelStyle::instance();
+
+            int flags = Qt::AlignLeft | Qt::AlignVCenter;
+            flags |= m_entry->show_now() ? Qt::TextShowMnemonic : Qt::TextHideMnemonic;
+
+            // Shadow
+            QColor color = style->textShadowColor();
+            color.setAlphaF(1. - color.redF());
+            painter.setPen(color);
+            painter.drawText(labelX, 1, width - labelX, m_pix.height(), flags, label);
+
+            // Text
+            color = style->textColor();
+            color.setAlphaF(m_entry->label_sensitive() ? 1. : .5);
+            painter.setPen(color);
+            painter.drawText(labelX, 0, width - labelX, m_pix.height(), flags, label);
+        }
+    }
+
+    // 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);
+    }
+}
+
+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(24, 24);
+    } else if (type == GTK_IMAGE_GICON) {
+        UQ_WARNING << "FIXME: Implement support for GTK_IMAGE_GICON image type";
+    } 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-07-27 12:33:15 +0000
@@ -0,0 +1,81 @@
+/*
+ * 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>
+
+class QPainter;
+
+class IndicatorEntryWidget : public QWidget, public sigc::trackable
+{
+Q_OBJECT
+public:
+    IndicatorEntryWidget(const unity::indicator::Entry::Ptr& entry);
+
+    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 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;
+    void updatePix();
+    QPixmap decodeIcon();
+    void paintActiveBackground(QPainter*);
+};
+
+#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-07-27 12:33:15 +0000
@@ -0,0 +1,176 @@
+/*
+ * 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_geometrySyncTimer->setInterval(0);
+    m_geometrySyncTimer->setSingleShot(true);
+    connect(m_geometrySyncTimer, SIGNAL(timeout()), SLOT(syncGeometries()));
+
+    m_indicators->on_entry_show_menu.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onEntryShowMenu)
+        );
+
+    m_indicators->on_menu_pointer_moved.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onMenuPointerMoved)
+        );
+
+    m_indicators->on_entry_activate_request.connect(
+        sigc::mem_fun(this, &IndicatorsManager::onEntryActivateRequest)
+        );
+
+    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::onMenuPointerMoved(int posX, int posY)
+{
+    QWidget* widget = QApplication::widgetAt(posX, posY);
+    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::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-07-27 12:33:15 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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();
+
+private:
+    Q_DISABLE_COPY(IndicatorsManager)
+    unity::indicator::DBusIndicators::Ptr m_indicators;
+    QTimer* m_geometrySyncTimer;
+
+    typedef QList<IndicatorEntryWidget*> IndicatorEntryWidgetList;
+    IndicatorEntryWidgetList m_widgetList;
+
+    void onSynced();
+    void onEntryShowMenu(const std::string&, int x, int y, int timestamp, int button);
+    void onMenuPointerMoved(int x, int y);
+    void onEntryActivateRequest(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-07-27 12:33:15 +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-07-27 12:33:15 +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-07-27 12:33:15 +0000
@@ -0,0 +1,175 @@
+/*
+ * 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 <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
+
+// Qt
+#include <QApplication>
+#include <QColor>
+#include <QFont>
+#include <QPalette>
+
+// GTK
+#include <gtk/gtk.h>
+#include <pango/pango.h>
+
+typedef void (*ColorGetter)(GtkStyleContext*, GtkStateFlags, GdkRGBA*);
+
+inline QColor colorFromContext(ColorGetter getter, GtkStyleContext* context, GtkStateFlags state)
+{
+    GdkRGBA color;
+    getter(context, state, &color);
+    return QColor::fromRgbF(color.red, color.green, color.blue, color.alpha);
+}
+
+class PanelStylePrivate
+{
+public:
+    PanelStyle* q;
+    GtkWidget* m_offScreenWindow;
+    GConnector m_gConnector;
+
+    QColor m_textColor;
+    QColor m_backgroundTopColor;
+    QColor m_backgroundBottomColor;
+    QColor m_textShadowColor;
+    QColor m_lineColor;
+    QFont m_font;
+
+    static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
+    {
+        PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
+        priv->updatePalette();
+    }
+
+    static void onFontChanged(GObject*, GParamSpec*, gpointer data)
+    {
+        PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
+        priv->updateFont();
+    }
+
+    void updatePalette()
+    {
+        GtkStyleContext* context = gtk_widget_get_style_context(m_offScreenWindow);
+        UQ_RETURN_IF_FAIL(context);
+
+        m_textColor             = colorFromContext(gtk_style_context_get_color, context, GTK_STATE_FLAG_NORMAL);
+        m_textShadowColor       = colorFromContext(gtk_style_context_get_color, context, GTK_STATE_FLAG_SELECTED);
+        m_lineColor             = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_NORMAL).darker(130);
+        m_backgroundTopColor    = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_ACTIVE);
+        m_backgroundBottomColor = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_NORMAL);
+
+        QPalette pal;
+        pal.setColor(QPalette::Window, m_backgroundTopColor);
+        pal.setColor(QPalette::Button, m_backgroundTopColor);
+        pal.setColor(QPalette::Text, m_textColor);
+        pal.setColor(QPalette::WindowText, m_textColor);
+        pal.setColor(QPalette::ButtonText, m_textColor);
+        QApplication::setPalette(pal);
+    }
+
+    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());
+
+        m_font = QFont(
+            pango_font_description_get_family(fontDescription.data()),
+            size / PANGO_SCALE
+            );
+
+        QApplication::setFont(m_font);
+    }
+};
+
+PanelStyle::PanelStyle(QObject* parent)
+: d(new PanelStylePrivate)
+{
+    d->q = this;
+    d->m_offScreenWindow = gtk_offscreen_window_new();
+    gtk_widget_set_name(d->m_offScreenWindow, "UnityPanelWidget");
+    gtk_widget_set_size_request(d->m_offScreenWindow, 100, 24);
+    gtk_style_context_add_class(gtk_widget_get_style_context(d->m_offScreenWindow), "menubar");
+    gtk_widget_show_all(d->m_offScreenWindow);
+
+    d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name",
+        G_CALLBACK(PanelStylePrivate::onThemeChanged), d);
+    d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
+        G_CALLBACK(PanelStylePrivate::onFontChanged), d);
+
+    d->updatePalette();
+    d->updateFont();
+}
+
+PanelStyle::~PanelStyle()
+{
+    gtk_widget_destroy(d->m_offScreenWindow);
+    delete d;
+}
+
+PanelStyle* PanelStyle::instance()
+{
+    static PanelStyle style;
+    return &style;
+}
+
+QColor PanelStyle::textColor() const
+{
+    return d->m_textColor;
+}
+
+QColor PanelStyle::backgroundTopColor() const
+{
+    return d->m_backgroundTopColor;
+}
+
+QColor PanelStyle::backgroundBottomColor() const
+{
+    return d->m_backgroundBottomColor;
+}
+
+QColor PanelStyle::textShadowColor() const
+{
+    return d->m_textShadowColor;
+}
+
+QColor PanelStyle::lineColor() const
+{
+    return d->m_lineColor;
+}
+
+QFont PanelStyle::font() const
+{
+    return d->m_font;
+}
+
+#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-07-27 12:33:15 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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 QColor;
+class QFont;
+
+class PanelStylePrivate;
+/**
+ * Provides easy access to panel colors
+ */
+class PanelStyle : public QObject
+{
+    Q_OBJECT
+public:
+    PanelStyle(QObject* parent = 0);
+    ~PanelStyle();
+
+    static PanelStyle* instance();
+
+    QColor textColor() const;
+    QColor backgroundTopColor() const;
+    QColor backgroundBottomColor() const;
+    QColor textShadowColor() const;
+    QColor lineColor() const;
+
+    QFont font() const;
+
+private:
+    friend class PanelStylePrivate;
+    // Use a pimpl to avoid the need for gtk includes here
+    PanelStylePrivate* const d;
+};
+
+#endif /* PANELSTYLE_H */
 
=== 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/indicator.c'
--- panel/applets/indicator/indicator.c	2011-07-27 12:33:12 +0000
+++ panel/applets/indicator/indicator.c	1970-01-01 00:00:00 +0000
@@ -1,526 +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 <gtk/gtkx.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);
-
-	gpointer array[2];
-	array[0] = entry;
-	array[1] = NULL;
-
-	gtk_container_foreach(GTK_CONTAINER(menubar), entry_moved_find_cb, array);
-	if (array[1] == NULL) {
-		g_warning("Moving an entry that isn't in our menus.");
-		return;
-	}
-
-	GtkWidget * mi = GTK_WIDGET(array[1]);
-	g_object_ref(G_OBJECT(mi));
-	gtk_container_remove(GTK_CONTAINER(menubar), mi);
-
-	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), mi, position.menupos);
-
-	g_object_unref(G_OBJECT(mi));
-
-	return;
-}
-
-static gboolean
-load_module (const gchar * name, GtkWidget * menubar)
-{
-	g_debug("Looking at Module: %s", name);
-	g_return_val_if_fail(name != NULL, FALSE);
-
-	if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
-		return FALSE;
-	}
-
-	g_debug("Loading Module: %s", name);
-
-	/* Build the object for the module */
-	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
-	IndicatorObject * io = indicator_object_new_from_file(fullpath);
-	g_free(fullpath);
-	g_return_val_if_fail(io != NULL, FALSE);
-
-	/* Attach the 'name' to the object */
-	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
-
-	/* Connect to its signals */
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menubar);
-
-	/* Work on the entries */
-	GList * entries = indicator_object_get_entries(io);
-	GList * entry = NULL;
-
-	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
-		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
-		entry_added(io, entrydata, menubar);
-	}
-
-	g_list_free(entries);
-
-	return TRUE;
-}
-// </indicator-applet-copy>
-
-
-/* prototypes */
-static gboolean
-on_menu_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indicator);
-
-IndicatorPlugin *
-indicator_new ()
-{
-  IndicatorPlugin   *indicator;
-  GtkOrientation  orientation;
-  gint indicators_loaded = 0;
-
-  /* Hack! prevent the appmenu indicator from swallowing our own menubar */
-  setenv("APPMENU_DISPLAY_BOTH", "1");
-
-  /* allocate memory for the plugin structure */
-  indicator = g_new (IndicatorPlugin, 1);
-
-  indicator->container = gtk_plug_new(0);
-  
-  /* Init some theme/icon stuff */
-  g_object_set (gtk_settings_get_default(), "gtk-theme-name", "Ambiance", NULL);
-  g_object_set (gtk_settings_get_default(), "gtk-icon-theme-name", "ubuntu-mono-dark", NULL);
-  gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-                                  INDICATOR_ICONS_DIR);
-  gtk_rc_parse_string (
-    "widget \"indicator-applet*\" style \"panel\"\n"
-    "style \"indicator-applet-style\"\n"
-    "{\n"
-    "    GtkMenuBar::shadow-type = none\n"
-    "    GtkMenuBar::internal-padding = 0\n"
-    "    GtkWidget::focus-line-width = 0\n"
-    "    GtkWidget::focus-padding = 0\n"
-    "}\n"
-    "style \"indicator-applet-menubar-style\"\n"
-    "{\n"
-    "    GtkMenuBar::shadow-type = none\n"
-    "    GtkMenuBar::internal-padding = 0\n"
-    "    GtkWidget::focus-line-width = 0\n"
-    "    GtkWidget::focus-padding = 0\n"
-    "    GtkMenuItem::horizontal-padding = 0\n"
-    "}\n"
-    "style \"indicator-applet-menuitem-style\"\n"
-    "{\n"
-    "    GtkWidget::focus-line-width = 0\n"
-    "    GtkWidget::focus-padding = 0\n"
-    "    GtkMenuItem::horizontal-padding = 0\n"
-    "}\n"
-    "widget \"*.indicator-applet\" style \"indicator-applet-style\""
-    "widget \"*.indicator-applet-menuitem\" style \"indicator-applet-menuitem-style\""
-    "widget \"*.indicator-applet-menubar\" style \"indicator-applet-menubar-style\"");
-  gtk_widget_set_name(GTK_WIDGET (indicator->container), "indicator-applet");
-  /* create some panel widgets */
-  
-  /* Build menu */
-  indicator->menu = gtk_menu_bar_new();
-  gtk_widget_set_can_focus(GTK_WIDGET (indicator->menu), TRUE);
-  gtk_widget_set_name(GTK_WIDGET (indicator->menu), "indicator-applet-menubar");
-  g_signal_connect(indicator->menu, "button-press-event", G_CALLBACK(on_menu_press), NULL);
-  //g_signal_connect_after(indicator->menu, "expose-event", G_CALLBACK(menu_on_expose), menu);
-  gtk_container_set_border_width(GTK_CONTAINER(indicator->menu), 0);
-
-  /* load 'em */
-  if (!g_file_test(INDICATOR_DIR, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-    g_warning ("%s does not exist, cannot read any indicators", INDICATOR_DIR);
-  } else {
-    GDir        *dir;
-    const gchar *name;
-
-    dir = g_dir_open(INDICATOR_DIR, 0, NULL);
-    while ((name = g_dir_read_name (dir)) != NULL) {
-      if (g_strcmp0(name, "libappmenu.so") == 0) {
-        continue;
-      }
-
-      if (load_module(name, indicator->menu)) {
-        indicators_loaded++;
-      } else {
-        g_warning("Failed to load module %s", name);
-      }
-    }
-    g_dir_close(dir);
-  }
-
-  if (indicators_loaded == 0) {
-    /* A label to allow for click through */
-    indicator->item = gtk_button_new();
-    gtk_button_set_label(GTK_BUTTON(indicator->item), "No Indicators");
-    gtk_widget_show(indicator->item);
-    gtk_container_add (GTK_CONTAINER (indicator->container), indicator->item);
-  } else {
-    gtk_widget_show(indicator->menu);
-    gtk_container_add (GTK_CONTAINER (indicator->container), indicator->menu);
-  }
-  return indicator;
-}
-
-
-
-void
-indicator_free (IndicatorPlugin    *indicator)
-{
-  g_free(indicator);
-}
-
-
-#if 0
-static gboolean
-indicator_size_changed (XfcePanelPlugin *plugin,
-                     gint             size,
-                     IndicatorPlugin    *indicator)
-{
-  GtkOrientation orientation;
-
-  /* get the orientation of the plugin */
-  orientation = xfce_panel_plugin_get_orientation (plugin);
-
-  /* set the widget size */
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, size);
-  else
-    gtk_widget_set_size_request (GTK_WIDGET (plugin), size, -1);
-
-  /* we handled the orientation */
-  return TRUE;
-}
-#endif
-
-
-static gboolean
-on_menu_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indicator)
-{
-    if (indicator != NULL && event->button == 1) /* left click only */
-    {
-     /*   gtk_menu_popup (GTK_MENU(indicator->menu), NULL, NULL, NULL, NULL, 0,
-                        event->time);*/
-        return TRUE;
-    }
-    return FALSE ;
-}
 
=== removed file 'panel/applets/indicator/indicator.h'
--- panel/applets/indicator/indicator.h	2011-06-22 14:49:34 +0000
+++ panel/applets/indicator/indicator.h	1970-01-01 00:00:00 +0000
@@ -1,45 +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.
- */
-
-#ifndef __INDICATOR_H__
-#define __INDICATOR_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-/* plugin structure */
-typedef struct _IndicatorPlugin
-{
-    GtkWidget       *container;
-    /* panel widgets */
-    GtkWidget       *menu; 
-    GtkWidget       *item;
-
-    /* indicator settings */
-}
-IndicatorPlugin;
-
-IndicatorPlugin *
-indicator_new ();
-
-void
-indicator_free(IndicatorPlugin*);
-
-G_END_DECLS
-
-#endif /* !__INDICATOR_H__ */
 
=== removed file 'panel/applets/indicator/indicatorapplet.cpp'
--- panel/applets/indicator/indicatorapplet.cpp	2011-07-27 12:33:12 +0000
+++ panel/applets/indicator/indicatorapplet.cpp	1970-01-01 00:00:00 +0000
@@ -1,77 +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 "indicatorapplet.h"
-
-// Local
-#include "debug_p.h"
-#include "indicator.h"
-
-// Qt
-#include <QHBoxLayout>
-#include <QTimer>
-#include <QX11EmbedContainer>
-
-// Gtk
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
-
-IndicatorApplet::IndicatorApplet()
-{
-    setupUi();
-}
-
-void IndicatorApplet::setupUi()
-{
-    m_menuBar = new QMenuBar;
-    m_menuBar->setNativeMenuBar(false);
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(m_menuBar);
-
-    QMetaObject::invokeMethod(this, "createGtkIndicator", Qt::QueuedConnection);
-}
-
-void IndicatorApplet::createGtkIndicator()
-{
-    m_container = new QX11EmbedContainer;
-    layout()->addWidget(m_container);
-
-    m_gtkIndicator = indicator_new();
-    m_container->embedClient(gtk_plug_get_id(GTK_PLUG(m_gtkIndicator->container)));
-    gtk_widget_show(m_gtkIndicator->container);
-
-    QTimer* timer = new QTimer(this);
-    timer->setInterval(1000);
-    timer->setSingleShot(false);
-    connect(timer, SIGNAL(timeout()), SLOT(adjustGtkIndicatorSize()));
-    timer->start();
-}
-
-void IndicatorApplet::adjustGtkIndicatorSize()
-{
-    GtkRequisition minimum, natural;
-    gtk_widget_get_preferred_size(m_gtkIndicator->menu, &minimum, &natural);
-    m_container->setFixedWidth(minimum.width);
-}
-
-#include "indicatorapplet.moc"
 
=== removed file 'panel/applets/indicator/indicatorapplet.h'
--- panel/applets/indicator/indicatorapplet.h	2011-07-27 12:33:12 +0000
+++ panel/applets/indicator/indicatorapplet.h	1970-01-01 00:00:00 +0000
@@ -1,57 +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 INDICATORAPPLET_H
-#define INDICATORAPPLET_H
-
-// Local
-#include <applet.h>
-
-// Qt
-#include <QDBusInterface>
-#include <QMenuBar>
-
-class QX11EmbedContainer;
-
-struct _IndicatorPlugin;
-
-class IndicatorApplet : public Unity2d::Applet
-{
-Q_OBJECT
-public:
-    IndicatorApplet();
-
-private Q_SLOTS:
-    void createGtkIndicator();
-    void adjustGtkIndicatorSize();
-
-private:
-    Q_DISABLE_COPY(IndicatorApplet)
-
-    QDBusInterface* m_watcher;
-    QMenuBar* m_menuBar;
-    QX11EmbedContainer* m_container;
-    struct _IndicatorPlugin* m_gtkIndicator;
-
-    void setupUi();
-};
-
-#endif /* INDICATORAPPLET_H */
 
=== removed directory 'panel/artwork'
=== removed file 'panel/artwork/background.png'
 Binary files panel/artwork/background.png	2010-11-23 16:13:46 +0000 and panel/artwork/background.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'panel/artwork/divider.png'
 Binary files panel/artwork/divider.png	2010-11-23 16:13:46 +0000 and panel/artwork/divider.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	2011-07-04 23:07:20 +0000
+++ places/HomeShortcuts.qml	2011-07-27 12:33:15 +0000
@@ -58,9 +58,9 @@
         contentType: "x-scheme-handler/http"
     }
 
-    HomeButtonApplication {
+    HomeButtonDefaultApplication {
         label: u2d.tr("View Photos")
-        desktopFile: "shotwell.desktop"
+        contentType: "image/jpeg"
     }
 
     HomeButtonDefaultApplication {
@@ -68,9 +68,9 @@
         contentType: "x-scheme-handler/mailto"
     }
 
-    HomeButtonApplication {
+    HomeButtonDefaultApplication {
         label: u2d.tr("Listen to Music")
-        key: "/desktop/gnome/applications/media/exec"
+        contentType: "audio/x-vorbis+ogg"
     }
 }