Merge lp:~rodrigo-moya/ubuntuone-client/re-add-places into lp:ubuntuone-client

[Rodrigo Moya]

Add Ubuntu One root dir to Nautilus places

Add Ubuntu One root dir to Nautilus places

[dobey (dobey)]

I really don't like the way this is working. We should use the API that is in gtkfilesystem.h to do this, rather than editing the file directly.

And if we should edit it directly, we should use the GKeyFile API to do so, I think.

review: Disapprove

[Rodrigo Moya (rodrigo-moya)]

As discussed on IRC, gtkfilesystem is a private API, and indeed goes away from $includedir in GTK3, so we shouldn't be using that. This code is what Nautilus uses, and what gtkfilesystem.c internally uses also

[dobey (dobey)]

But we shouldn't have to duplicate code that is already in a library we're using. But since upstream is brilliant fail in that regard, I'll let it slide.

This however, does introduce a regression. We must only add the bookmark once, when the first successful token retrieval and association is completed, and store a boolean somewhere to remind ourselves that we've done so, to avoid adding the bookmark at every log-in, if the user has decided to remove it, because they don't actually want the bookmark.

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/re-add-places]

729. By Rodrigo Moya on 2010-09-30

Only add the U1 folder to Places when we have credentials, and only do it once

[dobey (dobey)]

In check_bookmark_file() I think you also need to check that the key actually exists. If the key doesn't exist, you will still see a 'FALSE' value for the gboolean, since the _get_bool() can only return either TRUE or FALSE. If the key doesn't exist, and check_bookmark_file() gets called, it could still create the bookmark, even if it shouldn't.

I also wish the added code to use libsyncdaemon, was done with async code, rather than the synchronous calls being made.

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/re-add-places]

730. By Rodrigo Moya on 2010-09-30

Check for errors and for U1 folder existence

731. By Rodrigo Moya on 2010-09-30

Fixed

[dobey (dobey)]

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-09-23 13:57:58 +0000
+++ configure.ac	2010-09-30 14:24:46 +0000
@@ -176,6 +176,7 @@
 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
         gtk+-2.0
         gnome-settings-daemon
+	gconf-2.0
 )
 
 AC_SUBST(SETTINGS_PLUGIN_CFLAGS)

=== modified file 'gsd-plugin/gsd-ubuntuone.c'
--- gsd-plugin/gsd-ubuntuone.c	2010-07-29 14:41:36 +0000
+++ gsd-plugin/gsd-ubuntuone.c	2010-09-30 14:24:46 +0000
@@ -23,6 +23,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
+#include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 
 #include "gnome-settings-daemon/gnome-settings-plugin.h"
@@ -39,6 +40,7 @@
 #define NO_SPACE_TITLE _("Out of space")
 #define UPGRADE_SUBSCRIPTION_TEXT _("Upgrade Subscription")
 #define UPGRADE_SUBSCRIPTION_URI "http://one.ubuntu.com/plans/"
+#define CHECKED_BOOKMARK_FILE_KEY "/apps/gnome_settings_daemon/plugins/ubuntuone/checked_bookmark_file"
 
 static void
 dialog_closed_callback (GtkDialog *dialog,
@@ -117,10 +119,108 @@
 	}
 }
 
