Merge lp:~rodrigo-moya/ubuntuone-client/fix-634384 into lp:ubuntuone-client

[Rodrigo Moya]

Add syncdaemon_authentication_clear_token API for the music store to deal with invalid tokens

Add syncdaemon_authentication_clear_token API for the music store to deal with invalid tokens

[lp:~rodrigo-moya/ubuntuone-client/fix-634384]

706. By Rodrigo Moya on 2010-09-17

Merge from trunk

[Rodrigo Moya (rodrigo-moya)]

This is part of the fix needed for lp:~rodrigo-moya/libubuntuone/fix-634384

[Rick McBride (rmcbride)]

review: Approve

[Manuel de la Peña (mandel)]

+1

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2010-08-26 14:25:29 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2010-09-17 11:58:42 +0000
@@ -252,18 +252,32 @@
 void
 syncdaemon_authentication_login_or_register (SyncdaemonAuthentication *auth)
 {
+	g_return_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth));
+
+	dbus_g_proxy_call_no_reply (auth->priv->proxy, "login_or_register_to_get_credentials",
+				    G_TYPE_STRING, SSO_APP_NAME,
+				    G_TYPE_STRING, SSO_TC_URL,
+				    G_TYPE_STRING, _(SSO_DESCRIPTION),
+				    G_TYPE_INT64, 0, /* FIXME */
+				    G_TYPE_INVALID,
+				    G_TYPE_INVALID);
+}
+
+/**
+ * syncdaemon_authentication_clear_token:
+ */
+void
+syncdaemon_authentication_clear_token (SyncdaemonAuthentication *auth)
+{
 	GError *error = NULL;
 
 	g_return_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth));
 
-	if (!dbus_g_proxy_call (auth->priv->proxy, "login_or_register_to_get_credentials", &error,
+	if (!dbus_g_proxy_call (auth->priv->proxy, "clear_token", &error,
 				G_TYPE_STRING, SSO_APP_NAME,
-				G_TYPE_STRING, SSO_TC_URL,
-				G_TYPE_STRING, _(SSO_DESCRIPTION),
-				G_TYPE_INT64, 0, /* FIXME */
 				G_TYPE_INVALID,
 				G_TYPE_INVALID)) {
-		g_warning ("Could not login or register for 'ubuntuone': %s", error->message);
+		g_warning ("Error calling 'clear_token': %s", error->message);
 		g_error_free (error);
 	}
 }
 
=== modified file 'libsyncdaemon/syncdaemon-authentication.h'
--- libsyncdaemon/syncdaemon-authentication.h	2010-08-11 08:48:24 +0000
+++ libsyncdaemon/syncdaemon-authentication.h	2010-09-17 11:58:42 +0000
@@ -55,6 +55,7 @@
 SyncdaemonCredentials    *syncdaemon_authentication_find_credentials (SyncdaemonAuthentication *auth);
 gboolean                  syncdaemon_authentication_has_credentials (SyncdaemonAuthentication *auth);
 void                      syncdaemon_authentication_login_or_register (SyncdaemonAuthentication *auth);
+void                      syncdaemon_authentication_clear_token (SyncdaemonAuthentication *auth);
 
 G_END_DECLS