Merge lp:~alecu/ubuntuone-client/restore-u1-bookmark into lp:ubuntuone-client

[Alejandro J. Cura]

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

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

[Alejandro J. Cura (alecu)]

To test this branch:
 * compile with: gnome-autogen.sh && make
 * install the file gsd-plugin/.libs/libubuntuone.so in /usr/lib/gnome-settings-daemon-2.0/
 * create a new user in your ubuntu system
 * log into your desktop as that new user, and check that "Ubuntu One" is not in the nautilus favorites
 * now create a new Ubuntu One user or log into an existing Ubuntu One user, and check that the nautilus favorite for the "Ubuntu One" folder was created.

[Roman Yepishev (rye)]

Works fine, the bookmark appears after 30 seconds or so.

review: Approve (fieldtest)

[Martin Albisetti (beuno)]

Code looks good.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/restore-u1-bookmark into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.16
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent li...

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2010-12-07 18:01:03 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2011-04-13 00:00:13 +0000
@@ -26,6 +26,8 @@
 #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 {
@@ -131,16 +133,21 @@
 static void
 credentials_error_cb (DBusGProxy *proxy,
 		      const gchar *app_name,
-		      const gchar *error_message,
-		      const gchar *detailed_error,
+		      GHashTable *error_dict,
 		      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);
 }
 
@@ -159,7 +166,7 @@
 		g_error_free (error);
 	} else {
 		auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
-							       "/credentials", "com.ubuntu.sso.ApplicationCredentials");
+							       "/com/ubuntu/sso/credentials", "com.ubuntu.sso.CredentialsManagement");
 		if (auth->priv->proxy != NULL) {
 			dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,
 							   G_TYPE_NONE,
@@ -186,8 +193,9 @@
 
 			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
 						 G_TYPE_STRING,
-						 G_TYPE_STRING,
-						 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->proxy, "CredentialsError",
 						     G_CALLBACK (credentials_error_cb), auth, NULL);