Merge lp:~unity-team/unity/various-fixes-2011-03-08 into lp:unity

[Neil J. Patel]

Attached bugs should be fixed.

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-02-23 17:02:01 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-03-09 19:59:40 +0000
@@ -239,7 +239,7 @@
                            textcol.GetRed (),
                            textcol.GetGreen (),
                            textcol.GetBlue (),
-                           _proxy->label_sensitive ? 1.0f : 0.0f);
+                           _proxy->label_sensitive ? 1.0f : 0.5f);
     cairo_move_to (cr, x, (int)((height - text_height)/2));
     pango_cairo_show_layout (cr, layout);
     cairo_stroke (cr);

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-07 10:59:31 +0000
+++ src/PanelMenuView.cpp	2011-03-09 19:59:40 +0000
@@ -170,7 +170,8 @@
     ret = _panel_titlebar_grab_area->OnEvent (ievent, ret, ProcessEventInfo);
   }
 
-  ret = _menu_layout->ProcessEvent (ievent, ret, ProcessEventInfo);
+  if (!_is_own_window)
+    ret = _menu_layout->ProcessEvent (ievent, ret, ProcessEventInfo);
 
   return ret;
 }

=== modified file 'src/PanelTray.cpp'
--- src/PanelTray.cpp	2011-02-22 23:11:20 +0000
+++ src/PanelTray.cpp	2011-03-09 19:59:40 +0000
@@ -29,9 +29,10 @@
   _settings = g_settings_new (SETTINGS_NAME);
   _whitelist = g_settings_get_strv (_settings, "systray-whitelist");
 
-  _window = gtk_window_new (GTK_WINDOW_POPUP);
+  _window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_type_hint (GTK_WINDOW (_window), GDK_WINDOW_TYPE_HINT_DOCK);
-  //gtk_window_set_keep_above (GTK_WINDOW (_window), TRUE);
+  gtk_window_set_has_resize_grip (GTK_WINDOW (_window), FALSE);
+  gtk_window_set_keep_above (GTK_WINDOW (_window), TRUE);
   gtk_window_set_skip_pager_hint (GTK_WINDOW (_window), TRUE);
   gtk_window_set_skip_taskbar_hint (GTK_WINDOW (_window), TRUE);
   gtk_window_resize (GTK_WINDOW (_window), 1, 24);
@@ -138,7 +139,11 @@
     g_idle_add ((GSourceFunc)IdleSync, self);
   }
 
-  g_debug ("TrayChild %s: %s %s", na_tray_child_get_title (icon), res_name, res_class);
+  g_debug ("TrayChild %s: %s %s %s",
+           accept ? "Accepted" : "Rejected",
+           na_tray_child_get_title (icon),
+           res_name,
+           res_class);
   
   g_free (res_name);
   g_free (res_class);

=== modified file 'src/Place.h'
--- src/Place.h	2010-12-11 13:49:37 +0000
+++ src/Place.h	2011-03-09 19:59:40 +0000
@@ -23,9 +23,17 @@
 #include <vector>
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <glib.h>
 
 #include "PlaceEntry.h"
 
+enum ActivationResult
+{
+  FALLBACK = 0,
+  SHOW_DASH,
+  HIDE_DASH
+};
+
 class Place : public sigc::trackable
 {
 public:
@@ -34,9 +42,12 @@
   virtual std::vector<PlaceEntry *>& GetEntries  () = 0;
   virtual guint32                    GetNEntries () = 0;
 
+  virtual void ActivateResult (const char *uri, const char *mimetype) = 0;
+
   // Signals
   sigc::signal<void, PlaceEntry *> entry_added;
   sigc::signal<void, PlaceEntry *> entry_removed;
+  sigc::signal<void, const char *, ActivationResult> result_activated;
 
 protected:
   std::vector<PlaceEntry *> _entries;

=== modified file 'src/PlaceEntry.h'
--- src/PlaceEntry.h	2011-03-06 17:40:56 +0000
+++ src/PlaceEntry.h	2011-03-09 19:59:40 +0000
@@ -15,6 +15,7 @@
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
  */
+
 #ifndef PLACE_ENTRY_H
 #define PLACE_ENTRY_H
 
@@ -26,6 +27,8 @@
 
 #include <glib.h>
 
+class Place;
+
 class PlaceEntrySection
 {
 public:
@@ -74,6 +77,8 @@
   typedef sigc::slot<void, PlaceEntry *, PlaceEntryGroup&>  GroupForeachCallback;
   typedef sigc::slot<void, PlaceEntry *, PlaceEntryGroup&, PlaceEntryResult&> ResultForeachCallback;
 
+  virtual Place * GetParent () = 0;
+
   virtual const char * GetId          () = 0;
   virtual const char * GetName        () = 0;
   virtual const char * GetIcon        () = 0;
@@ -119,6 +124,9 @@
   virtual void GetResult (const void *id, ResultForeachCallback slot) = 0;
   virtual void GetGlobalResult (const void *id, ResultForeachCallback slot) = 0;
 
+  virtual void ActivateResult (const void *id) = 0;
+  virtual void ActivateGlobalResult (const void *id) = 0;
+
   // Signals
 
   sigc::signal<void, bool>                    active_changed;

=== modified file 'src/PlaceEntryHome.cpp'
--- src/PlaceEntryHome.cpp	2011-03-06 17:51:59 +0000
+++ src/PlaceEntryHome.cpp	2011-03-09 19:59:40 +0000
@@ -281,3 +281,14 @@
     entry->GetGlobalResult (id, sigc::mem_fun (this, &PlaceEntryHome::OnForeachResult));
   }
 }
