Merge lp:~rodrigo-moya/libubuntuone/catch-syncdaemon-errors into lp:libubuntuone

[Rodrigo Moya]

Make sure we are connected to the syncdaemon every time we need it

Make sure we are connected to the syncdaemon every time we need it

[Tim Cole (tcole)]

review: Approve

[Facundo Batista (facundo)]

Looks ok!

review: Approve

=== modified file 'libubuntuone/syncdaemon.c'
--- libubuntuone/syncdaemon.c	2010-03-05 17:15:53 +0000
+++ libubuntuone/syncdaemon.c	2010-03-25 09:39:17 +0000
@@ -60,6 +60,30 @@
 	}
 }
 
+gboolean
+syncdaemon_is_connected (void)
+{
+	GHashTable *return_value;
+	gboolean is_connected = FALSE;
+	GError *error = NULL;
+
+	syncdaemon_init ();
+
+	if (dbus_g_proxy_call (status_proxy, "current_status", &error,
+			       G_TYPE_INVALID,
+			       dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), &return_value,
+			       G_TYPE_INVALID)) {
+		is_connected = g_strcmp0 (g_hash_table_lookup (return_value, "is_connected"), "True") == 0;
+
+		g_hash_table_destroy (return_value);
+	} else {
+		g_warning ("Error calling current_status: %s", error->message);
+		g_error_free (error);
+	}
+
+	return is_connected;
+}
+
 void
 syncdaemon_connect (void)
 {
@@ -67,6 +91,11 @@
 
 	syncdaemon_init ();
 
+	if (syncdaemon_is_connected ()) {
+		g_warning ("Syncdaemon already connected, not connecting again");
+		return;
+	}
+
 	/* Make the syncdaemon connect if it's not connected */
 	error = NULL;
 
@@ -103,7 +132,8 @@
 	GPtrArray *return_value;
 	GHashTable *downloads = NULL;
 
-	syncdaemon_init ();
+	/* Make sure we are connected when we get here */
+	syncdaemon_connect ();
 
 	/* Ask the syncdaemon about current downloads */
 	error = NULL;

=== modified file 'libubuntuone/syncdaemon.h'
--- libubuntuone/syncdaemon.h	2010-03-05 17:15:53 +0000
+++ libubuntuone/syncdaemon.h	2010-03-25 09:39:17 +0000
@@ -33,6 +33,7 @@
 } SyncdaemonDownload;
 
 void        syncdaemon_init (void);
+gboolean    syncdaemon_is_connected (void);
 void        syncdaemon_connect (void);
 void        syncdaemon_finalize (void);
 GHashTable *syncdaemon_get_current_downloads (void);

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2010-03-24 20:45:23 +0000
+++ libubuntuone/u1-music-store.c	2010-03-25 09:39:17 +0000
@@ -405,8 +405,7 @@
 				load_internal_html_page (web_view, U1_OUTSIDE_DOMAIN_ERROR_PAGE, to_and_from_error_uris);
 				g_free (to_and_from_error_uris);
 			}
-		}
-		if (!g_strcmp0 ((const gchar *) parsed_uri->host, "one.ubuntu.com")) {
+		} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "one.ubuntu.com")) {
 			/* host is one.ubuntu.com. It must not be the login page */
 			if (g_str_has_prefix (parsed_uri->path, "/auth/")) {
 				/* trying to log the user into o.u.c inside the webview. Die. */
@@ -426,8 +425,7 @@
 				}
 				g_free (to_and_from_error_uris);
 			}
-		}
-		if (!g_strcmp0 ((const gchar *) parsed_uri->host, "login.ubuntu.com")) {
+		} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "login.ubuntu.com")) {
 			/* host is SSO. Die. */
 			gchar *real_url;
 			gchar *to_and_from_error_uris;