Merge lp:~rodrigo-moya/unity/sync-geometries into lp:unity

[Rodrigo Moya]

Sync geometries of the indicators from unity to the panel service, so that that information can be used to implement AtkComponent for both PanelIndicatorAccessible and PanelIndicatorEntryAccessible

[Rodrigo Moya (rodrigo-moya)]

Note that there's something wrong with the geometries, and not all indicator objects/entries get highlighted in the correct position when selected in accerciser

[Alejandro Piñeiro (apinheiro)]

I have tested it with accerciser, and about this comment:
"Note that there's something wrong with the geometries, and not all indicator objects/entries get highlighted in the correct position when selected in accerciser"

I only got one indicator object/entry having the proper position.

About the code, in general seems good, although it would be required a review of the non accessibility related code (the methods and signals used by the AtkComponent implementation) except in one detail:

149 +panel_indicator_accessible_get_extents (AtkComponent *component,
150 + gint *x,
151 + gint *y,
152 + gint *width,
153 + gint *height,
154 + AtkCoordType coord_type)

309 +panel_indicator_entry_accessible_get_extents (AtkComponent *component,
310 + gint *x,
311 + gint *y,
312 + gint *width,
313 + gint *height,
314 + AtkCoordType coord_type)

You don't check coord_type at all. Take into account that the data that you return are totally different depending on coord_type. As far as I see, in both cases you try to return the result assuming global screen positions (ATK_XY_SCREEN), so it is missing the ATK_XY_WINDOW

In the same way, taking into account that you are already using the signal geometries_changed, I think that it would be easy to also emit the signal "bounds-changed":

http://library.gnome.org/devel/atk/stable/AtkComponent.html#AtkComponent-bounds-changed

BTW, about the signals. Each time that you receive this signal the size is updated, but, what happen with the initial state? Initially this is set to zero. That means that if the indicators/entry has already his position/size set before the accessible object is created, it will have a wrong position/size value? (as it is not updated by the signal)?

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

BTW, although we already commented that via IRC, just to comment that the gen-marshal addition on cmake seems to not work properly, as I needed to execute it by hand.

[Rodrigo Moya (rodrigo-moya)]

All issues fixed, so please review again

[Alejandro Piñeiro (apinheiro)]

519 + root = atk_get_root ();
520 +
521 gtk_main ();

This get_root could mean a crash if the a11y is not enabled. So options:

a) Add a method on panel-a11y to check if the accessibility is enabled.
b) Move this call inside panel_a11y_init. As it is required that the service is created to this root, that would mean move panel_a11y_init to the line of this atk_get_root

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

Code seems ok, and I tested it and the position is more accurate.

Anyway:

 * Be careful with the .pot file included on this branch
 * I'm not used to cmake and you modify non-a11y related code, so it would be good to have a second opinion here

review: Approve

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Neil gave his +1 on irc

review: Approve

=== added file 'po/unity.pot'
--- po/unity.pot	1970-01-01 00:00:00 +0000
+++ po/unity.pot	2011-03-17 12:04:28 +0000
@@ -0,0 +1,69 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical\ Ltd
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-02-21 19:06+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Keep In Launcher"
+msgstr ""
+
+msgid "Quit"
+msgstr ""
+
+msgid "Open"
+msgstr ""
+
+msgid "Eject"
+msgstr ""
+
+msgid "Workspace Switcher"
+msgstr ""
+
+msgid "Find Media Apps"
+msgstr ""
+
+msgid "Find Internet Apps"
+msgstr ""
+
+msgid "Find More Apps"
+msgstr ""
+
+msgid "Find Files"
+msgstr ""
+
+msgid "Browse the Web"
+msgstr ""
+
+msgid "View Photos"
+msgstr ""
+
+msgid "Check Email"
+msgstr ""
+
+msgid "Listen to Music"
+msgstr ""
+
+msgid "Trash"
+msgstr ""
+
+msgid "Empty Trash"
+msgstr ""
+
+msgid "Empty all items from Trash?"
+msgstr ""
+
+msgid "All items in the Trash will be permanently deleted."
+msgstr ""
 