+
+void
+PlaceEntryHome::ActivateResult (const void *id)
+{
+  PlaceEntry *entry = _id_to_entry[id];
+  
+  if (entry)
+  {
+    entry->ActivateGlobalResult (id);
+  }
+}

=== modified file 'src/PlaceEntryHome.h'
--- src/PlaceEntryHome.h	2011-03-06 17:51:59 +0000
+++ src/PlaceEntryHome.h	2011-03-09 19:59:40 +0000
@@ -37,6 +37,8 @@
   ~PlaceEntryHome ();
 
    /* Overrides */
+  Place * GetParent () { return NULL; }
+
   const gchar * GetId          ();
   const gchar * GetName        ();
   const gchar * GetIcon        ();
@@ -58,17 +60,20 @@
   void SetActiveSection (guint32 section_id);
   void SetGlobalSearch  (const gchar *search, std::map<gchar*, gchar*>& hints);
 
-  void ForeachSection (SectionForeachCallback slot) { };
+  void ForeachSection (SectionForeachCallback slot) {};
 
   void ForeachGroup  (GroupForeachCallback slot);
   void ForeachResult (ResultForeachCallback slot);
 
-  void ForeachGlobalGroup  (GroupForeachCallback slot) { };
-  void ForeachGlobalResult (ResultForeachCallback slot) { };
+  void ForeachGlobalGroup  (GroupForeachCallback slot) {};
+  void ForeachGlobalResult (ResultForeachCallback slot) {};
 
   void GetResult (const void *id, ResultForeachCallback slot);
   void GetGlobalResult (const void *id, ResultForeachCallback slot) {};
 
+  void ActivateResult (const void *id);
+  void ActivateGlobalResult (const void *id) {};
+
 private:
   void LoadExistingEntries ();
   void OnPlaceAdded (Place *place);

=== modified file 'src/PlaceEntryRemote.cpp'
--- src/PlaceEntryRemote.cpp	2011-03-06 17:40:56 +0000
+++ src/PlaceEntryRemote.cpp	2011-03-09 19:59:40 +0000
@@ -180,8 +180,9 @@
 };
 
 
-PlaceEntryRemote::PlaceEntryRemote (const gchar *dbus_name)
+PlaceEntryRemote::PlaceEntryRemote (Place *parent, const gchar *dbus_name)
 : dirty (false),
+  _parent (parent),
   _dbus_path (NULL),
   _name (NULL),
   _icon (NULL),
@@ -303,6 +304,12 @@
 }
 
 /* Overrides */
+Place *
+PlaceEntryRemote::GetParent ()
+{
+  return _parent;
+}
+  
 const gchar *
 PlaceEntryRemote::GetId ()
 {
@@ -627,6 +634,24 @@
   slot (this, group, result);
 }
 
+void
+PlaceEntryRemote::ActivateResult (const void *id)
+{
+  DeeModelIter *iter = (DeeModelIter *)id;
+
+  _parent->ActivateResult (dee_model_get_string (_results_model, iter, RESULT_URI),
+                           dee_model_get_string (_results_model, iter, RESULT_MIMETYPE));
+}
+
+void
+PlaceEntryRemote::ActivateGlobalResult (const void *id)
+{
+  DeeModelIter *iter = (DeeModelIter *)id;
+
+  _parent->ActivateResult (dee_model_get_string (_global_results_model, iter, RESULT_URI),
+                           dee_model_get_string (_global_results_model, iter, RESULT_MIMETYPE));
+}
+
 /* Other methods */
 bool
 PlaceEntryRemote::IsValid ()

