Merge lp:~mvo/software-center/fix-lp994632 into lp:software-center

[Michael Vogt]

A small branch that ensures that we get the right ubuntu-sso-client-gtk, see LP: #994632

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-30 22:27:29 +0000
+++ debian/changelog	2012-05-04 17:20:29 +0000
@@ -1,12 +1,18 @@
-*** DO NOT UPLOAD YET FROM THIS BRANCH, use the lp:software-center/5.2 
-    BRANCH INSTEAD until "quantal" gets the first upload ***
-
-software-center (5.3.0) UNRELEASED; urgency=low
+software-center (5.2.2) UNRELEASED; urgency=low
 
   [ Michael Vogt ]
   * lp:~mvo/software-center/whatsnew-leak-lp985389:
     - search filter fix for the case when the "installed-only"
       filter leaks into subsequent searches (LP: #985389)
+  
+  [ Gary Lasker ]
+  * lp:~gary-lasker/software-center/fix-crash-lp969732:
+    - need to explicitly declare the needs-refresh signal in the 
+      AppTreeStore class to prevent a crash (LP: #969732)
+  * lp:~gary-lasker/software-center/fix-crash-lp870822:
+    - don't crash if we don't get a pkgversion object back 
+      (LP: #870822)
+
 
  -- Gary Lasker <[e-mail]>  Mon, 30 Apr 2012 18:22:04 -0400
 

=== modified file 'debian/control'
--- debian/control	2012-04-11 08:19:03 +0000
+++ debian/control	2012-05-04 17:20:29 +0000
@@ -41,7 +41,7 @@
          policykit-1,
          policykit-1-gnome | policykit-1-kde,
          python-xdg,
-         ubuntu-sso-client (>= 0.99.6),
+         ubuntu-sso-client-gtk,
          python-piston-mini-client (>= 0.1+bzr29),
          oneconf (>= 0.2.6),
          python-debtagshw,

=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-03-30 09:11:08 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-05-04 17:20:29 +0000
@@ -476,6 +476,14 @@
     """ A treestore based application model
     """
 
+    __gsignals__ = {
+        # meh, this is a signal from AppPropertiesHelper
+        "needs-refresh": (GObject.SignalFlags.RUN_LAST,
+                             None,
+                             (str, ),
+                            ),
+        }
+
     def __init__(self, db, cache, icons, icon_size=AppGenericStore.ICON_SIZE,
                  global_icon_cache=True):
         AppGenericStore.__init__(

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-04-18 10:31:00 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-05-04 17:20:29 +0000
@@ -2024,10 +2024,14 @@
               self.app_details.pkg_state == PkgStates.INSTALLED and
               not self.addons_manager.addons_to_install and
               not self.addons_manager.addons_to_remove):
-            pkg = self.cache[self.app_details.pkgname].installed
-            install_size = GLib.format_size(pkg.installed_size)
-            # FIXME: this is not really a good indication of the size on disk
-            label_string += _("%s on disk") % (install_size)
+            pkg_version = self.cache[self.app_details.pkgname].installed
+            # we may not always get a pkg_version returned (LP: #870822),
+            # in that case, we'll just have to display "Unknown"
+            if pkg_version:
+                install_size = GLib.format_size(pkg_version.installed_size)
+                # FIXME: this is not really a good indication of the size
+                # on disk
+                label_string += _("%s on disk") % (install_size)
         elif total_install_size < 0:
             remove_size = GLib.format_size(-total_install_size)
             label_string += _("%s to be freed") % (remove_size)