=== removed file 'po/unity.pot'
--- po/unity.pot	2011-02-22 13:14:15 +0000
+++ po/unity.pot	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical\ Ltd
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-02-21 19:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Keep In Launcher"
-msgstr ""
-
-msgid "Quit"
-msgstr ""
-
-msgid "Open"
-msgstr ""
-
-msgid "Eject"
-msgstr ""
-
-msgid "Workspace Switcher"
-msgstr ""
-
-msgid "Find Media Apps"
-msgstr ""
-
-msgid "Find Internet Apps"
-msgstr ""
-
-msgid "Find More Apps"
-msgstr ""
-
-msgid "Find Files"
-msgstr ""
-
-msgid "Browse the Web"
-msgstr ""
-
-msgid "View Photos"
-msgstr ""
-
-msgid "Check Email"
-msgstr ""
-
-msgid "Listen to Music"
-msgstr ""
-
-msgid "Trash"
-msgstr ""
-
-msgid "Empty Trash"
-msgstr ""
-
-msgid "Empty all items from Trash?"
-msgstr ""
-
-msgid "All items in the Trash will be permanently deleted."
-msgstr ""
 
=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2011-02-24 14:51:30 +0000
+++ services/CMakeLists.txt	2011-03-17 12:04:28 +0000
@@ -7,6 +7,30 @@
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+set(PANEL_SOURCES
+    panel-a11y.c
+    panel-a11y.h
+    panel-indicator-accessible.c
+    panel-indicator-accessible.h
+    panel-indicator-entry-accessible.c
+    panel-indicator-entry-accessible.h
+    panel-main.c
+    ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
+    panel-root-accessible.c
+    panel-root-accessible.h
+    panel-service.c
+    panel-service.h
+    panel-util-accessible.c
+    panel-util-accessible.h)
+
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
+  COMMAND ${GLIB_GENMARSHAL} ARGS panel-marshal.list --body --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
+  COMMAND ${GLIB_GENMARSHAL} ARGS panel-marshal.list --header --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.h
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS panel-marshal.list
+  COMMENT "Generating marshallers")
+
 set(CFLAGS
     ${SERVICE_DEPS_CFLAGS}
     ${SERVICE_DEPS_CFLAGS_OTHER}
@@ -24,21 +48,7 @@
 set(LIB_PATHS ${SERVICE_DEPS_LIBRARY_DIRS})
 link_directories(${LIB_PATHS})
 
-add_executable(unity-panel-service
-               panel-a11y.c
-               panel-a11y.h
-               panel-indicator-accessible.c
-               panel-indicator-accessible.h
-               panel-indicator-entry-accessible.c
-               panel-indicator-entry-accessible.h
-               panel-main.c
-               panel-root-accessible.c
-               panel-root-accessible.h
-               panel-service.c
-               panel-service.h
-               panel-util-accessible.c
-               panel-util-accessible.h
-              )
+add_executable(unity-panel-service ${PANEL_SOURCES})
 install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
 
 configure_file(com.canonical.Unity.Panel.Service.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service)
 
=== modified file 'services/panel-a11y.c'
--- services/panel-a11y.c	2011-02-28 15:51:27 +0000
+++ services/panel-a11y.c	2011-03-17 12:04:28 +0000
@@ -127,6 +127,7 @@
 void
 panel_a11y_init (void)
 {
+  AtkObject *root;
   gchar *bridge_path = NULL;
 
   if (a11y_initialized)
@@ -150,5 +151,10 @@
 
   g_free (bridge_path);
 
+  /* There might be cases when we start signalling about change of geometries but the
+     accessible objects are not yet created, so to avoid that, instantiate here the
+     A11Y root object, which will create them all */
+  root = atk_get_root ();
+
   a11y_initialized = TRUE;
 }
 
=== modified file 'services/panel-indicator-accessible.c'
--- services/panel-indicator-accessible.c	2011-03-14 17:01:34 +0000
+++ services/panel-indicator-accessible.c	2011-03-17 12:04:28 +0000
@@ -19,12 +19,11 @@
 #include <glib/gi18n.h>
 #include "panel-indicator-accessible.h"
 #include "panel-indicator-entry-accessible.h"
-
-G_DEFINE_TYPE(PanelIndicatorAccessible, panel_indicator_accessible, ATK_TYPE_OBJECT)
-
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_INDICATOR_ACCESSIBLE, PanelIndicatorAccessiblePrivate))
+#include "panel-service.h"
 
 /* AtkObject methods */