=== modified file 'src/PlaceEntryRemote.h'
--- src/PlaceEntryRemote.h	2011-03-06 17:40:56 +0000
+++ src/PlaceEntryRemote.h	2011-03-09 19:59:40 +0000
@@ -35,12 +35,14 @@
 class PlaceEntryRemote : public PlaceEntry
 {
 public:
-  PlaceEntryRemote (const gchar *dbus_name);
+  PlaceEntryRemote (Place *parent, const gchar *dbus_name);
   ~PlaceEntryRemote ();
 
   void InitFromKeyFile (GKeyFile *key_file, const gchar *group);
   
   /* Overrides */
+  Place * GetParent ();
+
   const gchar * GetId          ();
   const gchar * GetName        ();
   const gchar * GetIcon        ();
@@ -73,6 +75,9 @@
   void GetResult (const void *id, ResultForeachCallback slot);
   void GetGlobalResult (const void *id, ResultForeachCallback slot);
 
+  void ActivateResult (const void *id);
+  void ActivateGlobalResult (const void *id);
+
   /* Other methods */
   bool          IsValid ();
   const gchar * GetPath ();
@@ -110,6 +115,7 @@
   bool dirty;
 
 private:
+  Place   *_parent;
   gchar   *_dbus_name;
   gchar   *_dbus_path;
   gchar   *_name;

=== modified file 'src/PlaceFactoryFile.cpp'
--- src/PlaceFactoryFile.cpp	2011-02-21 17:48:29 +0000
+++ src/PlaceFactoryFile.cpp	2011-03-09 19:59:40 +0000
@@ -27,10 +27,6 @@
 
 PlaceFactoryFile::PlaceFactoryFile (const char *directory)
 {
-  //FIXME: This is a temporary Alpha 2 fix
-  g_spawn_command_line_sync ("killall unity-files-daemon", NULL, NULL, NULL, NULL);
-  g_spawn_command_line_sync ("killall unity-applications-daemon", NULL, NULL, NULL, NULL);
-
   /* Use the default lookup location */
   if (directory == NULL)
     _directory = g_build_filename (DATADIR, "unity", "places", NULL);

=== modified file 'src/PlaceLauncherIcon.cpp'
--- src/PlaceLauncherIcon.cpp	2011-02-22 13:46:36 +0000
+++ src/PlaceLauncherIcon.cpp	2011-03-09 19:59:40 +0000
@@ -26,6 +26,8 @@
 
 #include <glib/gi18n-lib.h>
 
+#define SECTION_NUMBER "ted-loves-strings"
+
 PlaceLauncherIcon::PlaceLauncherIcon (Launcher *launcher, PlaceEntry *entry)
 : SimpleLauncherIcon(launcher),
   _entry (entry)
@@ -87,24 +89,52 @@
 
 }
 
+void
+PlaceLauncherIcon::ForeachSectionCallback (PlaceEntry *entry, PlaceEntrySection& section)
+{
+  DbusmenuMenuitem              *menu_item;
+  char *temp;
+
+  temp = g_markup_escape_text (section.GetName (), -1);
+  menu_item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, section.GetName ());
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
+  dbusmenu_menuitem_property_set_int (menu_item, SECTION_NUMBER, _current_menu.size ());
+  _current_menu.push_back (menu_item);
+  g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                    G_CALLBACK (&PlaceLauncherIcon::OnOpen), this);
+  g_free (temp);
+}
+
 std::list<DbusmenuMenuitem *>
 PlaceLauncherIcon::GetMenus ()
 {
-  std::list<DbusmenuMenuitem *>  result;
   DbusmenuMenuitem              *menu_item;
-
-  menu_item = dbusmenu_menuitem_new ();
-
-  dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open"));
-  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
-
+  char * temp;
+  
+  _current_menu.erase (_current_menu.begin (), _current_menu.end ());
+
+  _entry->ForeachSection (sigc::mem_fun (this, &PlaceLauncherIcon::ForeachSectionCallback));
+  
+  menu_item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
+  _current_menu.push_back (menu_item);
+
+  temp = g_markup_escape_text (_entry->GetName (), -1);
+  menu_item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, temp);
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
+  dbusmenu_menuitem_property_set_int (menu_item, SECTION_NUMBER, 0);
+  _current_menu.push_back (menu_item);
   g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                     G_CALLBACK (&PlaceLauncherIcon::OnOpen), this);
-
-  result.push_back (menu_item);
-
-  return result;
+  g_free (temp);
+
+  return _current_menu;
 }
 
 void
@@ -121,7 +151,7 @@
 void
 PlaceLauncherIcon::OnOpen (DbusmenuMenuitem *item, int time, PlaceLauncherIcon *self)
 {
-  self->ActivateLauncherIcon ();
+  self->ActivatePlace (dbusmenu_menuitem_property_get_int (item, SECTION_NUMBER), "");
 }
 
 void

=== modified file 'src/PlaceLauncherIcon.h'
--- src/PlaceLauncherIcon.h	2011-02-22 13:46:36 +0000
+++ src/PlaceLauncherIcon.h	2011-03-09 19:59:40 +0000
@@ -44,10 +44,13 @@
   void ActivateLauncherIcon ();
   void ActivatePlace (guint section_id, const char *search_string);
   void OnActiveChanged (bool is_active);
+  void ForeachSectionCallback (PlaceEntry *entry, PlaceEntrySection& section);
+
   static void OnOpen (DbusmenuMenuitem *item, int time, PlaceLauncherIcon *self);
 
 private:
   PlaceEntry *_entry;
+  std::list<DbusmenuMenuitem *>  _current_menu;
 };
 
 #endif // _PLACE_LAUNCHER_ICON_H__H

=== modified file 'src/PlaceRemote.cpp'
--- src/PlaceRemote.cpp	2011-01-19 22:52:54 +0000
+++ src/PlaceRemote.cpp	2011-03-09 19:59:40 +0000
@@ -32,6 +32,7 @@
 #define MIME_PATTERN     "MimetypePattern"
 
 #define PLACE_IFACE "com.canonical.Unity.Place"
