Merge lp:~unity-team/unity/unity.fix-sc-icon-to-launcher-animation-981168 into lp:unity

[Jay Taoko]

* Capture information about the icon of the application to be installed from the software center. Re-use it when rendering the launcher interface.
* Fix bug #981168

* Capture information about the icon of the application to be installed from the software center. Re-use it when rendering the launcher interface.
* Fix bug #981168

UNBLOCK

[Gord Allott (gordallott)]

just a quick fix needed on this branch,
first the we need to g_free the _sc_* pointers in the destructor

Then secondly, in this code, after g_free'ing the pointers the pointers should be set to NULL:

25 +
26 + if (_sc_anim_icon)
27 + {
28 + launcher_addrequest_special.emit(_sc_icon_desktop_file, AbstractLauncherIcon::Ptr(), _sc_icon_aptdaemon_task, _sc_icon, _sc_icon_x, _sc_icon_y, _sc_icon_size);
29 + g_free(_sc_icon);
30 + g_free(_sc_icon_title);
31 + g_free(_sc_icon_desktop_file);
32 + g_free(_sc_icon_aptdaemon_task);
33 + _sc_anim_icon = false;
34 + }

Then thirdly, before this code we should be g_free'ing the pointers to ensure there is no possible memory leak

58 + self->_sc_anim_icon = true;
59 + g_variant_get(parameters, "(ssiiiss)", &self->_sc_icon_title,
60 + &self->_sc_icon,
61 + &self->_sc_icon_x,
62 + &self->_sc_icon_y,
63 + &self->_sc_icon_size,
64 + &self->_sc_icon_desktop_file,
65 + &self->_sc_icon_aptdaemon_task, NULL);

Other than that, looks good to me

review: Needs Fixing

[Tim Penhey (thumper)]

My thoughts were around why not use glib::String objects?

[Gord Allott (gordallott)]

fixed up myself..

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-05-15 19:33:20 +0000
+++ launcher/Launcher.cpp	2012-05-24 10:26:20 +0000
@@ -294,6 +294,16 @@
   launcher_pressure_effect_ = cache.FindTexture("launcher_pressure_effect", 0, 0, cb);
 
   options.changed.connect (sigc::mem_fun (this, &Launcher::OnOptionsChanged));
+
+  // icon information from software center
+  _sc_icon = NULL;
+  _sc_icon_title = NULL;
+  _sc_icon_x = 0;
+  _sc_icon_y = 0;
+  _sc_icon_size = 0;
+  _sc_icon_desktop_file = NULL;
+  _sc_icon_aptdaemon_task = NULL;
+  _sc_anim_icon = false;
 }
 
 Launcher::~Launcher()
@@ -321,6 +331,11 @@
 
   delete _hover_machine;
   delete _hide_machine;
+
+  g_free(_sc_icon);
+  g_free(_sc_icon_title);
+  g_free(_sc_icon_desktop_file);
+  g_free(_sc_icon_aptdaemon_task);
 }
 
 /* Introspection */
@@ -2087,6 +2102,16 @@
   gPainter.PopBackground(push_count);
   GfxContext.PopClippingRectangle();
   GfxContext.PopClippingRectangle();
+
+  if (_sc_anim_icon)
+  {
+    launcher_addrequest_special.emit(_sc_icon_desktop_file, AbstractLauncherIcon::Ptr(), _sc_icon_aptdaemon_task, _sc_icon, _sc_icon_x, _sc_icon_y, _sc_icon_size);
+    g_free(_sc_icon); _sc_icon = NULL;
+    g_free(_sc_icon_title); _sc_icon_title = NULL;
+    g_free(_sc_icon_desktop_file); _sc_icon_desktop_file = NULL;
+    g_free(_sc_icon_aptdaemon_task); _sc_icon_aptdaemon_task = NULL;
+    _sc_anim_icon = false;
+  }
 }
 
 void Launcher::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -2951,30 +2976,23 @@
                                   GDBusMethodInvocation* invocation,
                                   gpointer               user_data)
 {
-
   if (g_strcmp0(method_name, "AddLauncherItemFromPosition") == 0)
   {
-    gchar*  icon;
-    gchar*  title;
-    gint32  icon_x;
-    gint32  icon_y;
-    gint32  icon_size;
-    gchar*  desktop_file;
-    gchar*  aptdaemon_task;
-
-    g_variant_get(parameters, "(ssiiiss)", &title, &icon, &icon_x, &icon_y, &icon_size, &desktop_file, &aptdaemon_task, NULL);
-
     Launcher* self = (Launcher*)user_data;
-    self->launcher_addrequest_special.emit(desktop_file, AbstractLauncherIcon::Ptr(), aptdaemon_task, icon,
-                                            icon_x, icon_y, icon_size);
+    self->_sc_anim_icon = true;
+    g_free(self->_sc_icon);
+    g_free(self->_sc_icon_desktop_file);
+    g_free(self->_sc_icon_aptdaemon_task);
+    g_variant_get(parameters, "(ssiiiss)", &self->_sc_icon_title,
+      &self->_sc_icon,
+      &self->_sc_icon_x,
+      &self->_sc_icon_y,
+      &self->_sc_icon_size,
+      &self->_sc_icon_desktop_file,
+      &self->_sc_icon_aptdaemon_task, NULL);
 
     g_dbus_method_invocation_return_value(invocation, nullptr);
-    g_free(icon);
-    g_free(title);
-    g_free(desktop_file);
-    g_free(aptdaemon_task);
   }
-
 }
 
 void

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-05-07 19:52:54 +0000
+++ launcher/Launcher.h	2012-05-24 10:26:20 +0000
@@ -122,6 +122,8 @@
   sigc::signal<void, AbstractLauncherIcon::Ptr> icon_animation_complete;
   sigc::signal<void> selection_change;
   sigc::signal<void> hidden_changed;
+  sigc::signal<void> sc_launcher_icon_animation;
+  sigc::connection sc_launcher_icon_animation_connection;
 
   virtual bool InspectKeyEvent(unsigned int eventType,
                                unsigned int keysym,
@@ -416,6 +418,15 @@
 
   ui::AbstractIconRenderer::Ptr icon_renderer;
   BackgroundEffectHelper bg_effect_helper_;
+
+  gchar*  _sc_icon;
+  gchar*  _sc_icon_title;
+  gint32  _sc_icon_x;
+  gint32  _sc_icon_y;
+  gint32  _sc_icon_size;
+  gchar*  _sc_icon_desktop_file;
+  gchar*  _sc_icon_aptdaemon_task;
+  bool    _sc_anim_icon;
 };
 
 }