+static void         pia_component_interface_init              (AtkComponentIface *iface);
+
 static void         panel_indicator_accessible_initialize     (AtkObject *accessible, gpointer data);
 static gint         panel_indicator_accessible_get_n_children (AtkObject *accessible);
 static AtkObject   *panel_indicator_accessible_ref_child      (AtkObject *accessible, gint i);
@@ -33,9 +32,21 @@
 struct _PanelIndicatorAccessiblePrivate
 {
   IndicatorObject *indicator;
+  PanelService *service;
   GSList *a11y_children;
+  gint x;
+  gint y;
+  gint width;
+  gint height;
 };
 
+G_DEFINE_TYPE_WITH_CODE(PanelIndicatorAccessible,
+			panel_indicator_accessible,
+			ATK_TYPE_OBJECT,
+			G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, pia_component_interface_init))
+
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_INDICATOR_ACCESSIBLE, PanelIndicatorAccessiblePrivate))
+
 /* Indicator callbacks */
 
 static void
@@ -100,6 +111,64 @@
 }
 
 static void
+on_geometries_changed_cb (PanelService *service,
+			  IndicatorObject *object,
+			  IndicatorObjectEntry *entry,
+			  gint x,
+			  gint y,
+			  gint width,
+			  gint height,
+			  gpointer user_data)
+{
+  PanelIndicatorAccessible *pia;
+  AtkRectangle rect;
+  GSList *l;
+  gboolean minimum_set = FALSE;
+
+  pia = PANEL_INDICATOR_ACCESSIBLE (user_data);
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (pia));
+
+  if (object != pia->priv->indicator)
+    return;
+
+  /* Iterate over all children to get width and height */
+  pia->priv->width = pia->priv->height = 0;
+
+  for (l = pia->priv->a11y_children; l != NULL; l = l->next)
+    {
+      gint e_x, e_y, e_width, e_height;
+      AtkObject *accessible = ATK_OBJECT (l->data);
+
+      atk_component_get_extents (ATK_COMPONENT (accessible), &e_x, &e_y, &e_width, &e_height, ATK_XY_SCREEN);
+      if (minimum_set)
+        {
+          if (e_x < pia->priv->x)
+            pia->priv->x = e_x;
+          if (e_y < pia->priv->y)
+            pia->priv->y = e_y;
+	}
+      else
+        {
+	  pia->priv->x = e_x;
+	  pia->priv->y = e_y;
+	  minimum_set = TRUE;
+	}
+
+      pia->priv->width += e_width;
+      if (e_height > pia->priv->height)
+	pia->priv->height = e_height;
+    }
+
+  /* Notify ATK objects of change of coordinates */
+  rect.x = pia->priv->x;
+  rect.y = pia->priv->y;
+  rect.width = pia->priv->width;
+  rect.height = pia->priv->height;
+  g_signal_emit_by_name (ATK_COMPONENT (pia), "bounds-changed", &rect);
+}
+
+static void
 panel_indicator_accessible_finalize (GObject *object)
 {
   PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (object);
@@ -122,6 +191,8 @@
 	  pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
 	  g_object_unref (accessible);
 	}
+
+      g_signal_handlers_disconnect_by_func (pia->priv->service, on_geometries_changed_cb, pia);
     }
 
   G_OBJECT_CLASS (panel_indicator_accessible_parent_class)->finalize (object);
@@ -152,6 +223,12 @@
 {
   pia->priv = GET_PRIVATE (pia);
   pia->priv->a11y_children = NULL;
+  pia->priv->x = pia->priv->y = pia->priv->width = pia->priv->height = 0;
+
+  /* Set up signals for listening to service changes */
+  pia->priv->service = panel_service_get_default ();
+  g_signal_connect (pia->priv->service, "geometries-changed",
+		    G_CALLBACK (on_geometries_changed_cb), pia);
 }
 
 AtkObject *