+#define ACTIVE_IFACE "com.canonical.Unity.Activation"
 
 static void on_service_proxy_ready (GObject      *source,
                                     GAsyncResult *result,
@@ -60,7 +61,6 @@
   GKeyFile *key_file;
   GError   *error = NULL;
 
-  g_debug ("Loading Place: %s", path);
   _path = g_strdup (path);
 
   // A .place file is a keyfile, so we create on representing the .place file to
@@ -216,6 +216,17 @@
                             NULL,
                             on_service_proxy_ready,
                             this);
+
+  if (_uri_regex || _mime_regex)
+    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                              NULL,
+                              _dbus_name,
+                              _dbus_path,
+                              ACTIVE_IFACE,
+                              NULL,
+                              (GAsyncReadyCallback)PlaceRemote::OnActivationProxyReady,
+                              this);
 }
 
 std::vector<PlaceEntry *>&
@@ -244,7 +255,7 @@
 
     if (g_str_has_prefix (group, ENTRY_PREFIX))
     {
-      PlaceEntryRemote *entry = new PlaceEntryRemote (_dbus_name);
+      PlaceEntryRemote *entry = new PlaceEntryRemote (this, _dbus_name);
       entry->InitFromKeyFile (key_file, group);
       
       if (entry->IsValid ())
@@ -369,7 +380,7 @@
 
     if (!existing)
     {
-      existing = new PlaceEntryRemote (_dbus_name);
+      existing = new PlaceEntryRemote (this, _dbus_name);
 
       _entries.push_back (existing);
       entry_added.emit (existing);
@@ -456,7 +467,7 @@
                  &global_results_model,
                  &global_hints);
 
-  entry = new PlaceEntryRemote (_dbus_name);
+  entry = new PlaceEntryRemote (this, _dbus_name);
   entry->Update (dbus_path,
                  name,
                  icon,
@@ -512,6 +523,76 @@
   }
 }
 
+void
+PlaceRemote::OnActivationResultReceived (GObject      *source,
+                                         GAsyncResult *result,
+                                         PlaceRemote  *self)
+{
+  GVariant    *args;
+  GError      *error = NULL;
+  guint        ret = 0;
+
+  args = g_dbus_proxy_call_finish ((GDBusProxy *)source, result, &error);
+  if (error)
+  {
+    g_warning ("Unable to call Activate() on: %s",
+               error->message);
+    g_error_free (error);
+    return;
+  }
+
+  self->result_activated.emit (self->_active_uri.c_str (), (ActivationResult)ret);
+
+  g_variant_unref (args);
+}
+
+void
+PlaceRemote::ActivateResult (const char *uri, const char *mimetype)
+{
+  if (G_IS_DBUS_PROXY (_activation_proxy)
+      && ((_uri_regex && g_regex_match (_uri_regex, uri, (GRegexMatchFlags)0, NULL))
+          || (_mime_regex && g_regex_match (_mime_regex, mimetype, (GRegexMatchFlags)0, NULL))))
+  {
+    _active_uri = uri;
+    g_dbus_proxy_call (_activation_proxy,
+                       "Activate",
+                       g_variant_new ("(s)", uri),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, 
+                       NULL,
+                       (GAsyncReadyCallback)OnActivationResultReceived,
+                       this);
+  }
+  else
+  {
+    result_activated.emit (uri, FALLBACK);
+  }
+}
+
+void
+PlaceRemote::OnActivationProxyReady (GObject      *source,
+                                     GAsyncResult *result,
+                                     PlaceRemote  *self)
+{
+  GError *error = NULL;
+  gchar  *name_owner = NULL;
+
+  self->_activation_proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
+  name_owner = g_dbus_proxy_get_name_owner (self->_activation_proxy);
+
+  if (error || !name_owner)
+  {
+    g_warning ("Unable to connect to PlaceRemote Activation %s: %s",
+               self->_dbus_name,
+               error ? error->message : "No name owner");
+    if (error)
+      g_error_free (error);
+  }
+
+  g_free (name_owner);
+}
+
+
 /*
  * C callbacks
  */

=== modified file 'src/PlaceRemote.h'
--- src/PlaceRemote.h	2010-12-12 19:55:40 +0000
+++ src/PlaceRemote.h	2011-03-09 19:59:40 +0000
@@ -49,10 +49,19 @@
 
   const gchar * GetDBusName ();
 
+  void ActivateResult (const char *uri, const char *mimetype);
+
 private:
   void LoadKeyFileEntries (GKeyFile *key_file);
   void Connect ();
 
+  static void OnActivationProxyReady (GObject      *source,
+                                      GAsyncResult *result,
+                                      PlaceRemote  *self);
+  static void OnActivationResultReceived (GObject      *source,
+                                         GAsyncResult *result,
+                                         PlaceRemote  *self);
+
 private:
   char   *_path;
   char   *_dbus_name;
@@ -63,6 +72,8 @@
 
   GDBusProxy *_service_proxy;
   GDBusProxy *_activation_proxy;
+
+  std::string _active_uri;
 };
 
 #endif // PLACE_REMOTE_H

=== modified file 'src/PlacesController.cpp'
--- src/PlacesController.cpp	2011-03-04 15:01:07 +0000
+++ src/PlacesController.cpp	2011-03-09 19:59:40 +0000
@@ -47,7 +47,7 @@
                                  (UBusCallback)&PlacesController::CloseRequest,
                                  this);
 
