Merge lp:~azzar1/unity/fix-some-memory-leaks2 into lp:unity

[Andrea Azzarone]

Fixes two memory leaks in unity.

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'plugins/unityshell/src/PlacesHomeView.cpp'
--- plugins/unityshell/src/PlacesHomeView.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PlacesHomeView.cpp	2011-07-30 12:46:00 +0000
@@ -297,9 +297,10 @@
   // Email
   markup = gconf_client_get_string(_client, MAIL_DIR"/command", NULL);
   // get the first word on key (the executable name itself)
-  markup = g_strsplit(markup, " ", 0)[0];
-  CreateShortcutFromExec(markup, _("Check Email"), _email_alternatives);
+  gchar** temp_array = g_strsplit(markup, " ", 0);
   g_free(markup);
+  CreateShortcutFromExec(temp_array[0], _("Check Email"), _email_alternatives);
+  g_strfreev(temp_array);
 
   // Music
   markup = gconf_client_get_string(_client, MEDIA_DIR"/exec", NULL);
 
=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2011-07-26 12:33:23 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2011-07-30 12:46:00 +0000
@@ -612,6 +612,9 @@
   {
     win_wmclass = classHint.res_class;
     XFree(classHint.res_class);
+    
+    if (classHint.res_name)
+      XFree(classHint.res_name);
   }
   else
     return;