@@ -168,6 +245,36 @@
 /* Implementation of AtkObject methods */
 
 static void
+panel_indicator_accessible_get_extents (AtkComponent *component,
+					gint *x,
+					gint *y,
+					gint *width,
+					gint *height,
+					AtkCoordType coord_type)
+{
+  PanelIndicatorAccessible *pia;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (component));
+
+  pia = PANEL_INDICATOR_ACCESSIBLE (component);
+
+  /* We ignore AtkCoordType for now, as the panel is always at the top left
+     corner and so relative and absolute coordinates are the same */
+  *x = pia->priv->x;
+  *y = pia->priv->y;
+  *width = pia->priv->width;
+  *height = pia->priv->height;
+}
+
+static void
+pia_component_interface_init (AtkComponentIface *iface)
+{
+  g_return_if_fail (iface != NULL);
+
+  iface->get_extents = panel_indicator_accessible_get_extents;
+}
+
+static void
 panel_indicator_accessible_initialize (AtkObject *accessible, gpointer data)
 {
   PanelIndicatorAccessible *pia;
 
=== modified file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	2011-03-14 16:46:04 +0000
+++ services/panel-indicator-entry-accessible.c	2011-03-17 12:04:28 +0000
@@ -19,11 +19,9 @@
 #include "panel-indicator-entry-accessible.h"
 #include "panel-service.h"
 
-G_DEFINE_TYPE(PanelIndicatorEntryAccessible, panel_indicator_entry_accessible, ATK_TYPE_OBJECT)
-
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessiblePrivate))
-
 /* AtkObject methods */
+static void         piea_component_interface_init                   (AtkComponentIface *iface);
+
 static void         panel_indicator_entry_accessible_initialize     (AtkObject *accessible, gpointer data);
 static gint         panel_indicator_entry_accessible_get_n_children (AtkObject *accessible);
 static AtkObject   *panel_indicator_entry_accessible_ref_child      (AtkObject *accessible, gint i);
@@ -33,17 +31,30 @@
 {
   IndicatorObjectEntry *entry;
   PanelService         *service;
+  gint                  x;
+  gint                  y;
+  gint                  width;
+  gint                  height;
   gboolean              active;
 };
 
+G_DEFINE_TYPE_WITH_CODE(PanelIndicatorEntryAccessible,
+			panel_indicator_entry_accessible,
+			ATK_TYPE_OBJECT,
+			G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, piea_component_interface_init))
+
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessiblePrivate))
+
 static void
 on_entry_activated_cb (PanelService *service, const gchar *entry_id, gpointer user_data)
 {
   gchar *s;
   gboolean adding = FALSE;
-  PanelIndicatorEntryAccessible *piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (user_data);
-
-  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (piea));
+  PanelIndicatorEntryAccessible *piea;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (user_data));
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (user_data);
 
   /* The PanelService sends us a string containing the pointer to the IndicatorObjectEntry */
   s = g_strdup_printf ("%p", piea->priv->entry);
@@ -66,6 +77,39 @@
 }
 
 static void
