Merge lp:~gordallott/unity/fixes-08-04 into lp:unity

[Gord Allott]

fixes attached bug and a few mem leaks

[Jason Smith (jassmith)]

+1 looks good

review: Approve

=== modified file 'src/IconTexture.cpp'
--- src/IconTexture.cpp	2011-03-24 01:01:59 +0000
+++ src/IconTexture.cpp	2011-04-10 15:18:35 +0000
@@ -70,9 +70,14 @@
 IconTexture::~IconTexture ()
 {
   g_free (_icon_name);
-
   if (_texture_cached)
+  {   
     _texture_cached->UnReference ();
+    if (_texture_cached->GetReferenceCount () == 1)
+    {
+      _texture_cached->UnReference ();
+    }
+  }
 }
 
 void
@@ -138,7 +143,6 @@
 {
   TextureCache *cache = TextureCache::GetDefault ();
   char *id = NULL;
-
   _pixbuf_cached = pixbuf;
 
   // Cache the pixbuf dimensions so we scale correctly
@@ -148,7 +152,11 @@
   // Try and get a texture from the texture cache
   id = g_strdup_printf ("IconTexture.%s", _icon_name);
   if (_texture_cached)
+  {
     _texture_cached->UnReference ();
+     if (_texture_cached->GetReferenceCount () == 1)
+       _texture_cached->UnReference (); 
+  }
 
   _texture_cached = cache->FindTexture (id,
                                         _texture_width,
@@ -224,7 +232,12 @@
 IconTexture::SetTexture (nux::BaseTexture *texture)
 {
   if (_texture_cached)
+  {
     _texture_cached->UnReference ();
+    if (_texture_cached->GetReferenceCount () == 1)
+      _texture_cached->UnReference (); 
+  }
+  
   _texture_cached = texture;
   _texture_cached->Reference ();
 }

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-04-10 05:27:31 +0000
+++ src/Launcher.cpp	2011-04-10 15:18:35 +0000
@@ -252,6 +252,8 @@
     _set_hidden_connection = (sigc::connection) _hide_machine->should_hide_changed.connect (sigc::mem_fun (this, &Launcher::SetHidden));    
     _hover_machine = new LauncherHoverMachine ();
     _set_hover_connection = (sigc::connection) _hover_machine->should_hover_changed.connect (sigc::mem_fun (this, &Launcher::SetHover));
+    
+    _launcher_animation_timeout = 0;
 
     m_Layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
@@ -545,6 +547,9 @@
   if (_on_drag_finish_connection.connected ())
     _on_drag_finish_connection.disconnect ();
     
+  if (_launcher_animation_timeout > 0)
+    g_source_remove (_launcher_animation_timeout);
+    
 }
 
 /* Introspection */
@@ -880,6 +885,7 @@
 {
     Launcher *self = (Launcher*) data;
     self->NeedRedraw ();
+    self->_launcher_animation_timeout = 0;
     return false;
 }
 
@@ -2685,8 +2691,8 @@
     float launcher_alpha = 1.0f;
 
     // rely on the compiz event loop to come back to us in a nice throttling
-    if (AnimationInProgress ())   
-      g_timeout_add (0, &Launcher::AnimationTimeout, this);
+    if (AnimationInProgress ())
+      _launcher_animation_timeout = g_timeout_add (0, &Launcher::AnimationTimeout, this);
 
     nux::ROPConfig ROP;
     ROP.Blend = false;

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-04-10 03:39:11 +0000
+++ src/Launcher.h	2011-04-10 15:18:35 +0000
@@ -503,6 +503,8 @@
   LauncherIcon     *_dnd_hovered_icon;
   
   Atom              _selection_atom;
+  
+  guint             _launcher_animation_timeout;
 
   /* gdbus */
   guint                       _dbus_owner;

=== modified file 'src/PlacesStyle.cpp'
--- src/PlacesStyle.cpp	2011-03-23 22:33:25 +0000
+++ src/PlacesStyle.cpp	2011-04-10 15:18:35 +0000
@@ -243,6 +243,7 @@
     g_object_unref (pixbuf);
   }
 
+  texture->Reference (); // stop it getting unreffed by IconTexture
   return texture;
 }
 

=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-04-10 05:50:16 +0000
+++ src/StaticCairoText.cpp	2011-04-10 15:18:35 +0000
@@ -490,6 +490,8 @@
 
   _texture2D = GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
   _texture2D->Update (bitmap);
+  
+  delete bitmap;
 
   cairo_destroy (cr);