-  _factory = new PlaceFactoryFile ();
+  _factory = PlaceFactory::GetDefault ();
 
   _window_layout = new nux::HLayout ();
 

=== modified file 'src/PlacesController.h'
--- src/PlacesController.h	2011-03-09 15:04:54 +0000
+++ src/PlacesController.h	2011-03-09 19:59:40 +0000
@@ -63,7 +63,7 @@
   nux::BaseWindow  *_window;
   nux::HLayout     *_window_layout;
   PlacesView       *_view;
-  PlaceFactoryFile *_factory;
+  PlaceFactory     *_factory;
   bool              _visible;
   bool              _fullscren_request;
   static int        _launcher_size;

=== modified file 'src/PlacesGroupController.cpp'
--- src/PlacesGroupController.cpp	2011-03-06 17:40:56 +0000
+++ src/PlacesGroupController.cpp	2011-03-09 19:59:40 +0000
@@ -91,9 +91,12 @@
 
   tile = new PlacesSimpleTile (result_icon,
                                result_name,
-                               style->GetTileIconSize ());
+                               style->GetTileIconSize (),
+                               false,
+                               result.GetId ());
   tile->SetURI (result.GetURI ());
   tile->QueueRelayout ();
+  tile->sigClick.connect (sigc::mem_fun (this, &PlacesGroupController::TileClicked));
 
   _id_to_tile[result.GetId ()] = tile;
   
@@ -105,21 +108,28 @@
 }
 
 void
+PlacesGroupController::TileClicked (PlacesTile *tile)
+{
+  if (_entry)
+  {
+    _entry->ActivateResult (tile->GetId ());
+  }
+}
+
+void
 PlacesGroupController::AddResult (PlaceEntryGroup& group, PlaceEntryResult& result)
 {
   PlacesStyle *style = PlacesStyle::GetDefault ();
 
-  if (!_group->GetExpanded ()
-      && _id_to_tile.size () >= (guint)style->GetDefaultNColumns ())
-  {
-    _queue.push_back (result.GetId ());
-  }
-  else
+  _queue.push_back (result.GetId ());
+  
+  if (_group->GetExpanded ()
+      || _id_to_tile.size () != (guint)style->GetDefaultNColumns ())
   {
     AddTile (_entry, group, result);
   }
 
-  _group->SetCounts (style->GetDefaultNColumns (), _id_to_tile.size () + _queue.size ());
+  _group->SetCounts (style->GetDefaultNColumns (), _queue.size ());
 }
 
 void
@@ -134,19 +144,21 @@
   {
     _queue.erase (it);
   }
-  else if ((tile = _id_to_tile[result.GetId ()]))
+
+  if ((tile = _id_to_tile[result.GetId ()]))
   {
-    _id_to_tile.erase (result.GetId ());
-
     _group->GetChildLayout ()->RemoveChildObject (tile);
     _group->Relayout ();
-    _group->SetVisible (_id_to_tile.size ());
   }
+  
+  _id_to_tile.erase (result.GetId ());
 
   if (!_check_tiles_id)
     _check_tiles_id = g_timeout_add (0, (GSourceFunc)CheckTilesTimeout, this);
-  
-  _group->SetCounts (PlacesStyle::GetDefault ()->GetDefaultNColumns (), _id_to_tile.size () + _queue.size ());
+
+  _group->SetVisible (_queue.size ());
+  _group->SetCounts (PlacesStyle::GetDefault ()->GetDefaultNColumns (),
+                     _queue.size ());
 }
 
 void
@@ -162,7 +174,7 @@
   guint          n_to_show;
 
   if (_group->GetExpanded ())
-    n_to_show = _id_to_tile.size () + _queue.size ();
+    n_to_show = _queue.size ();
   else
     n_to_show = style->GetDefaultNColumns ();
 
@@ -172,30 +184,34 @@
   }
   else if (_id_to_tile.size () < n_to_show)
   {
-    while (_id_to_tile.size () < n_to_show && _queue.size ())
-    {
-      _entry->GetResult ((*_queue.begin ()), sigc::mem_fun (this, &PlacesGroupController::AddTile));
-      _queue.erase (_queue.begin ());
-    }
-  }
-  else // Remove some
-  {
-    while (_id_to_tile.size () != n_to_show)
-    {
-      std::map<const void *, PlacesTile *>::reverse_iterator it;
-
-      it = _id_to_tile.rbegin ();
-
-      if (it != _id_to_tile.rend ())
+    std::vector<const void *>::iterator it = _queue.begin ();
+
+    if (_queue.size () >= n_to_show)
+    {
+      it += _id_to_tile.size ();
+
+      while (_id_to_tile.size () < n_to_show && it != _queue.end ())
       {
-        _group->GetChildLayout ()->RemoveChildObject ((*it).second);
+        _entry->GetResult ((*it), sigc::mem_fun (this, &PlacesGroupController::AddTile));
+        it++;
       }
-
-      _queue.insert (_queue.begin (), (*it).first);
-      _id_to_tile.erase ((*it).first);
-    }
-  }
-
+    }
+  }
+  else // Remove some
+  {
+    std::vector<const void *>::iterator it, eit = _queue.end ();
+
+    for (it = _queue.begin () + n_to_show; it != eit; ++it)
+    {
+      PlacesTile *tile = _id_to_tile[*it];
+
+      if (tile)
+        _group->GetChildLayout ()->RemoveChildObject (tile);
+
+      _id_to_tile.erase (*it);
+    }
+
+  }
   _group->Relayout ();
 }
 