+on_geometries_changed_cb (PanelService *service,
+			  IndicatorObject *object,
+			  IndicatorObjectEntry *entry,
+			  gint x,
+			  gint y,
+			  gint width,
+			  gint height,
+			  gpointer user_data)
+{
+  PanelIndicatorEntryAccessible *piea;
+  AtkRectangle rect;
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (user_data);
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (piea));
+
+  if (entry != piea->priv->entry)
+    return;
+
+  piea->priv->x = x;
+  piea->priv->y = y;
+  piea->priv->width = width;
+  piea->priv->height = height;
+
+  /* Notify ATK objects of change of coordinates */
+  rect.x = piea->priv->x;
+  rect.y = piea->priv->y;
+  rect.width = piea->priv->width;
+  rect.height = piea->priv->height;
+  g_signal_emit_by_name (ATK_COMPONENT (piea), "bounds-changed", &rect);
+}
+
+static void
 panel_indicator_entry_accessible_finalize (GObject *object)
 {
   PanelIndicatorEntryAccessible *piea;
@@ -77,6 +121,7 @@
   if (piea->priv != NULL)
     {
       g_signal_handlers_disconnect_by_func (piea->priv->service, on_entry_activated_cb, piea);
+      g_signal_handlers_disconnect_by_func (piea->priv->service, on_geometries_changed_cb, piea);
     }
 
   G_OBJECT_CLASS (panel_indicator_entry_accessible_parent_class)->finalize (object);
@@ -106,10 +151,13 @@
 panel_indicator_entry_accessible_init (PanelIndicatorEntryAccessible *piea)
 {
   piea->priv = GET_PRIVATE (piea);
+  piea->priv->x = piea->priv->y = piea->priv->width = piea->priv->height = 0;
 
   /* Set up signals for listening to service changes */
   piea->priv->active = FALSE;
   piea->priv->service = panel_service_get_default ();
+  g_signal_connect (piea->priv->service, "geometries-changed",
+		    G_CALLBACK (on_geometries_changed_cb), piea);
   g_signal_connect (piea->priv->service, "entry-activated",
 		    G_CALLBACK (on_entry_activated_cb), piea);
 }
@@ -136,6 +184,36 @@
 /* Implementation of AtkObject methods */
 
 static void
+panel_indicator_entry_accessible_get_extents (AtkComponent *component,
+					      gint *x,
+					      gint *y,
+					      gint *width,
+					      gint *height,
+					      AtkCoordType coord_type)
+{
+  PanelIndicatorEntryAccessible *piea;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (component));
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (component);
+
+  /* We ignore AtkCoordType for now, as the panel is always at the top left
+     corner and so relative and absolute coordinates are the same */
+  *x = piea->priv->x;
+  *y = piea->priv->y;
+  *width = piea->priv->width;
+  *height = piea->priv->height;
+}
+
+static void
+piea_component_interface_init (AtkComponentIface *iface)
+{
+  g_return_if_fail (iface != NULL);
+
+  iface->get_extents = panel_indicator_entry_accessible_get_extents;
+}
+
+static void
 panel_indicator_entry_accessible_initialize (AtkObject *accessible, gpointer data)
 {
   PanelIndicatorEntryAccessible *piea;
 
=== modified file 'services/panel-main.c'
--- services/panel-main.c	2011-01-31 21:52:38 +0000
+++ services/panel-main.c	2011-03-17 12:04:28 +0000
@@ -55,6 +55,10 @@
   "      <arg type='a(sssbbusbb)' name='state' direction='out'/>"
   "    </method>"
   ""
+  "    <method name='SyncGeometries'>"
+  "      <arg type='a(ssiiii)' name='geometries' direction='in'/>"
+  "    </method>"
+	""
   "    <method name='ShowEntry'>"
   "      <arg type='s' name='entry_id' direction='in'/>"
   "      <arg type='u' name='timestamp' direction='in'/>"
@@ -140,6 +144,29 @@
                                                                      id));
       g_free (id);
     }
+  else if (g_strcmp0 (method_name, "SyncGeometries") == 0)
+    {
+      GVariantIter *iter;
+      gchar *indicator_id, *entry_id;
+      gint x, y, width, height;
+
+      g_variant_get (parameters, "(a(ssiiii))", &iter);
+      while (g_variant_iter_loop (iter, "(ssiiii)",
+                                  &indicator_id,
+                                  &entry_id,
+                                  &x,
+                                  &y,
+                                  &width,
+                                  &height))
+        {
+          panel_service_sync_geometry (service, indicator_id,
+                                       entry_id, x, y, width, height);
+        }
+
+      g_variant_iter_free (iter);
+
+      g_dbus_method_invocation_return_value (invocation, NULL);
+    }
   else if (g_strcmp0 (method_name, "ShowEntry") == 0)
     {
       gchar  *entry_id;
@@ -309,13 +336,11 @@
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(),
 				     INDICATORICONDIR);
 
