Merge lp:~gordallott/unity/unity-31-03-11-places-fixes into lp:unity

[Gord Allott]

small fixes, bugs attached

[Jason Smith (jassmith)]

Reverts out recent changes to trunk???

review: Needs Fixing

[Gord Allott (gordallott)]

> Reverts out recent changes to trunk???
Trunk would not build at the time, needed to build trunk - obviously would of handled that when merging back into trunk. shouldn't of been marked as needs fixing and has now missed release.

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-04-02 08:36:07 +0000
+++ src/BamfLauncherIcon.cpp	2011-04-05 09:30:54 +0000
@@ -104,6 +104,8 @@
 BamfLauncherIcon::BamfLauncherIcon (Launcher* IconManager, BamfApplication *app, CompScreen *screen)
 :   SimpleLauncherIcon(IconManager)
 {
+  _cached_desktop_file = NULL;
+  _cached_name = NULL;
   m_App = app;
   m_Screen = screen;
   _remote_uri = 0;
@@ -113,7 +115,7 @@
   _menu_desktop_shortcuts = NULL;
   char *icon_name = bamf_view_get_icon (BAMF_VIEW (m_App));
 
-  SetTooltipText (bamf_view_get_name (BAMF_VIEW (app)));
+  SetTooltipText (BamfName ());
   SetIconName (icon_name);
   SetIconType (TYPE_APPLICATION);
 
@@ -172,6 +174,9 @@
   g_signal_handlers_disconnect_by_func (m_App, (void *) &BamfLauncherIcon::OnClosed,             this);
 
   g_object_unref (m_App);
+
+  g_free (_cached_desktop_file);
+  g_free (_cached_name);
 }
 
 void
@@ -199,7 +204,35 @@
 const char*
 BamfLauncherIcon::DesktopFile ()
 {
-  return bamf_application_get_desktop_file (m_App);
+  char *filename = NULL;
+  filename = (char*) bamf_application_get_desktop_file (m_App);
+
+  if (filename != NULL)
+  {
+    if (_cached_desktop_file != NULL)
+      g_free (_cached_desktop_file);
+    
+    _cached_desktop_file = g_strdup (filename);
+  }
+  
+  return _cached_desktop_file;
+}
+
+const char*
+BamfLauncherIcon::BamfName ()
+{
+  char *name = NULL;
+  name = (char *)bamf_view_get_name (BAMF_VIEW (m_App));
+
+  if (name != NULL)
+  {
+    if (_cached_name != NULL)
+      g_free (_cached_name);
+
+    _cached_name = g_strdup (name);
+  }
+
+  return _cached_name;
 }
 
 void
@@ -825,7 +858,7 @@
   }
 
   gchar *app_name;
-  app_name = g_markup_escape_text (bamf_view_get_name (BAMF_VIEW (m_App)), -1);
+  app_name = g_markup_escape_text (BamfName (), -1);
 
   item = dbusmenu_menuitem_new ();
   dbusmenu_menuitem_property_set (item,

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-04-02 07:03:30 +0000
+++ src/BamfLauncherIcon.h	2011-04-05 09:30:54 +0000
@@ -66,6 +66,8 @@
     
     std::list<char *> ValidateUrisForLaunch (std::list<char *> uris);
 
+    const char* BamfName ();
+
 private:
     BamfApplication *m_App;
     CompScreen *m_Screen;
@@ -80,6 +82,9 @@
     sigc::connection _on_window_minimized_connection;
     sigc::connection _hidden_changed_connection;
 
+    gchar *_cached_desktop_file;
+    gchar *_cached_name;
+
     void EnsureWindowState ();
 
     void UpdateMenus ();

=== modified file 'src/PlacesController.cpp'
--- src/PlacesController.cpp	2011-03-24 00:35:26 +0000
+++ src/PlacesController.cpp	2011-04-05 09:30:54 +0000
@@ -159,8 +159,6 @@
   _visible = false;
   _fullscren_request = false;
 
-  _view->SetActiveEntry (NULL, 0, "");
-
   StartShowHideTimeline ();
   
   ubus_server_send_message (ubus_server_get_default (),  UBUS_PLACE_VIEW_HIDDEN, NULL);
@@ -215,8 +213,12 @@
     // Make sure the state is right
     self->_window->SetOpacity (self->_visible ? 1.0f : 0.0f);
     if (!self->_visible)
+    {
       self->_window->ShowWindow (false, false);
-
+      //reset the active entry
+      self->_view->SetActiveEntry (NULL, 0, "");
+    }
+    
     return FALSE;
   }
   return TRUE;

=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-31 20:38:49 +0000
+++ src/PlacesView.cpp	2011-04-05 09:30:54 +0000
@@ -41,6 +41,7 @@
 
 PlacesView::PlacesView (PlaceFactory *factory)
 : nux::View (NUX_TRACKER_LOCATION),
+  _close_idle (0),
   _factory (factory),
   _entry (NULL),
   _size_mode (SIZE_MODE_FULLSCREEN),
@@ -134,6 +135,11 @@
 
 PlacesView::~PlacesView ()
 {
+  if (_close_idle != 0)
+  {
+    g_source_remove (_close_idle);
+    _close_idle = 0;
+  }
   delete _home_entry;
 }
 
@@ -170,7 +176,6 @@
     geo.height = _actual_height;
     if (!geo.IsPointInside (ievent.e_x, ievent.e_y))
     {
-      SetActiveEntry (NULL, 0, "");
       return TraverseInfo |= nux::eMouseEventSolved;
     }
   }
@@ -419,6 +424,7 @@
 void
 PlacesView::SetActiveEntry (PlaceEntry *entry, guint section_id, const char *search_string, bool signal)
 {
+  
   if (signal)
     entry_changed.emit (entry);
 
@@ -808,7 +814,22 @@
 void
 PlacesView::CloseRequest (GVariant *data, PlacesView *self)
 {
+  if (self->_close_idle != 0)
+  {
+    g_source_remove (self->_close_idle);
+    self->_close_idle = 0;
+  }
+
+  //add a timeout because the home view flashes on close
+  self->_close_idle = g_timeout_add_seconds (100, (GSourceFunc)OnCloseTimeout, self);
+}
+
+gboolean 
+PlacesView::OnCloseTimeout (PlacesView *self)
+{
+  self->_close_idle = 0;
   self->SetActiveEntry (NULL, 0, "");
+  return FALSE;
 }
 
 nux::TextEntry*

=== modified file 'src/PlacesView.h'
--- src/PlacesView.h	2011-03-24 01:18:18 +0000
+++ src/PlacesView.h	2011-04-05 09:30:54 +0000
@@ -101,8 +101,8 @@
   void AddProperties (GVariantBuilder *builder);
 
 private:
-  static void CloseRequest (GVariant *data, PlacesView *self);
-
+  static void     CloseRequest (GVariant *data, PlacesView *self);
+  static gboolean OnCloseTimeout (PlacesView *self);
   void OnGroupAdded    (PlaceEntry *entry, PlaceEntryGroup& group);
   void OnResultAdded   (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
   void OnResultRemoved (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
@@ -130,6 +130,8 @@
   static gboolean OnSearchTimedOut (PlacesView *view);
 
 private:
+  guint _close_idle;
+  
   PlaceFactory       *_factory;
   nux::HLayout       *_layout;
   nux::LayeredLayout *_layered_layout;