Merge lp:~unity-team/unity/fixes-2011-04-11 into lp:unity

[Neil J. Patel]

Bugs attached, there are some other changes too, largest being the spinner (which isn't really a large change)

[Jason Smith (jassmith)]

+1 looks good

review: Approve

=== removed file 'resources/search_clear_alone.png'
 Binary files resources/search_clear_alone.png	2011-03-23 22:33:25 +0000 and resources/search_clear_alone.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/search_clear_icon.png'
 Binary files resources/search_clear_icon.png	2011-02-28 11:24:48 +0000 and resources/search_clear_icon.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/search_clear_spinner.png'
 Binary files resources/search_clear_spinner.png	2011-03-23 23:18:03 +0000 and resources/search_clear_spinner.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/search_close.png'
 Binary files resources/search_close.png	1970-01-01 00:00:00 +0000 and resources/search_close.png	2011-04-10 23:52:24 +0000 differ
=== added file 'resources/search_close_glow.png'
 Binary files resources/search_close_glow.png	1970-01-01 00:00:00 +0000 and resources/search_close_glow.png	2011-04-10 23:52:24 +0000 differ
=== added file 'resources/search_magnify.png'
 Binary files resources/search_magnify.png	1970-01-01 00:00:00 +0000 and resources/search_magnify.png	2011-04-10 23:52:24 +0000 differ
=== removed file 'resources/search_ready_icon.png'
 Binary files resources/search_ready_icon.png	2011-02-28 11:24:48 +0000 and resources/search_ready_icon.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/search_spin.png'
 Binary files resources/search_spin.png	1970-01-01 00:00:00 +0000 and resources/search_spin.png	2011-04-10 23:52:24 +0000 differ
=== added file 'resources/search_spin_glow.png'
 Binary files resources/search_spin_glow.png	1970-01-01 00:00:00 +0000 and resources/search_spin_glow.png	2011-04-10 23:52:24 +0000 differ
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-04-05 14:09:03 +0000
+++ services/panel-service.c	2011-04-10 23:52:24 +0000
@@ -1,4 +1,4 @@
-/*
+  /*
  * Copyright (C) 2010 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
@@ -186,14 +186,14 @@
                   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_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);
 
  _service_signals[ENTRY_SHOW_NOW_CHANGED] =
     g_signal_new ("entry-show-now-changed",
@@ -569,10 +569,10 @@
 }
 
 static const gchar * indicator_environment[] = {
-	"unity",
-	"unity-3d",
-	"unity-panel-service",
-	NULL
+  "unity",
+  "unity-3d",
+  "unity-panel-service",
+  NULL
 };
 
 static void
@@ -657,16 +657,16 @@
 static gint
 name2order (const gchar * name)
 {
-	int i;
+  int i;
 
-	for (i = 0; indicator_order[i] != NULL; i++)
+  for (i = 0; indicator_order[i] != NULL; i++)
     {
-		  if (g_strcmp0(name, indicator_order[i]) == 0)
+      if (g_strcmp0(name, indicator_order[i]) == 0)
         {
-		  	  return i;
-    		}
-	  }
-	return -1;
+          return i;
+        }
+    }
+  return -1;
 }
 
 static int
@@ -915,12 +915,12 @@
 
 void
 panel_service_sync_geometry (PanelService *self,
-			     const gchar *indicator_id,
-			     const gchar *entry_id,
-			     gint x,
-			     gint y,
-			     gint width,
-			     gint height)
+           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);
@@ -940,13 +940,13 @@
   if (GTK_IS_LABEL (entry->label))
     {
       label_ok = gtk_widget_get_visible (GTK_WIDGET (entry->label))
-	      && gtk_widget_is_sensitive (GTK_WIDGET (entry->label));
+        && gtk_widget_is_sensitive (GTK_WIDGET (entry->label));
     }
 
   if (GTK_IS_IMAGE (entry->image))
     {
       image_ok = gtk_widget_get_visible (GTK_WIDGET (entry->image))
-	      && gtk_widget_is_sensitive (GTK_WIDGET (entry->image));
+        && gtk_widget_is_sensitive (GTK_WIDGET (entry->image));
     }
 
   return !label_ok && !image_ok;
@@ -996,6 +996,8 @@
           new_object = g_slist_nth_data (indicators, new_object_index);
         }
 
+      if (!INDICATOR_IS_OBJECT (new_object))
+        return;
       new_entries = indicator_object_get_entries (new_object);
       // if the indicator has no entries, move to the next/prev one until we find one with entries
       while (new_entries == NULL)
@@ -1003,8 +1005,10 @@
           gint cur_object_index = g_slist_index (indicators, new_object);
           gint new_object_index = cur_object_index + (direction == GTK_MENU_DIR_CHILD ? 1 : -1);
           new_object = g_slist_nth_data (indicators, new_object_index);
+          if (!INDICATOR_IS_OBJECT (new_object))
+            return;
           new_entries = indicator_object_get_entries (new_object);
-	}
+        }
 
       new_entry = g_list_nth_data (new_entries, direction == GTK_MENU_DIR_PARENT ? g_list_length (new_entries) - 1 : 0);
 
@@ -1013,9 +1017,9 @@
 
       if (should_skip_menu (new_entry))
         {	  
-	  activate_next_prev_menu (self, new_object, new_entry, direction);
-	  return;
-	}
+          activate_next_prev_menu (self, new_object, new_entry, direction);
+      	  return;
+        }
     }
   // changing within a group of indicators (for example, entries within appmenu)
   else
@@ -1025,9 +1029,9 @@
 
       if (should_skip_menu (new_entry))
         { 
-	  activate_next_prev_menu (self, object, new_entry, direction);
-	  return;
-	}
+          activate_next_prev_menu (self, object, new_entry, direction);
+          return;
+        }
     }
 
   id = g_strdup_printf ("%p", new_entry);
 
=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-04-08 07:53:45 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-04-10 23:52:24 +0000
@@ -29,6 +29,7 @@
 #include "Nux/WindowThread.h"
 #include "NuxGraphics/GLWindowManager.h"
 #include <X11/Xlib.h>
+#include <algorithm>
 
 #define S_NAME  "com.canonical.Unity.Panel.Service"
 #define S_PATH  "/com/canonical/Unity/Panel/Service"
@@ -78,18 +79,33 @@
 IndicatorObjectFactoryRemote::~IndicatorObjectFactoryRemote ()
 {
   if (G_IS_OBJECT (_proxy))
+  {
+    g_signal_handler_disconnect (_proxy, _proxy_signal_id);
+    g_signal_handler_disconnect (_proxy, _proxy_name_id);
     g_object_unref (_proxy);
+  }
   _proxy = NULL;
 
-  std::vector<IndicatorObjectProxy*>::iterator it;
-  
-  for (it = _indicators.begin(); it != _indicators.end(); it++)
   {
-    IndicatorObjectProxyRemote *remote = static_cast<IndicatorObjectProxyRemote *> (*it);
-    delete remote;
+    std::vector<IndicatorObjectProxy*>::iterator it;
+    for (it = _indicators.begin(); it != _indicators.end(); it++)
+    {
+      IndicatorObjectProxyRemote *remote = static_cast<IndicatorObjectProxyRemote *> (*it);
+      delete remote;
+    }
+    _indicators.erase (_indicators.begin (), _indicators.end ());
   }
 
-  _indicators.erase (_indicators.begin (), _indicators.end ());
+  { // We cancel all our async callbacks from pending Sync() calls
+    std::vector<SyncData *>::iterator it, eit = _sync_cancellables.end ();
+    for (it = _sync_cancellables.begin (); it != eit; ++it)
+    {
+      SyncData *data = (*it);
+      g_cancellable_cancel (data->_cancel);
+      delete data;
+    }
+    _sync_cancellables.erase (_sync_cancellables.begin (), _sync_cancellables.end ());
+  }
 }
 
 std::vector<IndicatorObjectProxy *>&
@@ -134,20 +150,22 @@
     _proxy = proxy;
 
     // Connect to interesting signals
-    g_signal_connect (_proxy, "g-signal",
-                      G_CALLBACK (on_proxy_signal_received), this);
-    g_signal_connect (_proxy, "notify::g-name-owner",
-                      G_CALLBACK (on_proxy_name_owner_changed), this);
+    _proxy_signal_id = g_signal_connect (_proxy, "g-signal",
+                                         G_CALLBACK (on_proxy_signal_received), this);
+    _proxy_name_id = g_signal_connect (_proxy, "notify::g-name-owner",
+                                       G_CALLBACK (on_proxy_name_owner_changed), this);
   }
 
+   SyncData * data = new SyncData (this);
+  _sync_cancellables.push_back (data);
   g_dbus_proxy_call (_proxy,
                      "Sync",
                      NULL,
                      G_DBUS_CALL_FLAGS_NONE,
                      -1,
-                     NULL,
+                     data->_cancel,
                      on_sync_ready_cb,
-                     this);
+                     data);
 }
 
 static gboolean
@@ -518,17 +536,20 @@
   }
   else if (g_strcmp0 (signal_name, "ReSync") == 0)
   {
-    const gchar *id = g_variant_get_string (g_variant_get_child_value (parameters, 0), NULL);
-    bool sync_one = !g_strcmp0 (id, "") == 0;
+    const gchar  *id = g_variant_get_string (g_variant_get_child_value (parameters, 0), NULL);
+    bool          sync_one = !g_strcmp0 (id, "") == 0;
 
+    SyncData *data = new SyncData (remote);
+    remote->_sync_cancellables.push_back (data);
+    
     g_dbus_proxy_call (proxy,
                        sync_one ? "SyncOne" : "Sync", 
                        sync_one ? g_variant_new ("(s)", id) : NULL,
                        G_DBUS_CALL_FLAGS_NONE,
                        -1,
-                       NULL,
+                       data->_cancel,
                        on_sync_ready_cb,
-                       remote);
+                       data);
   }
   else if (g_strcmp0 (signal_name, "ActiveMenuPointerMotion") == 0)
   {
@@ -575,7 +596,8 @@
                   GAsyncResult *res,
                   gpointer      data)
 {
-  IndicatorObjectFactoryRemote *remote = static_cast<IndicatorObjectFactoryRemote *> (data);
+  SyncData     *sync_data = (SyncData *)data;
+  IndicatorObjectFactoryRemote *remote = (IndicatorObjectFactoryRemote*)sync_data->_self;
   GVariant     *args;
   GError       *error = NULL;
 
@@ -590,5 +612,12 @@
 
   remote->Sync (args);
 
+  std::vector<SyncData *>::iterator it = std::find (remote->_sync_cancellables.begin (),
+                                                    remote->_sync_cancellables.end (),
+                                                    sync_data);
+  if (it != remote->_sync_cancellables.end ())
+    remote->_sync_cancellables.erase (it);
+  
   g_variant_unref (args);
+  delete sync_data;
 }
 
=== modified file 'src/IndicatorObjectFactoryRemote.h'
--- src/IndicatorObjectFactoryRemote.h	2011-03-31 17:04:36 +0000
+++ src/IndicatorObjectFactoryRemote.h	2011-04-10 23:52:24 +0000
@@ -27,6 +27,27 @@
 #include "IndicatorObjectFactory.h"
 #include "IndicatorObjectProxyRemote.h"
 
+class SyncData
+{
+public:
+  SyncData (IndicatorObjectFactory *self)
+  : _self (self),
+    _cancel (g_cancellable_new ())
+  {
+  }
+
+  ~SyncData ()
+  {
+    g_object_unref (_cancel);
+    _cancel = NULL;
+    _self = NULL;
+  }
+
+  IndicatorObjectFactory *_self;
+  GCancellable *_cancel;
+};
+
+
 // Connects to the remote panel service (unity-panel-service) and translates
 // that into something that the panel can show
 class IndicatorObjectFactoryRemote : public IndicatorObjectFactory
@@ -52,10 +73,14 @@
 
   GDBusProxy * GetRemoteProxy ();
 
+  std::vector<SyncData*> _sync_cancellables;
+
 private:
   IndicatorObjectProxyRemote* IndicatorForID (const char *id);
 private:
-  GDBusProxy *_proxy;
+  GDBusProxy   *_proxy;
+  guint32       _proxy_signal_id;
+  guint32       _proxy_name_id;
 };
 
 #endif // INDICATOR_OBJECT_FACTORY_REMOTE_H
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-04-07 10:22:48 +0000
+++ src/PanelMenuView.cpp	2011-04-10 23:52:24 +0000
@@ -121,10 +121,10 @@
 
   // Register for all the interesting events
   UBusServer *ubus = ubus_server_get_default ();
-  ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_SHOWN,
+  _place_shown_interest = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_SHOWN,
                                  (UBusCallback)PanelMenuView::OnPlaceViewShown,
                                  this);
-  ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_HIDDEN,
+  _place_hidden_interest = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_HIDDEN,
                                  (UBusCallback)PanelMenuView::OnPlaceViewHidden,
                                  this);
 
@@ -169,6 +169,8 @@
   _window_buttons->UnReference ();
   _panel_titlebar_grab_area->UnReference ();
 
+  ubus_server_unregister_interest (ubus_server_get_default (), _place_shown_interest);
+  ubus_server_unregister_interest (ubus_server_get_default (), _place_hidden_interest);
 }
 
 void
@@ -372,9 +374,10 @@
     }
     else
     {
-      gPainter.PushDrawLayer (GfxContext,
-                              geo,
-                              _title_layer);
+      if (_title_layer)
+        gPainter.PushDrawLayer (GfxContext,
+                                geo,
+                                _title_layer);
     }
   }
 
 
=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-03-29 17:51:28 +0000
+++ src/PanelMenuView.h	2011-04-10 23:52:24 +0000
@@ -161,5 +161,8 @@
   sigc::connection _on_panelstyle_changed_connection;
   
   gulong _activate_window_changed_id;
+
+  guint32 _place_shown_interest;
+  guint32 _place_hidden_interest;
 };
 #endif
 
=== modified file 'src/PlacesGroupController.cpp'
--- src/PlacesGroupController.cpp	2011-03-31 21:38:40 +0000
+++ src/PlacesGroupController.cpp	2011-04-10 23:52:24 +0000
@@ -214,7 +214,8 @@
 void
 PlacesGroupController::Clear ()
 {
-
+  if (_group->GetChildLayout ())
+    _group->GetChildLayout ()->Clear ();
 }
 
 void
 
=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-04-06 17:53:41 +0000
+++ src/PlacesSearchBar.cpp	2011-04-10 23:52:24 +0000
@@ -53,7 +53,7 @@
     _live_search_timeout (0)
 {
   PlacesStyle      *style = PlacesStyle::GetDefault ();
-  nux::BaseTexture *icon = style->GetSearchReadyIcon ();
+  nux::BaseTexture *icon = style->GetSearchMagnifyIcon ();
 
   _bg_layer = new nux::ColorLayer (nux::Color (0xff595853), true);
 
 
=== modified file 'src/PlacesSearchBarSpinner.cpp'
--- src/PlacesSearchBarSpinner.cpp	2011-04-06 17:53:41 +0000
+++ src/PlacesSearchBarSpinner.cpp	2011-04-10 23:52:24 +0000
@@ -33,10 +33,11 @@
 {
   PlacesStyle *style = PlacesStyle::GetDefault ();
 
-  _search_ready = style->GetSearchReadyIcon ();
-  _clear_full = style->GetSearchClearIcon ();
-  _clear_alone = style->GetSearchClearAloneIcon ();
-  _clear_spinner = style->GetSearchClearSpinnerIcon ();
+  _magnify = style->GetSearchMagnifyIcon ();
+  _close = style->GetSearchCloseIcon ();
+  _close_glow = style->GetSearchCloseGlowIcon ();
+  _spin = style->GetSearchSpinIcon ();
+  _spin_glow = style->GetSearchSpinGlowIcon ();
 
   _2d_rotate.Identity ();
   _2d_rotate.Rotate_z (0.0);
@@ -69,56 +70,85 @@
   texxform.min_filter = nux::TEXFILTER_LINEAR;
   texxform.mag_filter = nux::TEXFILTER_LINEAR;
 
+  GfxContext.QRP_1Tex (geo.x + ((geo.width - _spin_glow->GetWidth ())/2),
+                       geo.y + ((geo.height - _spin_glow->GetHeight ())/2),
+                       _spin_glow->GetWidth (),
+                       _spin_glow->GetHeight (),
+                       _spin_glow->GetDeviceTexture (),
+                       texxform,
+                       nux::Colors::White);
+
   if (_state == STATE_READY)
   {
-    GfxContext.QRP_1Tex (geo.x + ((geo.width - _search_ready->GetWidth ())/2),
-                         geo.y + ((geo.height - _search_ready->GetHeight ())/2),
-                         _search_ready->GetWidth (),
-                         _search_ready->GetHeight (),
-                         _search_ready->GetDeviceTexture (),
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _magnify->GetWidth ())/2),
+                         geo.y + ((geo.height - _magnify->GetHeight ())/2),
+                         _magnify->GetWidth (),
+                         _magnify->GetHeight (),
+                         _magnify->GetDeviceTexture (),
                          texxform,
                          nux::Colors::White);
   }
   else if (_state == STATE_SEARCHING)
   {
-    nux::Geometry clear_geo (geo.x + ((geo.width - _clear_spinner->GetWidth ())/2),
-                             geo.y + ((geo.height - _clear_spinner->GetHeight ())/2),
-                             _clear_spinner->GetWidth (),
-                             _clear_spinner->GetHeight ());
+    nux::Geometry spin_geo (geo.x + ((geo.width - _spin->GetWidth ())/2),
+                             geo.y + ((geo.height - _spin->GetHeight ())/2),
+                             _spin->GetWidth (),
+                             _spin->GetHeight ());
+    int spin_offset_w = (geo.width % 2) ? 0 : 1;
+    int spin_offset_h = (geo.height % 2) ? 0 : 1;
 
-    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(-clear_geo.x - clear_geo.width / 2,
-                                    -clear_geo.y - clear_geo.height / 2, 0));
+    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(-spin_geo.x - (spin_geo.width + spin_offset_w) / 2.0f,
+                                    -spin_geo.y - (spin_geo.height + spin_offset_h) / 2.0f, 0));
     GfxContext.PushModelViewMatrix (_2d_rotate);    
-    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(clear_geo.x + clear_geo.width/ 2,
-                                    clear_geo.y + clear_geo.height / 2, 0));
-
-    GfxContext.QRP_1Tex (clear_geo.x,
-                         clear_geo.y,
-                         clear_geo.width,
-                         clear_geo.height,
-                         _clear_spinner->GetDeviceTexture (),
-                         texxform,
-                         nux::Colors::White);
-
-    GfxContext.PopModelViewMatrix ();
-    GfxContext.PopModelViewMatrix ();
-    GfxContext.PopModelViewMatrix ();
-
-    GfxContext.QRP_1Tex (geo.x + ((geo.width - _clear_alone->GetWidth ())/2),
-                         geo.y + ((geo.height - _clear_alone->GetHeight ())/2),
-                         _clear_alone->GetWidth (),
-                         _clear_alone->GetHeight (),
-                         _clear_alone->GetDeviceTexture (),
-                         texxform,
-                         nux::Colors::White);
+    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(spin_geo.x + (spin_geo.width + spin_offset_w)/ 2.0f,
+                                    spin_geo.y + (spin_geo.height + spin_offset_h) / 2.0f, 0));
+
+    GfxContext.QRP_1Tex (spin_geo.x,
+                         spin_geo.y,
+                         spin_geo.width,
+                         spin_geo.height,
+                         _spin->GetDeviceTexture (),
+                         texxform,
+                         nux::Colors::White);
+
+    GfxContext.PopModelViewMatrix ();
+    GfxContext.PopModelViewMatrix ();
+    GfxContext.PopModelViewMatrix ();
   }
   else
   {
-    GfxContext.QRP_1Tex (geo.x + ((geo.width - _clear_full->GetWidth ())/2),
-                         geo.y + ((geo.height - _clear_full->GetHeight ())/2),
-                         _clear_full->GetWidth (),
-                         _clear_full->GetHeight (),
-                         _clear_full->GetDeviceTexture (),
+    texxform.FlipVCoord (true);
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _spin->GetWidth ())/2),
+                         geo.y + ((geo.height - _spin->GetHeight ())/2),
+                         _spin->GetWidth (),
+                         _spin->GetHeight (),
+                         _spin->GetDeviceTexture (),
+                         texxform,
+                         nux::Colors::White);
+    texxform.FlipVCoord (false);
+
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _spin->GetWidth ())/2),
+                         geo.y + ((geo.height - _spin->GetHeight ())/2),
+                         _spin->GetWidth (),
+                         _spin->GetHeight (),
+                         _spin->GetDeviceTexture (),
+                         texxform,
+                         nux::Colors::White);
+
+
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _close_glow->GetWidth ())/2),
+                         geo.y + ((geo.height - _close_glow->GetHeight ())/2),
+                         _close_glow->GetWidth (),
+                         _close_glow->GetHeight (),
+                         _close_glow->GetDeviceTexture (),
+                         texxform,
+                         nux::Colors::White);
+
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _close->GetWidth ())/2),
+                         geo.y + ((geo.height - _close->GetHeight ())/2),
+                         _close->GetWidth (),
+                         _close->GetHeight (),
+                         _close->GetDeviceTexture (),
                          texxform,
                          nux::Colors::White);
   }
 
=== modified file 'src/PlacesSearchBarSpinner.h'
--- src/PlacesSearchBarSpinner.h	2011-03-23 23:18:03 +0000
+++ src/PlacesSearchBarSpinner.h	2011-04-10 23:52:24 +0000
@@ -58,10 +58,11 @@
 private:
   SpinnerState      _state;
 
-  nux::BaseTexture *_search_ready;
-  nux::BaseTexture *_clear_full;
-  nux::BaseTexture *_clear_alone;
-  nux::BaseTexture *_clear_spinner;
+  nux::BaseTexture *_magnify;
+  nux::BaseTexture *_close;
+  nux::BaseTexture *_close_glow;
+  nux::BaseTexture *_spin;
+  nux::BaseTexture *_spin_glow;
 
   nux::Matrix4 _2d_rotate;
   float        _rotation;
 
=== modified file 'src/PlacesSimpleTile.cpp'
--- src/PlacesSimpleTile.cpp	2011-04-07 12:36:20 +0000
+++ src/PlacesSimpleTile.cpp	2011-04-10 23:52:24 +0000
@@ -48,16 +48,16 @@
 
   _icontex = new IconTexture (_icon, icon_size, defer_icon_loading);
   _icontex->SetMinMaxSize (style->GetTileWidth (), icon_size);
-  _icontex->SinkReference ();
   AddChild (_icontex);
 
+
   _cairotext = new nux::StaticCairoText ("");
   _cairotext->SetMaximumWidth (style->GetTileWidth ());
   _cairotext->SinkReference ();
   _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_START);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
   _cairotext->SetText (_label);
-  
+
   layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
   layout->AddView (_icontex, 0, nux::eCenter, nux::eFull);
   layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
@@ -73,11 +73,6 @@
 
 PlacesSimpleTile::~PlacesSimpleTile ()
 {
-  _icontex->UnReference ();
-  _icontex = NULL;
-  _cairotext->UnReference ();
-  _cairotext = NULL;
-
   g_free (_label);
   g_free (_icon);
   g_free (_uri);
 
=== modified file 'src/PlacesStyle.cpp'
--- src/PlacesStyle.cpp	2011-04-10 15:08:29 +0000
+++ src/PlacesStyle.cpp	2011-04-10 23:52:24 +0000
@@ -38,10 +38,11 @@
   _dash_right_texture (NULL),
   _dash_corner_texture (NULL),
   _dash_fullscreen_icon (NULL),
-  _search_ready_texture (NULL),
-  _search_clear_texture (NULL),
-  _search_clear_alone_texture (NULL),
-  _search_clear_spinner_texture (NULL),
+  _search_magnify_texture (NULL),
+  _search_close_texture (NULL),
+  _search_close_glow_texture (NULL),
+  _search_spin_texture (NULL),
+  _search_spin_glow_texture (NULL),
   _group_unexpand_texture (NULL),
   _group_expand_texture (NULL)
 {
@@ -63,14 +64,14 @@
     _dash_corner_texture->UnReference ();
   if (_dash_fullscreen_icon)
     _dash_fullscreen_icon->UnReference ();
-  if (_search_ready_texture)
-    _search_ready_texture->UnReference ();
-  if (_search_clear_texture)
-    _search_clear_texture->UnReference ();
-  if (_search_clear_alone_texture)
-    _search_clear_alone_texture->UnReference ();
-  if (_search_clear_spinner_texture)
-    _search_clear_spinner_texture->UnReference ();
+  if (_search_magnify_texture)
+    _search_magnify_texture->UnReference ();
+  if (_search_close_texture)
+    _search_close_texture->UnReference ();
+  if (_search_close_glow_texture)
+    _search_close_glow_texture->UnReference ();
+  if (_search_spin_texture)
+    _search_spin_texture->UnReference ();
   if (_group_unexpand_texture)
     _group_unexpand_texture->UnReference ();
   if (_group_expand_texture)
@@ -176,35 +177,43 @@
 }
 
 nux::BaseTexture *
-PlacesStyle::GetSearchReadyIcon ()
-{
-  if (!_search_ready_texture)
-    _search_ready_texture = TextureFromFilename (PKGDATADIR"/search_ready_icon.png");
-  return _search_ready_texture;
-}
-
-nux::BaseTexture *
-PlacesStyle::GetSearchClearIcon ()
-{
-  if (!_search_clear_texture)
-    _search_clear_texture = TextureFromFilename (PKGDATADIR"/search_clear_icon.png");
-  return _search_clear_texture;
-}
-
-nux::BaseTexture *
-PlacesStyle::GetSearchClearAloneIcon ()
-{
-  if (!_search_clear_alone_texture)
-    _search_clear_alone_texture = TextureFromFilename (PKGDATADIR"/search_clear_alone.png");
-  return _search_clear_alone_texture;
-}
-
-nux::BaseTexture *
-PlacesStyle::GetSearchClearSpinnerIcon ()
-{
-  if (!_search_clear_spinner_texture)
-    _search_clear_spinner_texture = TextureFromFilename (PKGDATADIR"/search_clear_spinner.png");
-  return _search_clear_spinner_texture;
+PlacesStyle::GetSearchMagnifyIcon ()
+{
+  if (!_search_magnify_texture)
+    _search_magnify_texture = TextureFromFilename (PKGDATADIR"/search_magnify.png");
+  return _search_magnify_texture;
+}
+
+nux::BaseTexture *
+PlacesStyle::GetSearchCloseIcon ()
+{
+  if (!_search_close_texture)
+    _search_close_texture = TextureFromFilename (PKGDATADIR"/search_close.png");
+  return _search_close_texture;
+}
+
+nux::BaseTexture *
+PlacesStyle::GetSearchCloseGlowIcon ()
+{
+  if (!_search_close_glow_texture)
+    _search_close_glow_texture = TextureFromFilename (PKGDATADIR"/search_close_glow.png");
+  return _search_close_glow_texture;
+}
+
+nux::BaseTexture *
+PlacesStyle::GetSearchSpinIcon ()
+{
+  if (!_search_spin_texture)
+    _search_spin_texture = TextureFromFilename (PKGDATADIR"/search_spin.png");
+  return _search_spin_texture;
+}
+
+nux::BaseTexture *
+PlacesStyle::GetSearchSpinGlowIcon ()
+{
+  if (!_search_spin_glow_texture)
+    _search_spin_glow_texture = TextureFromFilename (PKGDATADIR"/search_spin_glow.png");
+  return _search_spin_glow_texture;
 }
 
 nux::BaseTexture *
 
=== modified file 'src/PlacesStyle.h'
--- src/PlacesStyle.h	2011-03-23 22:33:25 +0000
+++ src/PlacesStyle.h	2011-04-10 23:52:24 +0000
@@ -50,10 +50,11 @@
   nux::BaseTexture * GetDashCorner ();
   nux::BaseTexture * GetDashFullscreenIcon ();
 
-  nux::BaseTexture * GetSearchReadyIcon ();
-  nux::BaseTexture * GetSearchClearIcon ();
-  nux::BaseTexture * GetSearchClearAloneIcon ();
-  nux::BaseTexture * GetSearchClearSpinnerIcon ();
+  nux::BaseTexture * GetSearchMagnifyIcon ();
+  nux::BaseTexture * GetSearchCloseIcon ();
+  nux::BaseTexture * GetSearchCloseGlowIcon ();
+  nux::BaseTexture * GetSearchSpinIcon ();
+  nux::BaseTexture * GetSearchSpinGlowIcon ();
 
   nux::BaseTexture * GetGroupUnexpandIcon ();
   nux::BaseTexture * GetGroupExpandIcon ();
@@ -80,10 +81,11 @@
   nux::BaseTexture *_dash_corner_texture;
   nux::BaseTexture *_dash_fullscreen_icon;
 
-  nux::BaseTexture *_search_ready_texture;
-  nux::BaseTexture *_search_clear_texture;
-  nux::BaseTexture *_search_clear_alone_texture;
-  nux::BaseTexture *_search_clear_spinner_texture;
+  nux::BaseTexture *_search_magnify_texture;
+  nux::BaseTexture *_search_close_texture;
+  nux::BaseTexture *_search_close_glow_texture;
+  nux::BaseTexture *_search_spin_texture;
+  nux::BaseTexture *_search_spin_glow_texture;
 
   nux::BaseTexture *_group_unexpand_texture;
   nux::BaseTexture *_group_expand_texture;
 
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-04-06 17:53:41 +0000
+++ src/PlacesView.cpp	2011-04-10 23:52:24 +0000
@@ -51,7 +51,8 @@
   _resize_id (0),
   _alt_f2_entry (NULL),
   _searching_timeout (0),
-  _pending_activation (false)
+  _pending_activation (false),
+  _search_empty (false)
 {
   LoadPlaces ();
   _factory->place_added.connect (sigc::mem_fun (this, &PlacesView::OnPlaceAdded));
@@ -424,7 +425,6 @@
 void
 PlacesView::SetActiveEntry (PlaceEntry *entry, guint section_id, const char *search_string, bool signal)
 {
-  
   if (signal)
     entry_changed.emit (entry);
 
@@ -452,6 +452,7 @@
 
   _entry->SetActive (true);
   _search_bar->SetActiveEntry (_entry, section_id, search_string);
+  _search_empty = (g_strcmp0 (search_string, "") == 0 && _entry == _home_entry);
 
   _entry->ForeachGroup (sigc::mem_fun (this, &PlacesView::OnGroupAdded));
   _entry->ForeachResult (sigc::mem_fun (this, &PlacesView::OnResultAdded));
@@ -619,6 +620,10 @@
 void
 PlacesView::OnResultAdded (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result)
 {
+  // We never show these so ignore them
+  if (_search_empty)
+    return;
+
   _n_results++;
 
   if (_n_results <= 2
@@ -729,12 +734,15 @@
 void
 PlacesView::OnSearchChanged (const char *search_string)
 {
+  _search_empty = false;
+
   if (_entry == _home_entry)
   {
     if (g_strcmp0 (search_string, "") == 0)
     {
       _layered_layout->SetActiveLayer (_home_view);
       _home_view->QueueDraw ();
+      _search_empty = true;
     }
     else
     {
 
=== modified file 'src/PlacesView.h'
--- src/PlacesView.h	2011-03-31 14:26:00 +0000
+++ src/PlacesView.h	2011-04-10 23:52:24 +0000
@@ -170,6 +170,8 @@
   guint _n_results;
   guint _searching_timeout;
   bool  _pending_activation;
+
+  bool  _search_empty;
 };
 
 #endif // PANEL_HOME_BUTTON_H
 
=== modified file 'src/QuicklistView.cpp'
--- src/QuicklistView.cpp	2011-04-06 17:53:41 +0000
+++ src/QuicklistView.cpp	2011-04-10 23:52:24 +0000
@@ -126,14 +126,19 @@
 bool
 QuicklistView::IsMenuItemSeperator (int index)
 {
-  DbusmenuMenuitem* item   = NULL;
-  const gchar*      label  = NULL;
-  bool              result = false;
+  QuicklistMenuItem* menu_item = NULL;
+  DbusmenuMenuitem*  item   = NULL;
+  const gchar*       label  = NULL;
+  bool               result = false;
 
   if (index < 0)
     return false;
 
-  item = GetNthItems (index)->_menuItem;
+  menu_item = GetNthItems (index);
+  if (!menu_item)
+    return false;
+  
+  item = menu_item->_menuItem;
   if (!item)
     return false;
 
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-04-10 22:12:26 +0000
+++ src/StaticCairoText.cpp	2011-04-10 23:52:24 +0000
@@ -490,7 +490,7 @@
 
   _texture2D = GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
   _texture2D->Update (bitmap);
-  
+
   delete bitmap;
 
   cairo_destroy (cr);
 
=== modified file 'src/UScreen.cpp'
--- src/UScreen.cpp	2011-03-22 16:44:47 +0000
+++ src/UScreen.cpp	2011-04-10 23:52:24 +0000
@@ -94,6 +94,7 @@
 {
   GdkScreen    *screen;
   int           primary;
+  nux::Geometry last_geo (0, 0, 1, 1);
   
   screen = gdk_screen_get_default ();
   primary = GetPrimaryMonitor ();
@@ -109,6 +110,12 @@
     gdk_screen_get_monitor_geometry (screen, i, &rect);
 
     nux::Geometry geo (rect.x, rect.y, rect.width, rect.height);
+
+    // Check for mirrored displays
+    if (geo == last_geo)
+      continue;
+    last_geo = geo;
+
     _monitors.push_back (geo);
 
     g_print ("  Monitor %d%s\n", i, i == primary ? "(primary)" : "");
 
=== modified file 'tests/TestPlacesBackend.cpp'
--- tests/TestPlacesBackend.cpp	2011-02-26 16:48:18 +0000
+++ tests/TestPlacesBackend.cpp	2011-04-10 23:52:24 +0000
@@ -36,6 +36,10 @@
 
     _vbox = gtk_vbox_new (FALSE, 12);
     gtk_container_add (GTK_CONTAINER (_window), _vbox);
+
+    _entry = gtk_entry_new ();
+    gtk_box_pack_start (GTK_BOX (_vbox), _entry, FALSE, FALSE, 0);
+    g_signal_connect (_entry, "changed", G_CALLBACK (OnEntryChanged), this);
       
     _combo = gtk_combo_box_text_new ();
     gtk_box_pack_start (GTK_BOX (_vbox), _combo, FALSE, FALSE, 0);
@@ -48,6 +52,8 @@
     PopulateEntries ();
     _factory->place_added.connect (sigc::mem_fun (this, &TestApp::OnPlaceAdded));
 
+    gtk_combo_box_set_active (GTK_COMBO_BOX (_combo), 0);
+
     gtk_widget_show_all (_window);
   }
 
@@ -66,6 +72,8 @@
       PlaceEntry *entry = static_cast<PlaceEntry *> (*i);
       gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (_combo), entry->GetName ());
     }
+
+    gtk_combo_box_set_active (GTK_COMBO_BOX (_combo), 0);
   }
 
   void PopulateEntries ()
@@ -87,6 +95,16 @@
     }
   }
 
+  static void OnEntryChanged (GtkEditable *editable, TestApp *self)
+  {
+    if (self->_active)
+    {
+      std::map<gchar*, gchar*> hints;
+      self->_active->SetSearch (gtk_entry_get_text (GTK_ENTRY (self->_entry)),
+                                hints);
+    }
+  }
+
   static void OnComboChanged (GtkWidget *combo, TestApp *self)
   {
     self->OnComboChangedFoRealz ();
@@ -110,33 +128,7 @@
       for (i = entries.begin (); i != entries.end (); ++i)
       {
         PlaceEntry *entry = static_cast<PlaceEntry *> (*i);
-
-        if (g_strcmp0 (txt, entry->GetName ()) == 0)
-        {
-          //FIXME : Update when we have sections support
-#if 0
-          DeeModel *sections = entry->GetSectionsModel ();
-          DeeModelIter *iter;
-
-          // Update the sections
-
-          for (gint i = 0; i < _n_secs; i++)
-          {
-            gtk_combo_box_remove_text (GTK_COMBO_BOX (_seccombo), 0);
-          }
-
-          iter = dee_model_get_first_iter (sections);
-          while (!dee_model_is_last(sections, iter))
-          {
-            gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (_seccombo), dee_model_get_string (sections, iter, 0));
-            _n_secs++;
-
-            iter = dee_model_next (sections, iter);
-          }
-
-          gtk_combo_box_set_active (GTK_COMBO_BOX (_seccombo), 0);
-#endif
-        }
+        _active = entry;
       }
     }
 
@@ -147,9 +139,12 @@
 
   GtkWidget *_window;
   GtkWidget *_vbox;
+  GtkWidget *_entry;
   GtkWidget *_combo;
   GtkWidget *_seccombo;
   gint       _n_secs;
+
+  PlaceEntry *_active;
 };