Merge lp:~alecu/ubuntuone-client/revert-dbus-interface-change into lp:ubuntuone-client

[Alejandro J. Cura]

Revert changes from revision 956 (LP: #764646)

Revert changes from revision 956 (LP: #764646)

[Alejandro J. Cura (alecu)]

To fix Bug #764646 we are reverting the changes made on rev. 956 of trunk.
This means that the fix for bug #759197 will be rolled back; and for this we are creating another branch that depends on this one: lp:~alecu/ubuntuone-client/the-other-signal

[Natalia Bidart (nataliabidart)]

review: Approve

[Roman Yepishev (rye)]

It looks like this has been proposed against the trunk only, I guess this should be done for stable-1-6 too.

[Roman Yepishev (rye)]

Looks ok

review: Approve (code)

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2011-04-12 23:55:19 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2011-04-18 20:34:24 +0000
@@ -26,8 +26,6 @@
 #include "syncdaemon-authentication.h"
 #include "syncdaemon-marshal.h"
 
-#define DEFAULT_ERROR_MESSAGE "No error specified"
-
 G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)
 
 struct _SyncdaemonAuthenticationPrivate {
@@ -133,21 +131,16 @@
 static void
 credentials_error_cb (DBusGProxy *proxy,
 		      const gchar *app_name,
-		      GHashTable *error_dict,
+		      const gchar *error_message,
+		      const gchar *detailed_error,
 		      gpointer user_data)
 {
-	gchar *error_message;
-
 	g_debug ("Authorization error");
 	if (g_strcmp0 (app_name, SSO_APP_NAME) != 0) {
 		g_debug ("Credentials are not for '" SSO_APP_NAME "', ignoring");
 		return;
 	}
 
-	error_message = g_hash_table_lookup (error_dict, "error_message");
-	if (error_message == NULL)
-		error_message = DEFAULT_ERROR_MESSAGE;
-
 	g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error_message);
 }
 
@@ -166,7 +159,7 @@
 		g_error_free (error);
 	} else {
 		auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
-							       "/com/ubuntu/sso/credentials", "com.ubuntu.sso.CredentialsManagement");
+							       "/credentials", "com.ubuntu.sso.ApplicationCredentials");
 		if (auth->priv->proxy != NULL) {
 			dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,
 							   G_TYPE_NONE,
@@ -193,9 +186,8 @@
 
 			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
 						 G_TYPE_STRING,
-						 dbus_g_type_get_map ("GHashTable",
-								      G_TYPE_STRING,
-								      G_TYPE_STRING),
+						 G_TYPE_STRING,
+						 G_TYPE_STRING,
 						 G_TYPE_INVALID);
 			dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",
 						     G_CALLBACK (credentials_error_cb), auth, NULL);