@@ -208,6 +224,26 @@
   return FALSE;
 }
 
+bool
+PlacesGroupController::ActivateFirst ()
+{
+  std::vector<const void *>::iterator it = _queue.begin ();
+
+  if (it != _queue.end ())
+  {
+    PlacesTile *tile = _id_to_tile[*it];
+
+    if (tile)
+    {
+      nux::Geometry geo = tile->GetGeometry ();
+      tile->OnMouseClick.emit (geo.x, geo.y, 0, 0);
+      return true;
+    }
+  }
+
+  return false;
+}
+
 //
 // Introspectable
 //

=== modified file 'src/PlacesGroupController.h'
--- src/PlacesGroupController.h	2011-03-06 17:40:56 +0000
+++ src/PlacesGroupController.h	2011-03-09 19:59:40 +0000
@@ -41,6 +41,8 @@
 
   void Clear ();
 
+  bool ActivateFirst ();
+
 protected:
   const gchar* GetName ();
   void         AddProperties (GVariantBuilder *builder);
@@ -49,6 +51,7 @@
   void AddTile (PlaceEntry *ignore, PlaceEntryGroup& group, PlaceEntryResult& result);
   void CheckTiles ();
   static gboolean CheckTilesTimeout (PlacesGroupController *self);
+  void TileClicked (PlacesTile *tile);
 
 private:
   PlaceEntry  *_entry;

=== modified file 'src/PlacesHomeView.cpp'
--- src/PlacesHomeView.cpp	2011-02-28 12:58:19 +0000
+++ src/PlacesHomeView.cpp	2011-03-09 19:59:40 +0000
@@ -126,6 +126,8 @@
                           NULL, NULL);
 
   Refresh ();
+
+  expanded.connect (sigc::mem_fun (this, &PlacesHomeView::Refresh));
 }
 
 PlacesHomeView::~PlacesHomeView ()
@@ -156,6 +158,9 @@
 
   _layout->Clear ();
 
+  if (!GetExpanded ())
+    return;
+
   // Find Media Apps
   markup = g_strdup_printf (temp, _("Find Media Apps"));
   shortcut = new Shortcut (PKGDATADIR"/find_media_apps.png",

=== modified file 'src/PlacesResultsController.cpp'
--- src/PlacesResultsController.cpp	2011-03-06 17:40:56 +0000
+++ src/PlacesResultsController.cpp	2011-03-09 19:59:40 +0000
@@ -103,6 +103,17 @@
   _results_view->Clear ();
 }
 
+bool
+PlacesResultsController::ActivateFirst ()
+{
+  std::map <const void *, PlacesGroupController *>::iterator it, eit = _id_to_group.end ();
+  
+  for (it = _id_to_group.begin (); it != eit; ++it)
+    if ((it->second)->ActivateFirst ())
+      return true;
+
+  return false;
+}
 
 //
 // Introspection

=== modified file 'src/PlacesResultsController.h'
--- src/PlacesResultsController.h	2011-03-06 17:40:56 +0000
+++ src/PlacesResultsController.h	2011-03-09 19:59:40 +0000
@@ -44,6 +44,8 @@
   // Clears all the current groups and results
   void Clear ();
 
+  bool ActivateFirst ();
+
 protected:
   const gchar* GetName ();
   void         AddProperties (GVariantBuilder *builder);

=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-03-05 18:11:55 +0000
+++ src/PlacesSearchBar.cpp	2011-03-09 19:59:40 +0000
@@ -74,6 +74,7 @@
 
   _pango_entry = new nux::TextEntry ("", NUX_TRACKER_LOCATION);
   _pango_entry->sigTextChanged.connect (sigc::mem_fun (this, &PlacesSearchBar::OnSearchChanged));
+  _pango_entry->activated.connect (sigc::mem_fun (this, &PlacesSearchBar::OnEntryActivated));
   _layered_layout->AddLayer (_pango_entry);
 
   _layered_layout->SetPaintAll (true);
@@ -300,6 +301,12 @@
 }
 
 void
+PlacesSearchBar::OnEntryActivated ()
+{
+  activated.emit ();
+}
+
+void
 PlacesSearchBar::OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self)
 {
 #define HOW_LARGE 8

=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-03-05 18:11:55 +0000
+++ src/PlacesSearchBar.h	2011-03-09 19:59:40 +0000
@@ -55,6 +55,7 @@
                        const char *search_string);
 
   sigc::signal<void, const char *> search_changed;
+  sigc::signal<void> activated;
 
   bool CanFocus ();
 
@@ -72,6 +73,7 @@
   void OnSectionAdded (PlaceEntry *entry, PlaceEntrySection& section);
   void OnComboChanged (nux::ComboBoxSimple *simple);
   void OnMenuClosing (nux::MenuPage *menu, int x, int y);
