Merge lp:~mvo/software-center/fix-memleak-5.2 into lp:software-center/5.2

[Michael Vogt]

This is a port of the memleak fix from the lp:~mvo/software-center/inspect-memleak branch for 5.2

[Gary Lasker (gary-lasker)]

Looks quite familiar! Thank you for doing this backport, Michael. :)

review: Approve

=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-06-08 22:01:48 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-09-10 09:12:32 +0000
@@ -168,7 +168,8 @@
         if doc.available is None:
             pkgname = self.get_pkgname(doc)
             doc.available = (
-                (pkgname in self.cache and self.cache[pkgname].candidate)
+                (pkgname in self.cache and 
+                 self.cache[pkgname].candidate is not None)
                 or self.is_purchasable(doc))
         return doc.available
 

=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
--- softwarecenter/ui/gtk3/widgets/buttons.py	2012-05-17 11:33:19 +0000
+++ softwarecenter/ui/gtk3/widgets/buttons.py	2012-09-10 09:12:32 +0000
@@ -178,6 +178,7 @@
         label = helper.get_appname(doc)
         icon = helper.get_icon_at_size(doc, icon_size, icon_size)
         stats = helper.get_review_stats(doc)
+        self.helper = helper
         helper.update_availability(doc)
         helper.connect("needs-refresh", self._on_needs_refresh, doc, icon_size)
         self.is_installed = helper.is_installed(doc)
@@ -268,16 +269,23 @@
             for t in [label, categories, stats_a11y, price] if t])
         self.get_accessible().set_name(a11y_name)
 
-        backend = get_install_backend()
-        backend.connect("transaction-finished",
-                        self.on_transaction_finished,
-                        helper, doc)
+        self.backend = get_install_backend()
+        self.backend.connect("transaction-finished",
+                             self.on_transaction_finished,
+                             helper, doc)
 
         self.connect("enter-notify-event", self.on_enter)
         self.connect("leave-notify-event", self.on_leave)
         self.connect("button-press-event", self.on_press)
         self.connect("button-release-event", self.on_release)
 
+    def destroy(self):
+        # the disconnect the suff connected to "self" is taken care
+        # of by this super()
+        super(FeaturedTile, self).destroy()
+        self.backend.disconnect_by_func(self.on_transaction_finished)
+        self.helper.disconnect_by_func(self._on_needs_refresh)
+
     def _on_needs_refresh(self, helper, pkgname, doc, icon_size):
         icon = helper.get_icon_at_size(doc, icon_size, icon_size)
         _update_icon(self.image, icon, icon_size)

=== modified file 'softwarecenter/ui/gtk3/widgets/containers.py'
--- softwarecenter/ui/gtk3/widgets/containers.py	2012-03-19 19:45:20 +0000
+++ softwarecenter/ui/gtk3/widgets/containers.py	2012-09-10 09:12:32 +0000
@@ -175,10 +175,16 @@
         self.column_spacing = value
         self._layout_children(self.get_allocation())
 
-    def remove_all(self):
-        self._cell_size = None
-        for child in self:
-            self.remove(child)
+    def remove_all(self, destroy=True):
+         self._cell_size = None
+         for child in self:
+             self.remove(child)
+             # meh, this should not really be necessary, but e.g. the
+             # TileButtons have pretty high refcounts even after remove (~10)
+             if destroy:
+                 #print child.__grefcount__
+                 child.destroy()
+                 del child
 
 
 # first tier of caching, cache component assets from which frames are