-  panel_a11y_init ();
-
   introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
   g_assert (introspection_data != NULL);
 
   service = panel_service_get_default ();
-  
+
   owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
                              S_NAME,
                              G_BUS_NAME_OWNER_FLAGS_NONE,
@@ -324,6 +349,9 @@
                              on_name_lost,
                              service,
                              NULL);
+
+  panel_a11y_init ();
+
   gtk_main ();
 
   g_bus_unown_name (owner_id);
 
=== added file 'services/panel-marshal.list'
--- services/panel-marshal.list	1970-01-01 00:00:00 +0000
+++ services/panel-marshal.list	2011-03-17 12:04:28 +0000
@@ -0,0 +1,1 @@
+NONE:OBJECT,POINTER,INT,INT,INT,INT
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-03-09 00:11:25 +0000
+++ services/panel-service.c	2011-03-17 12:04:28 +0000
@@ -21,6 +21,7 @@
 #include <config.h>
 #endif
 
+#include "panel-marshal.h"
 #include "panel-service.h"
 
 #include <stdlib.h>
@@ -67,6 +68,7 @@
   RE_SYNC,
   ACTIVE_MENU_POINTER_MOTION,
   ENTRY_ACTIVATE_REQUEST,
+  GEOMETRIES_CHANGED,
 
   LAST_SIGNAL
 };
@@ -179,6 +181,16 @@
                   NULL, NULL,
                   g_cclosure_marshal_VOID__STRING,
                   G_TYPE_NONE, 1, G_TYPE_STRING);
+ _service_signals[GEOMETRIES_CHANGED] =
+    g_signal_new ("geometries-changed",
+		  G_OBJECT_CLASS_TYPE (obj_class),
+		  G_SIGNAL_RUN_LAST,
+		  0,
+		  NULL, NULL,
+		  panel_marshal_VOID__OBJECT_POINTER_INT_INT_INT_INT,
+		  G_TYPE_NONE, 6,
+		  G_TYPE_OBJECT, G_TYPE_POINTER,
+		  G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
 
 
   g_type_class_add_private (obj_class, sizeof (PanelServicePrivate));
@@ -861,6 +873,22 @@
   return g_variant_builder_end (&b);
 }
 
+void
+panel_service_sync_geometry (PanelService *self,
+			     const gchar *indicator_id,
+			     const gchar *entry_id,
+			     gint x,
+			     gint y,
+			     gint width,
+			     gint height)
+{
+  PanelServicePrivate *priv = self->priv;
+  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
+
+  g_signal_emit (self, _service_signals[GEOMETRIES_CHANGED], 0, object, entry, x, y, width, height);
+}
+
 static void
 activate_next_prev_menu (PanelService         *self,
                          IndicatorObject      *object,
 
=== modified file 'services/panel-service.h'
--- services/panel-service.h	2011-02-23 16:49:18 +0000
+++ services/panel-service.h	2011-03-17 12:04:28 +0000
@@ -80,6 +80,13 @@
 
 GVariant        * panel_service_sync_one      (PanelService *self,
 					       const gchar  *indicator_id);
+void              panel_service_sync_geometry (PanelService *self,
+					       const gchar  *indicator_id,
+					       const gchar  *entry_id,
+					       gint          x,
+					       gint          y,
+					       gint          width,
+					       gint          height);
 
 void              panel_service_show_entry    (PanelService *self,
 					       const gchar  *entry_id,
 
=== modified file 'src/IndicatorObjectFactory.h'
--- src/IndicatorObjectFactory.h	2010-12-17 14:07:11 +0000
+++ src/IndicatorObjectFactory.h	2011-03-17 12:04:28 +0000
@@ -47,6 +47,7 @@
   sigc::signal<void, int, int>               OnMenuPointerMoved;
   sigc::signal<void, const char *>           OnEntryActivateRequest;
   sigc::signal<void, const char *>           OnEntryActivated;
+  sigc::signal<void>                         OnSynced;
 
 protected:
   std::vector<IndicatorObjectProxy *>_indicators;
 
=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-03-17 12:04:28 +0000
@@ -358,6 +358,9 @@
   
   g_free (current_proxy_id);
   g_variant_iter_free (iter);
+
+  /* Notify listeners we have new data */
+  OnSynced.emit ();
 }
 
 void
 
=== modified file 'src/PanelIndicatorObjectView.cpp'
--- src/PanelIndicatorObjectView.cpp	2011-02-22 23:11:20 +0000
+++ src/PanelIndicatorObjectView.cpp	2011-03-17 12:04:28 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "Nux/Nux.h"
+#include "Nux/Area.h"
 #include "Nux/HLayout.h"
 #include "Nux/VLayout.h"
 
@@ -75,7 +76,6 @@
 void
 PanelIndicatorObjectView::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
 {
-
 }
 
 void
@@ -153,3 +153,4 @@
   g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
   g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
 }