+  void OnEntryActivated ();
 
   static bool OnLiveSearchTimeout (PlacesSearchBar *self);
   static void OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self);

=== modified file 'src/PlacesSettings.cpp'
--- src/PlacesSettings.cpp	2011-02-21 11:20:17 +0000
+++ src/PlacesSettings.cpp	2011-03-09 19:59:40 +0000
@@ -54,7 +54,7 @@
     primary_monitor = gdk_screen_get_primary_monitor (screen);
     gdk_screen_get_monitor_geometry (screen, primary_monitor, &geo);
 
-    _form_factor = geo.height > 800 ? DESKTOP : NETBOOK;
+    _form_factor = geo.height > 799 ? DESKTOP : NETBOOK;
   }
   else
   {

=== modified file 'src/PlacesSimpleTile.cpp'
--- src/PlacesSimpleTile.cpp	2011-03-01 04:08:36 +0000
+++ src/PlacesSimpleTile.cpp	2011-03-09 19:59:40 +0000
@@ -26,8 +26,12 @@
 
 #include "PlacesSimpleTile.h"
 
-PlacesSimpleTile::PlacesSimpleTile (const char *icon_name, const char *label, int icon_size, bool defer_icon_loading)
-: PlacesTile (NUX_TRACKER_LOCATION),
+PlacesSimpleTile::PlacesSimpleTile (const char *icon_name,
+                                    const char *label,
+                                    int         icon_size,
+                                    bool defer_icon_loading,
+                                    const void *id)
+: PlacesTile (NUX_TRACKER_LOCATION, id),
   _label (NULL),
   _icon (NULL),
   _uri (NULL)
@@ -58,8 +62,6 @@
 
   SetLayout (layout);
 
-  OnMouseClick.connect (sigc::mem_fun (this, &PlacesSimpleTile::Clicked));
-  
   SetDndEnabled (true, false);
 }
 
@@ -190,17 +192,6 @@
 }
 
 void
