Merge lp:~gary-lasker/software-center/fix-crash-lp968988 into lp:software-center

[Gary Lasker]

Fix crash bug 968988 by making sure that there is always a tree_view.selected_row_renderer attribute, and do the right thing in the case where it may be None. You can verify there is no regression using the corresponding unit test:

  cd test
  PYTHONPATH=. python gtk3/test_unity_launcher_integration.py

Thanks!

[Michael Vogt (mvo)]

Thanks, that looks good.

review: Approve

=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
--- softwarecenter/ui/gtk3/views/appview.py	2012-03-29 13:57:04 +0000
+++ softwarecenter/ui/gtk3/views/appview.py	2012-04-10 05:10:24 +0000
@@ -235,7 +235,8 @@
             for the application icon as it is displayed on-screen
         """
         icon_size = 32
-        if self.tree_view.selected_row_renderer.icon:
+        if (self.tree_view.selected_row_renderer and
+            self.tree_view.selected_row_renderer.icon):
             pb = self.tree_view.selected_row_renderer.icon
             if pb.get_width() > pb.get_height():
                 icon_size = pb.get_width()
@@ -254,8 +255,11 @@
         # get toplevel window position
         (px, py) = parent.get_position()
         # and return the coordinate values
-        return (px + self.tree_view.selected_row_renderer.icon_x_offset,
-                py + self.tree_view.selected_row_renderer.icon_y_offset)
+        if self.tree_view.selected_row_renderer:
+            return (px + self.tree_view.selected_row_renderer.icon_x_offset,
+                    py + self.tree_view.selected_row_renderer.icon_y_offset)
+        else:
+            return (px, py)
 
 
 # ----------------------------------------------- testcode
 
=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-30 10:39:02 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-04-10 05:10:24 +0000
@@ -46,6 +46,7 @@
         self._action_block_list = []
         self._needs_collapse = []
         self.expanded_path = None
+        self.selected_row_renderer = None
 
         # pixbuf for the icon that is displayed in the selected row
         self.selected_row_icon = None