Merge lp:~alecu/ubuntuone-client/the-other-signal-stable into lp:ubuntuone-client

[Alejandro J. Cura]

Listen to the same DBus interface that Syncdaemon uses (LP: #759197)

Listen to the same DBus interface that Syncdaemon uses (LP: #759197)

[Roman Yepishev (rye)]

The corresponding trunk version worked perfectly so approving.

review: Approve (code)

Unmerged revisions

960. By Alejandro J. Cura on 2011-04-19

Listen to the same DBus interface that Syncdaemon uses

959. By Alejandro J. Cura on 2011-04-19

Revert changes from revision 956

958. By dobey on 2011-04-15

[release] 1.6.1 ubuntuone-client

=== modified file 'configure.ac'
--- configure.ac	2011-04-08 22:52:08 +0000
+++ configure.ac	2011-04-19 14:45:42 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [1.6.0])
+AC_INIT([ubuntuone-client], [1.6.1])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2011-04-18 16:52:04 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2011-04-19 14:45:42 +0000
@@ -31,6 +31,7 @@
 struct _SyncdaemonAuthenticationPrivate {
 	DBusGConnection *bus;
 	DBusGProxy *proxy;
+	DBusGProxy *newer_proxy;
 	gboolean has_credentials;
 	SyncdaemonCredentials *credentials;
 };
@@ -55,6 +56,8 @@
 			g_object_unref (G_OBJECT (auth->priv->credentials));
 		if (auth->priv->proxy != NULL)
 			g_object_unref (G_OBJECT (auth->priv->proxy));
+		if (auth->priv->newer_proxy != NULL)
+			g_object_unref (G_OBJECT (auth->priv->newer_proxy));
 		if (auth->priv->bus != NULL)
 			dbus_g_connection_unref (auth->priv->bus);
 
@@ -192,7 +195,30 @@
 			dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",
 						     G_CALLBACK (credentials_error_cb), auth, NULL);
 		} else
-			g_warning ("Couldn't get proxy for com.ubuntu.sso");
+			g_warning ("Couldn't get proxy for com.ubuntu.sso.ApplicationCredentials");
+
+		auth->priv->newer_proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
+							       "/com/ubuntu/sso/credentials", "com.ubuntu.sso.CredentialsManagement");
+		if (auth->priv->newer_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->newer_proxy, "CredentialsFound",
+						 G_TYPE_STRING,
+						 dbus_g_type_get_map ("GHashTable",
+								      G_TYPE_STRING,
+								      G_TYPE_STRING),
+						 G_TYPE_INVALID);
+			dbus_g_proxy_connect_signal (auth->priv->newer_proxy, "CredentialsFound",
+						     G_CALLBACK (credentials_found_cb), auth, NULL);
+		} else
+			g_warning ("Couldn't get proxy for com.ubuntu.sso.CredentialsManagement");
+
 	}
 }