-PlacesSimpleTile::Clicked (int x, int y, unsigned long button_flags, unsigned long key_flags)
-{
-  if (_uri)
-  {
-    ubus_server_send_message (ubus_server_get_default (),
-                              UBUS_PLACE_TILE_ACTIVATE_REQUEST,
-                              g_variant_new_string (_uri));
-  }
-}
-
-void
 PlacesSimpleTile::LoadIcon ()
 {
   _icontex->LoadIcon ();

=== modified file 'src/PlacesSimpleTile.h'
--- src/PlacesSimpleTile.h	2011-03-01 04:08:36 +0000
+++ src/PlacesSimpleTile.h	2011-03-09 19:59:40 +0000
@@ -31,7 +31,7 @@
 {
 public:
 
-  PlacesSimpleTile (const char *icon, const char *label, int icon_size=64, bool defer_icon_loading=false);
+  PlacesSimpleTile (const char *icon, const char *label, int icon_size=64, bool defer_icon_loading=false, const void *id=NULL);
   ~PlacesSimpleTile ();
 
   const char * GetLabel ();
@@ -53,8 +53,6 @@
   virtual std::list<const char *> DndSourceGetDragTypes   ();
   virtual const char *            DndSourceGetDataForType (const char *type, int *size, int *format);
   virtual void                    DndSourceDragFinished   (nux::DndAction result);
-private:
-  void Clicked (int x, int y, unsigned long button_flags, unsigned long key_flags);
 
 private:
   nux::Geometry _highlight_geometry;

=== modified file 'src/PlacesTile.cpp'
--- src/PlacesTile.cpp	2011-02-28 22:19:04 +0000
+++ src/PlacesTile.cpp	2011-03-09 19:59:40 +0000
@@ -27,8 +27,9 @@
 
 #define PADDING 8
 
-PlacesTile::PlacesTile (NUX_FILE_LINE_DECL) :
+PlacesTile::PlacesTile (NUX_FILE_LINE_DECL, const void *id) :
   View (NUX_FILE_LINE_PARAM),
+  _id (id),
   _hilight_background (NULL),
   _hilight_layer (NULL),
   _last_width (0),
@@ -55,7 +56,14 @@
     delete _hilight_layer;
 }
 
-void PlacesTile::OnFocusChanged (nux::Area *area)
+const void *
+PlacesTile::GetId ()
+{
+  return _id;
+}
+
+void
+PlacesTile::OnFocusChanged (nux::Area *area)
 {
   QueueDraw ();
 }
@@ -341,9 +349,3 @@
 {
   QueueDraw ();
 }
-
-void
-PlacesTile::ActivateFocus ()
-{
-  sigClick.emit (this);
-}

=== modified file 'src/PlacesTile.h'
--- src/PlacesTile.h	2011-02-28 16:27:57 +0000
+++ src/PlacesTile.h	2011-03-09 19:59:40 +0000
@@ -31,13 +31,13 @@
 class PlacesTile : public nux::View
 {
 public:
-  PlacesTile (NUX_FILE_LINE_PROTO);
+  PlacesTile (NUX_FILE_LINE_PROTO, const void *id=NULL);
   ~PlacesTile ();
 
+  const void * GetId ();
+
   sigc::signal<void, PlacesTile*> sigClick;
 
-  virtual void ActivateFocus ();
-
 protected:
   virtual nux::Geometry GetHighlightGeometry ();
 
@@ -64,6 +64,7 @@
   void DrawHighlight (const char *texid, int width, int height, nux::BaseTexture **texture);
 
 private:
+  const void *_id;
   nux::BaseTexture  *_hilight_background;
   nux::TextureLayer *_hilight_layer;
 

=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-06 17:40:56 +0000
+++ src/PlacesView.cpp	2011-03-09 19:59:40 +0000
@@ -43,6 +43,9 @@
   _entry (NULL),
   _size_mode (SIZE_MODE_FULLSCREEN)
 {
+  LoadPlaces ();
+  _factory->place_added.connect (sigc::mem_fun (this, &PlacesView::OnPlaceAdded));
+
   _home_entry = new PlaceEntryHome (_factory);
 
   _layout = new nux::HLayout (NUX_TRACKER_LOCATION);
@@ -58,6 +61,7 @@
   AddChild (_search_bar);
 
   _search_bar->search_changed.connect (sigc::mem_fun (this, &PlacesView::OnSearchChanged));
+  _search_bar->activated.connect (sigc::mem_fun (this, &PlacesView::OnEntryActivated));
 
   _layered_layout = new nux::LayeredLayout (NUX_TRACKER_LOCATION);
   vlayout->AddLayout (_layered_layout, 1, nux::eCenter, nux::eFull);
@@ -96,7 +100,7 @@
                                  (UBusCallback)&PlacesView::CloseRequest,
                                  this);
   ubus_server_register_interest (ubus, UBUS_PLACE_TILE_ACTIVATE_REQUEST,
-                                 (UBusCallback)&PlacesView::OnResultClicked,
+                                 (UBusCallback)&PlacesView::OnResultActivated,
                                  this);
   ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_QUEUE_DRAW,
                                  (UBusCallback)&PlacesView::OnPlaceViewQueueDrawNeeded,
@@ -378,25 +382,17 @@
 void
 PlacesView::OnResultAdded (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result)
 {
-  //FIXME: We can't do anything with these do just ignore
-  if (g_str_has_prefix (result.GetURI (), "unity-install"))
-    return;
-
   _results_controller->AddResult (entry, group, result);
 }
 
 void
 PlacesView::OnResultRemoved (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result)
 {
-  //FIXME: We can't do anything with these do just ignore
-  if (g_str_has_prefix (result.GetURI (), "unity-install"))
-    return;
-
   _results_controller->RemoveResult (entry, group, result);
 }
 
 void
-PlacesView::OnResultClicked (GVariant *data, PlacesView *self)
+PlacesView::OnResultActivated (GVariant *data, PlacesView *self)
 {
   const char *uri;
 
@@ -527,6 +523,52 @@
   self->QueueDraw ();
 }
 
+void
+PlacesView::OnEntryActivated ()
+{
+  if (!_results_controller->ActivateFirst ())
+    g_debug ("Cannot activate anything");
+}
+
+void
+PlacesView::LoadPlaces ()
+{
+  std::vector<Place *>::iterator it, eit = _factory->GetPlaces ().end ();
+
+  for (it = _factory->GetPlaces ().begin (); it != eit; ++it)
+  {
+    OnPlaceAdded (*it);
+  }
+}
+
+void
+PlacesView::OnPlaceAdded (Place *place)
+{
+  place->result_activated.connect (sigc::mem_fun (this, &PlacesView::OnPlaceResultActivated));
+}
+
+void
+PlacesView::OnPlaceResultActivated (const char *uri, ActivationResult res)
+{
+  switch (res)
+  {
+    case FALLBACK:
+      OnResultActivated (g_variant_new_string (uri), this);
+      break;
+    case SHOW_DASH:
+      break;
+    case HIDE_DASH:
+      ubus_server_send_message (ubus_server_get_default (),
+                                UBUS_PLACE_VIEW_CLOSE_REQUEST,
+                                NULL);
+      break;
+    default:
+      g_warning ("Activation result %d not supported", res);
+      break;
+  };
+}
+
+
 //
 // Introspection
 //

=== modified file 'src/PlacesView.h'
--- src/PlacesView.h	2011-03-01 09:22:43 +0000
+++ src/PlacesView.h	2011-03-09 19:59:40 +0000
@@ -95,12 +95,19 @@
   void OnResultAdded   (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
   void OnResultRemoved (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
 
-  static void OnResultClicked (GVariant *data, PlacesView *self);
+  bool TryPlaceActivation (const char *uri);
+  static void OnResultActivated (GVariant *data, PlacesView *self);
   void OnSearchChanged (const char *search_string);
   void OnResultsViewGeometryChanged (nux::Area *view, nux::Geometry& view_geo);
 
   static void OnPlaceViewQueueDrawNeeded (GVariant *data, PlacesView *self);
 
+  void OnEntryActivated ();
+
+  void LoadPlaces ();
+  void OnPlaceAdded (Place *place);
+  void OnPlaceResultActivated (const char *uri, ActivationResult res);
+
 private:
   PlaceFactory       *_factory;
   nux::HLayout       *_layout;