Merge lp:~thomir-deactivatedaccount/unity/fix-sc-integration into lp:unity

[Thomi Richards]

Fix a crash in the launcher software center integration code.

Took Gord's branch, added variable initialisatin (as requested on the original MP), and re-proposed.

[Tim Penhey (thumper)]

Looks good.

review: Approve

[Tim Penhey (thumper)]

Letting this through without a test. There are autopilot tests for this coming with the next branch.

=== modified file 'plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp'
--- plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp	2012-03-28 20:32:20 +0000
@@ -53,12 +53,12 @@
 {
   gint32 progress;
   glib::String property_name;
-  GVariant* property_value;
 
-  g_variant_get_child(params, 0, "s", property_name.AsOutParam());
+  g_variant_get_child(params, 0, "s", &property_name);
 
   if (property_name.Str() == "Progress")
   {
+    GVariant* property_value = nullptr;
     g_variant_get_child(params, 1, "v", &property_value);
     g_variant_get(property_value, "i", &progress);
 
@@ -66,9 +66,9 @@
       SetQuirk(QUIRK_PROGRESS, true);
 
     SetProgress(progress/100.0f);
+    g_variant_unref(property_value);
   }
 
-  g_variant_unref(property_value);
 }
 
 }