Merge lp:~osomon/software-center/memory_leak into lp:software-center

[Olivier Tilloy]

The latest unmerged (two) revisions of this branch do the following:

1) Actually allow an AppStore to be deleted (this would never happen as some callbacks were still connected to signals, even when explicitly calling "del [store]"). To check that the AppStore is now actually deleted, one may add a dummy "__del__" method that e.g. prints a debug message.

2) Remove a useless call to AppView.set_model(): passing it None will do nothing anyway.

[Gary Lasker (gary-lasker)]

Nice work, thanks Olivier!

review: Approve

=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-05-27 17:20:33 +0000
+++ softwarecenter/view/appview.py	2010-05-28 16:37:28 +0000
@@ -117,7 +117,7 @@
         self.icons = icons
         self.icon_size = icon_size or self.ICON_SIZE
         # invalidate the cache on icon theme changes
-        self.icons.connect("changed", lambda theme: _app_icon_cache.clear())
+        self.icons.connect("changed", self._clear_app_icon_cache)
         self._appicon_missing_icon = self.icons.load_icon(MISSING_APP_ICON, self.icon_size, 0)
         self.apps = []
         # this is used to re-set the cursor
@@ -203,6 +203,9 @@
         self._existing_apps = None
         self._installable_apps = None
 
+    def _clear_app_icon_cache(self, theme):
+        _app_icon_cache.clear()
+
     # internal API
     def _append_app(self, app):
         """ append a application to the current store, keep 
@@ -249,6 +252,12 @@
 
     # external API
     def clear(self):
+        """Clear the store and disconnect all callbacks to allow it to be
+        deleted."""
+        self.backend.disconnect_by_func(self._on_transaction_finished)
+        self.backend.disconnect_by_func(self._on_transaction_started)
+        self.backend.disconnect_by_func(self._on_transaction_progress_changed)
+        self.icons.disconnect_by_func(self._clear_app_icon_cache)
         self.apps = []
         self.app_index_map.clear()
         self.pkgname_index_map.clear()
@@ -289,7 +298,6 @@
 
         # Re-claim the memory used by the new appstore
         appstore.clear()
-        del appstore
 
     def _refresh_contents_data(self):
         # Quantitative data on stored packages. This generates the information.
 
=== modified file 'softwarecenter/view/channelpane.py'
--- softwarecenter/view/channelpane.py	2010-05-21 05:31:19 +0000
+++ softwarecenter/view/channelpane.py	2010-05-28 16:37:28 +0000
@@ -100,7 +100,6 @@
         old_model = self.app_view.get_model()
         if old_model is not None:
             old_model.active = False
-            self.app_view.set_model(None)
         gobject.idle_add(self._make_new_model, query, self.refresh_seq_nr)
         return False