Merge lp:~agateau/unity-2d/unity-applications-memleaks into lp:unity-2d/3.0

[Aurélien Gâteau]

[launcher] Fix some memory leaks.

Plug some memory leaks I found while valgrinding unity-2d-launcher.

I think we could use a GObjectScopedPointer to handle GObject pointers. Will see if I can write one.

[Olivier Tilloy (osomon)]

Style nitpick:

- return m_application->windows()->size();
+ QScopedPointer<BamfWindowList> lst(m_application->windows());
+ return lst->size();

Could you please rename 'lst' to a more explicit name, e.g. 'windows'?

[Olivier Tilloy (osomon)]

Good catches. I verified that the fixes make sense from a programming standpoint, and that they don’t seem to introduce functional regressions. Once you fix the above nitpick, please go ahead and approve so it can be merged.

review: Approve

[Bob The Builder (bobthebuilder-deactivatedaccount)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'launcher/UnityApplications/iconimageprovider.cpp'
--- launcher/UnityApplications/iconimageprovider.cpp	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/iconimageprovider.cpp	2011-03-30 13:47:12 +0000
@@ -126,6 +126,8 @@
                                                             requestedSize.width(),
                                                             (GtkIconLookupFlags)0);
     GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
+    gtk_icon_info_free(icon_info);
+    g_object_unref(g_icon);
 
     /* FIXME: maybe an exception should be raised instead? */
     if (pixbuf == NULL) {

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-03-29 14:23:11 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-03-30 13:47:12 +0000
@@ -38,12 +38,14 @@
 // libunity-2d
 #include <unity2dtr.h>
 
+// Qt
 #include <QDebug>
 #include <QAction>
 #include <QDBusInterface>
 #include <QDBusReply>
 #include <QFile>
 #include <QFileSystemWatcher>
+#include <QScopedPointer>
 
 extern "C" {
 #include <libsn/sn.h>
@@ -99,12 +101,8 @@
         m_snStartupSequence = NULL;
     }
 
-    if (m_application != NULL) {
-        m_application->disconnect(this);
-        m_application = NULL;
-    }
-
     if (m_appInfo != NULL) {
+        g_object_unref(m_appInfo);
         m_appInfo = NULL;
     }
 }
@@ -136,7 +134,8 @@
         return 0;
     }
 
-    return m_application->windows()->size();
+    QScopedPointer<BamfWindowList> windows(m_application->windows());
+    return windows->size();
 }
 
 bool
@@ -271,6 +270,10 @@
     QByteArray byte_array = desktop_file.toUtf8();
     gchar *file = byte_array.data();
 
+    if (m_appInfo) {
+        g_object_unref(m_appInfo);
+    }
+
     if(desktop_file.startsWith("/")) {
         /* It looks like a full path to a desktop file */
         m_appInfo = g_desktop_app_info_new_from_filename(file);

=== modified file 'launcher/UnityApplications/webfavorite.cpp'
--- launcher/UnityApplications/webfavorite.cpp	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/webfavorite.cpp	2011-03-30 13:47:12 +0000
@@ -100,9 +100,9 @@
     if (loaded) {
         g_key_file_set_string(keyFile, "Desktop Entry", key.toUtf8().constData(), value.toUtf8().constData());
         QByteArray contents = g_key_file_to_data(keyFile, NULL, NULL);
-        g_key_file_free(keyFile);
         writeDesktopFile(contents);
     }
+    g_key_file_free(keyFile);
 }
 
 void