+
 
=== modified file 'src/PanelIndicatorObjectView.h'
--- src/PanelIndicatorObjectView.h	2011-01-25 15:45:12 +0000
+++ src/PanelIndicatorObjectView.h	2011-03-17 12:04:28 +0000
@@ -43,7 +43,7 @@
   void OnEntryAdded (IndicatorObjectEntryProxy *proxy);
   void OnEntryMoved (IndicatorObjectEntryProxy *proxy);
   void OnEntryRemoved (IndicatorObjectEntryProxy *proxy);
-
+  
   nux::HLayout *_layout;
 
 protected:
 
=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-03-16 09:45:39 +0000
+++ src/PanelView.cpp	2011-03-17 12:04:28 +0000
@@ -37,6 +37,10 @@
 #include "IndicatorObjectFactoryRemote.h"
 #include "PanelIndicatorObjectView.h"
 
+#define S_NAME  "com.canonical.Unity.Panel.Service"
+#define S_PATH  "/com/canonical/Unity/Panel/Service"
+#define S_IFACE "com.canonical.Unity.Panel.Service"
+
 NUX_IMPLEMENT_OBJECT_TYPE (PanelView);
 
 PanelView::PanelView (NUX_FILE_LINE_DECL)
@@ -44,6 +48,7 @@
   _is_dirty (true),
   _opacity (1.0f)
 {
+  _needs_geo_sync = false;
   _style = new PanelStyle ();
   _style->changed.connect (sigc::mem_fun (this, &PanelView::ForceUpdateBackground));
 
@@ -70,6 +75,7 @@
   _remote->OnMenuPointerMoved.connect (sigc::mem_fun (this, &PanelView::OnMenuPointerMoved));
   _remote->OnEntryActivateRequest.connect (sigc::mem_fun (this, &PanelView::OnEntryActivateRequest));
   _remote->IndicatorObjectFactory::OnEntryActivated.connect (sigc::mem_fun (this, &PanelView::OnEntryActivated));
+  _remote->IndicatorObjectFactory::OnSynced.connect (sigc::mem_fun (this, &PanelView::OnSynced));
 }
 
 PanelView::~PanelView ()
@@ -122,6 +128,12 @@
   gPainter.PopBackground ();
 
   GfxContext.PopClippingRectangle ();
+
+  if (_needs_geo_sync)
+  {
+    SyncGeometries ();
+    _needs_geo_sync = false;
+  }
 }
 
 void
@@ -333,6 +345,12 @@
     _menu_view->AllMenusClosed ();
 }
 
+void
+PanelView::OnSynced ()
+{
+  _needs_geo_sync = true;
+}
+
 //
 // Useful Public Methods
 //
@@ -390,3 +408,86 @@
   
   ForceUpdateBackground ();
 }