+static void
+bookmark_file_loaded (GObject *source, GAsyncResult *res, gpointer user_data)
+{
+        gchar *contents = NULL;
+        GError *error = NULL;
+
+        g_file_load_contents_finish (G_FILE (source), res, &contents, NULL, NULL, &error);
+        if (error == NULL) {
+                gchar **lines, *u1_location;
+                gint i;
+                gboolean add_it = TRUE;
+
+                u1_location = g_build_filename ("file://", g_get_home_dir (), "Ubuntu%20One", NULL);
+
+                lines = g_strsplit (contents, "\n", -1);
+                for (i = 0; lines[i] != NULL; i++) {
+                        /* Ignore empty lines */
+                        if (lines[i][0] != '\0' && lines[i][0] != ' ') {
+                                if (g_str_has_prefix (lines[i], u1_location)) {
+                                        add_it = FALSE;
+                                        break;
+                                }
+                        }
+                }
+
+                if (add_it) {
+                        gchar *new_contents = g_strdup_printf ("%s\n%s Ubuntu One\n", contents, u1_location);
+
+                        if (g_file_replace_contents (G_FILE (source),
+                                                     (const gchar *) new_contents,
+                                                     strlen (new_contents),
+                                                     NULL,
+                                                     FALSE,
+                                                     0, NULL, NULL, &error)) {
+                                GConfClient *conf_client;
+
+                                conf_client = gconf_client_get_default ();
+                                gconf_client_set_bool (conf_client, CHECKED_BOOKMARK_FILE_KEY, TRUE, NULL);
+                        } else {
+                                g_warning ("Could not save bookmarks file: %s\n", error->message);
+                                g_error_free (error);
+                        }
+                }
+
+                g_free (contents);
+                g_free (u1_location);
+                g_strfreev (lines);
+        } else {
+                g_warning ("Could not load bookmark file: %s\n", error->message);
+                g_error_free (error);
+        }
+}
+
+static void
+check_bookmark_file (void)
+{
+        gchar *filename;
+        GConfClient *conf_client;
+        GError *error = NULL;
+
+        /* We only check the bookmark file if we haven't already done so */
+        conf_client = gconf_client_get_default ();
+        if (!gconf_client_get_bool (conf_client, CHECKED_BOOKMARK_FILE_KEY, &error)) {
+                if (error == NULL) {
+                        gchar *u1_folder;
+
+                        u1_folder = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
+                        if (g_file_test ((const gchar *) u1_folder, G_FILE_TEST_IS_DIR)) {
+                                /* Load the bookmark file */
+                                filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL);
+                                if (filename != NULL) {
+                                        GFile *file;
+
+                                        file = g_file_new_for_path (filename);
+                                        g_file_load_contents_async (file, NULL, bookmark_file_loaded, NULL);
+
+                                        g_object_unref (G_OBJECT (file));
+                                        g_free (filename);
+                                }
+                        }
+
+                        g_free (u1_folder);
+                } else {
+                        g_warning ("Error getting settings: %s\n", error->message);
+                        g_error_free (error);
+                }
+        }
+
+        g_object_unref (conf_client);
+}
+
+static void
+credentials_found_cb (SyncdaemonAuthentication *auth, SyncdaemonCredentials *credentials, gpointer user_data)
+{
+        check_bookmark_file ();
+}
+
 static gboolean
 delayed_syncdaemon_start (gpointer data)
 {
 	GsdUbuntuOne *plugin;
+        SyncdaemonAuthentication *auth;
 
 	plugin = GSD_UBUNTUONE (data);
 	g_debug ("Performing delayed syncdaemon init");
@@ -129,6 +229,15 @@
 	plugin->out_of_space_dialog = NULL;
 	g_signal_connect (G_OBJECT (plugin->syncdaemon), "quota_exceeded",
 			  G_CALLBACK (quota_exceeded_callback), plugin);
+
+        /* Check for authentication */
+        auth = syncdaemon_daemon_get_authentication (plugin->syncdaemon);
+        if (syncdaemon_authentication_has_credentials (auth))
+                check_bookmark_file ();
+        else
+                g_signal_connect (auth, "credentials_found",
+                                  G_CALLBACK (credentials_found_cb), NULL);
+
 	return FALSE;
 }
 
@@ -152,7 +261,7 @@
 	GsdUbuntuOneClass *klass = GSD_UBUNTUONE_GET_CLASS (object);
 	GObjectClass *parent_class = G_OBJECT_CLASS (klass);
 
-	if (plugin->syncdaemon)
+	if (plugin->syncdaemon != NULL)
 	      g_object_unref (plugin->syncdaemon);
 
 	parent_class->dispose (object);

=== modified file 'gsd-plugin/gsd-ubuntuone.h'
--- gsd-plugin/gsd-ubuntuone.h	2010-07-14 19:51:54 +0000
+++ gsd-plugin/gsd-ubuntuone.h	2010-09-30 14:24:46 +0000
@@ -27,8 +27,7 @@
 #include <gmodule.h>
 
 #include "gnome-settings-daemon/gnome-settings-plugin.h"
-
-#include <libsyncdaemon/syncdaemon-publicfiles-interface.h>
+#include <libsyncdaemon/libsyncdaemon.h>
 
 G_BEGIN_DECLS