Merge lp:~mvo/software-center/small-sso-fixes into lp:software-center

[Michael Vogt]

This fixes the clear_credentials() call if a token is no longer valid.

[Gary Lasker (gary-lasker)]

Looks great, thanks mvo!

review: Approve

=== modified file 'softwarecenter/backend/login_sso.py'
--- softwarecenter/backend/login_sso.py	2012-01-05 09:53:52 +0000
+++ softwarecenter/backend/login_sso.py	2012-03-14 15:57:26 +0000
@@ -84,7 +84,7 @@
         self._credentials = credentials
         
 
-    def _on_credentials_error(self, app_name, error, detailed_error):
+    def _on_credentials_error(self, app_name, error, detailed_error=""):
         LOG.error("_on_credentails_error for %s: %s (%s)" % (
                 app_name, error, detailed_error))
         if app_name != self.appname:
 
=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-03-05 15:29:22 +0000
+++ softwarecenter/utils.py	2012-03-14 15:57:26 +0000
@@ -16,6 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import dbus
 import gettext
 from gi.repository import GObject
 from gi.repository import Gio
@@ -327,7 +328,6 @@
     """
     return True if Unity is currently running
     """
-    import dbus
     unity_running = False
     try:
         bus = dbus.SessionBus()
@@ -396,9 +396,17 @@
     """ send a dbus signal to the com.ubuntu.sso service to clear 
         the credentials for the given appname, e.g. _("Ubuntu Software Center")
     """
-    import dbus
+    from ubuntu_sso import (
+        DBUS_BUS_NAME,
+        DBUS_CREDENTIALS_IFACE,
+        DBUS_CREDENTIALS_PATH,
+        )
     bus = dbus.SessionBus()
-    proxy = bus.get_object('com.ubuntu.sso', '/com/ubuntu/sso/credentials')
+    obj = bus.get_object(bus_name=DBUS_BUS_NAME,
+                         object_path=DBUS_CREDENTIALS_PATH,
+                         follow_name_owner_changes=True)
+    proxy = dbus.Interface(object=obj,
+                           dbus_interface=DBUS_CREDENTIALS_IFACE)
     proxy.clear_credentials(appname, {})
 
 def get_nice_date_string(cur_t):