Merge lp:~rodrigo-moya/ubuntuone-client/app-name-in-signals into lp:ubuntuone-client

[Rodrigo Moya]

Receive app_name in all DBus signals from ubuntu-sso

Receive app_name in all DBus signals from ubuntu-sso

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-08-19 11:25:33 +0000
+++ configure.ac	2010-08-24 14:14:44 +0000
@@ -135,10 +135,12 @@
 GOBJECT_INTROSPECTION_CHECK([0.6.4])
 
 # Fix up some junk from GIR
-INTROSPECTION_GIRDIR_NAME="`basename ${INTROSPECTION_GIRDIR}`"
-INTROSPECTION_TYPELIBDIR_NAME="`basename ${INTROSPECTION_TYPELIBDIR}`"
-AC_SUBST(INTROSPECTION_GIRDIR_NAME)
-AC_SUBST(INTROSPECTION_TYPELIBDIR_NAME)
+if test "x$found_introspection" = "xyes"; then
+   INTROSPECTION_GIRDIR_NAME="`basename ${INTROSPECTION_GIRDIR}`"
+   INTROSPECTION_TYPELIBDIR_NAME="`basename ${INTROSPECTION_TYPELIBDIR}`"
+   AC_SUBST(INTROSPECTION_GIRDIR_NAME)
+   AC_SUBST(INTROSPECTION_TYPELIBDIR_NAME)
+fi
 
 dnl glib-genmarshal
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2010-08-23 04:37:48 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2010-08-24 14:14:44 +0000
@@ -98,11 +98,11 @@
 }
 
 static void
-credentials_found_cb (DBusGProxy *proxy, GHashTable *result, gpointer user_data)
+credentials_found_cb (DBusGProxy *proxy, const gchar *app_name, GHashTable *result, gpointer user_data)
 {
 	SyncdaemonAuthentication *auth = SYNCDAEMON_AUTHENTICATION (user_data);
 
-	if (!g_str_has_prefix (g_hash_table_lookup (result, "name"), UBUNTUONE_APP_NAME)) {
+	if (g_strcmp0 (app_name, UBUNTUONE_APP_NAME) != 0) {
 		g_debug ("Credentials are not for '" UBUNTUONE_APP_NAME "', ignoring");
 		return;
 	}
@@ -129,10 +129,19 @@
 }
 
 static void
-credentials_error_cb (DBusGProxy *proxy, const gchar *error, gpointer user_data)
+credentials_error_cb (DBusGProxy *proxy,
+		      const gchar *app_name,
+		      const gchar *error_message,
+		      const gchar *detailed_error,
+		      gpointer user_data)
 {
 	g_debug ("Authorization error");
-	g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error);
+	if (g_strcmp0 (app_name, UBUNTUONE_APP_NAME) != 0) {
+		g_debug ("Credentials are not for '" UBUNTUONE_APP_NAME "', ignoring");
+		return;
+	}
+
+	g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error_message);
 }
 
 static void
@@ -152,7 +161,16 @@
 		auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
 							       "/credentials", "com.ubuntu.sso.ApplicationCredentials");
 		if (auth->priv->proxy != NULL) {
+			dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,
+							   G_TYPE_NONE,
+							   G_TYPE_STRING,
+							   dbus_g_type_get_map ("GHashTable",
+										G_TYPE_STRING,
+										G_TYPE_STRING),
+							   G_TYPE_INVALID);
+
 			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsFound",
+						 G_TYPE_STRING,
 						 dbus_g_type_get_map ("GHashTable",
 								      G_TYPE_STRING,
 								      G_TYPE_STRING),
@@ -168,6 +186,8 @@
 
 			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
 						 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);