+
+static void
+on_sync_geometries_done_cb (GObject      *source,
+                            GAsyncResult *res,
+                            gpointer      data)
+{
+  GVariant *args;
+  GError *error = NULL;
+
+  args = g_dbus_proxy_call_finish ((GDBusProxy*) source, res, &error);
+  if (error != NULL)
+  {
+    g_warning ("Error when calling SyncGeometries: %s", error->message);
+    g_error_free (error);
+  }
+}
+
+void
+PanelView::SyncGeometries ()
+{
+  GVariantBuilder b;
+  GDBusProxy *bus_proxy;
+  GVariant *method_args;
+  std::list<Area *>::iterator it;
+
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(a(ssiiii))"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("a(ssiiii)"));
+
+  std::list<Area *> my_children = _layout->GetChildren ();
+  for (it = my_children.begin(); it != my_children.end(); it++)
+  {
+    PanelIndicatorObjectView *view = static_cast<PanelIndicatorObjectView *> (*it);
+
+    if (view->_layout == NULL)
+      continue;
+
+    std::list<Area *>::iterator it2;
+
+    std::list<Area *> its_children = view->_layout->GetChildren ();
+    for (it2 = its_children.begin (); it2 != its_children.end (); it2++)
+    {
+      nux::Geometry geo;
+      PanelIndicatorObjectEntryView *entry = static_cast<PanelIndicatorObjectEntryView *> (*it2);
+
+      if (entry == NULL)
+        continue;
+
+      geo = entry->GetAbsoluteGeometry ();
+      g_variant_builder_add (&b, "(ssiiii)",
+			     GetName (),
+			     entry->_proxy->GetId (),
+			     geo.x,
+			     geo.y,
+			     geo.GetWidth (),
+			     geo.GetHeight ());
+    }
+  }
+
+  g_variant_builder_close (&b);
+  method_args = g_variant_builder_end (&b);
+
+  // Send geometries to the panel service
+  bus_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                             G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                             NULL,
+                                             S_NAME,
+                                             S_PATH,
+                                             S_IFACE,
+                                             NULL,
+                                             NULL);
+  if (bus_proxy != NULL)
+  {
+    g_dbus_proxy_call (bus_proxy, "SyncGeometries", method_args,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL,
+                       on_sync_geometries_done_cb,
+                       this);
+    g_object_unref (bus_proxy);
+  }
+
+  g_variant_unref (method_args);
+}
 
=== modified file 'src/PanelView.h'
--- src/PanelView.h	2011-03-16 09:45:39 +0000
+++ src/PanelView.h	2011-03-17 12:04:28 +0000
@@ -51,6 +51,7 @@
   void OnMenuPointerMoved (int x, int y);
   void OnEntryActivateRequest (const char *entry_id);
   void OnEntryActivated (const char *entry_id);
+  void OnSynced ();
   
   PanelHomeButton * HomeButton ();
 
@@ -70,6 +71,7 @@
 private:
   void UpdateBackground ();
   void ForceUpdateBackground ();
+  void SyncGeometries ();
 
 private:
   IndicatorObjectFactoryRemote *_remote;
@@ -86,6 +88,7 @@
   PanelStyle *_style;
   bool        _is_dirty;
   float       _opacity;
+  bool        _needs_geo_sync;
 };
 
 #endif // PANEL_VIEW_H
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-03-11 14:43:50 +0000
+++ tests/CMakeLists.txt	2011-03-17 12:04:28 +0000
@@ -30,6 +30,14 @@
 
 include_directories (. .. ../services ${CMAKE_BINARY_DIR})
 
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
+  COMMAND ${GLIB_GENMARSHAL} ARGS ${CMAKE_SOURCE_DIR}/services/panel-marshal.list --body --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
+  COMMAND ${GLIB_GENMARSHAL} ARGS ${CMAKE_SOURCE_DIR}/services/panel-marshal.list --header --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.h
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS ../services/panel-marshal.list
+  COMMENT "Generating marshallers")
+
 # We can't have convenience libs so we need to rebuild with what we need
 # Please keep actual test files alphabetically at top and then files
 # from ../../src or ../../services in alphabetically after that
@@ -44,6 +52,7 @@
                 ../src/ubus-server.h
                 ../services/panel-service.c
                 ../services/panel-service.h
+                ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
                 ../src/FavoriteStore.cpp
                 ../src/FavoriteStore.h
                 ../src/FavoriteStoreGSettings.cpp