Merge lp:~chrisccoulson/unity/lp725631 into lp:unity

[Chris Coulson]

[Neil J. Patel (njpatel)]

Approved and merged, thanks!

review: Approve

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-02-23 16:49:18 +0000
+++ services/panel-service.c	2011-03-09 00:13:43 +0000
@@ -486,6 +486,19 @@
                   IndicatorObjectEntry *entry,
                   PanelService         *self)
 {
+  PanelServicePrivate *priv;
+  gchar *id;
+
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+  g_return_if_fail (entry != NULL);
+
+  priv = self->priv;
+
+  id = g_strdup_printf ("%p", entry);
+  g_hash_table_remove (priv->entry2indicator_hash, entry);
+  g_hash_table_remove (priv->id2entry_hash, id);
+  g_free (id);
+
   notify_object (object);
 }