Merge lp:~rodrigo-moya/ubuntuone-client/no-shared-callback-data into lp:ubuntuone-client

[Rodrigo Moya]

Don't use shared callback data anymore, each menu should have its own

Don't use shared callback data anymore, each menu should have its own

[Roman Yepishev (rye)]

review: Approve (fieldtest)

[Natalia Bidart (nataliabidart)]

review: Approve

[dobey (dobey)]

Attempt to merge into lp:ubuntuone-client failed due to conflicts:

text conflict in nautilus/ubuntuone-nautilus.c

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2010-08-25 14:00:10 +0000
+++ nautilus/Makefile.am	2010-09-22 11:18:40 +0000
@@ -24,6 +24,8 @@
 	add-contact-dialog.h	\
 	contacts-view.c		\
 	contacts-view.h		\
+	context-menu.c		\
+	context-menu.h		\
 	error-dialog.c		\
 	location-widget.c	\
 	location-widget.h	\
 
=== added file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	1970-01-01 00:00:00 +0000
+++ nautilus/context-menu.c	2010-09-22 11:18:40 +0000
@@ -0,0 +1,426 @@
+/*
+ * UbuntuOne Nautilus plugin
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2009-2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+#include <libsyncdaemon/libsyncdaemon.h>
+#include "context-menu.h"
+#include "location-widget.h"
+#include "share-dialog.h"
+
+typedef struct {
+	UbuntuOneNautilus *uon;
+	gchar *path;
+	GtkWidget *parent;
+
+	/* Whether to make a file public or private */
+	gboolean make_public;
+} MenuCallbackData;
+
+static void
+free_menu_cb_data (gpointer data, GObject *where_the_object_was)
+{
+	MenuCallbackData *cb_data = (MenuCallbackData *) data;
+
+	g_free (cb_data->path);
+	g_free (cb_data);
+}
+
+/* Menu callbacks */
+static void
+got_public_meta (SyncdaemonFilesystemInterface *interface,
+		 gboolean success,
+		 SyncdaemonMetadata *metadata,
+		 gpointer user_data)
+{
+	MenuCallbackData *data = (MenuCallbackData *) user_data;
+	GError * error = NULL;
+	const gchar * share_id, * node_id;
+	SyncdaemonInterface *public;
+
+	if (!success) {
+		g_warning ("ERROR: getting metadata for public file");
+		return;
+	}
+
+	share_id = syncdaemon_metadata_get_share_id (metadata);
+	node_id = syncdaemon_metadata_get_node_id (metadata);
+
+	public = syncdaemon_daemon_get_publicfiles_interface (data->uon->syncdaemon);
+	if (public != NULL) {
+		syncdaemon_publicfiles_interface_change_public_access (SYNCDAEMON_PUBLICFILES_INTERFACE (public),
+								       share_id, node_id, data->make_public);
+	}
+}
+
+static void
+unsubscribe_folder_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	SyncdaemonInterface *interface;
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+
+	/* Perform the removal of this folder */
+	interface = syncdaemon_daemon_get_folders_interface (data->uon->syncdaemon);
+	if (interface != NULL) {
+		SyncdaemonFolderInfo *folder_info;
+
+		folder_info = syncdaemon_folders_interface_get_info (SYNCDAEMON_FOLDERS_INTERFACE (interface),
+								     data->path);
+		if (folder_info != NULL) {
+			if (ubuntuone_nautilus_check_shares_and_public_files (data->uon, folder_info, data->parent)) {
+				syncdaemon_folders_interface_delete (SYNCDAEMON_FOLDERS_INTERFACE (interface),
+								     syncdaemon_folder_info_get_volume_id (folder_info));
+			}
+			g_object_unref (G_OBJECT (folder_info));
+		}
+	}
+}
+
+static void
+subscribe_folder_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	SyncdaemonInterface *interface;
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+
+	/* Perform the addition of this folder */
+	interface = syncdaemon_daemon_get_folders_interface (data->uon->syncdaemon);
+	if (interface != NULL) {
+		/* If there is no user authenticated, make Syncdaemon do so */
+		if (!syncdaemon_authentication_has_credentials (syncdaemon_daemon_get_authentication (data->uon->syncdaemon)))
+			syncdaemon_daemon_connect (data->uon->syncdaemon);
+		syncdaemon_folders_interface_create (SYNCDAEMON_FOLDERS_INTERFACE (interface),
+						     data->path);
+	}
+}
+
+static void
+copy_public_url_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+	gchar * url;
+
+	url = g_hash_table_lookup (data->uon->public, data->path);
+	gtk_clipboard_set_text (gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+				url, strlen (url));
+	gtk_clipboard_store (gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
+}
+
+static void
+toggle_publicity_cb (NautilusMenuItem * item, gpointer user_data)
+{
+	SyncdaemonFilesystemInterface *interface;
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+
+	interface = (SyncdaemonFilesystemInterface *) syncdaemon_daemon_get_filesystem_interface (data->uon->syncdaemon);
+	if (interface != NULL) {
+		/* we know this will not be a directory (so no need for _and_quick_tree_synced) */
+		syncdaemon_filesystem_interface_get_metadata_async (interface, data->path, FALSE,
+								    (SyncdaemonGotMetadataFunc) got_public_meta, data);
+	}
+
+	g_hash_table_replace (data->uon->public, g_strdup (data->path), UPDATE_PENDING);
+	ubuntuone_nautilus_reset_emblem (data->uon, data->path);
+}
+
+static void
+share_folder_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+	GtkWidget * dialog;
+
+	dialog = share_dialog_new (data->parent, data->uon, data->path);
+	gtk_widget_show (dialog);
+}
+
+static void
+unshare_folder_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	MenuCallbackData * data = (MenuCallbackData *) user_data;
+	gchar * share_id;
+	SyncdaemonSharesInterface *interface;
+
+	interface = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (data->uon->syncdaemon);
+	if (interface != NULL) {
+		share_id = g_hash_table_lookup (data->uon->shares, data->path);
+		syncdaemon_shares_interface_delete (interface, share_id);
+	}
+}
+
+static void
+toggle_location_cb (NautilusMenuItem *item, gpointer user_data)
+{
+	GConfClient *conf_client;
+
+	conf_client = gconf_client_get_default ();
+	gconf_client_set_bool (conf_client, EXPANDER_SHOWN_KEY, !ubuntuone_is_location_bar_enabled (), NULL);
+}
+
+NautilusMenuItem *
+context_menu_new (UbuntuOneNautilus *uon,
+		  GtkWidget *window,
+		  GList *files)
+{
+	NautilusFileInfo *file;
+	NautilusMenu *submenu;
+	NautilusMenuItem *root_item, *menu_item, *urlitem;
+	gchar *path, *item, *homedir_path;
+	gboolean is_managed, is_root, is_udf, is_public, is_shared, is_pending;
+	gboolean is_inhome, is_dir, is_regular;
+	MenuCallbackData *cb_data;
+
+	is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
+	is_inhome = is_dir = is_regular = FALSE;
+
+	if (g_list_length (files) != 1)
+		return NULL;
+
+	file = NAUTILUS_FILE_INFO (g_list_nth_data (files, 0));
+	path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
+
+	if (path == NULL)
+		return NULL;
+
+	if (ubuntuone_is_storagefs (uon, path, &is_root))
+		is_managed = TRUE;
+
+	homedir_path = g_strdup_printf ("%s/", g_get_home_dir());
+	if (strncmp (path, homedir_path, strlen (homedir_path)) == 0)
+		is_inhome = TRUE;
+	g_free (homedir_path);
+
+	if ((item = g_hash_table_lookup (uon->udfs, path)) != NULL) {
+		is_udf = TRUE;
+		if (strcmp (item, UPDATE_PENDING) == 0)
+			is_pending = TRUE;
+	} else if ((item = g_hash_table_lookup (uon->public, path)) != NULL) {
+		is_public = TRUE;
+		if (strcmp (item, UPDATE_PENDING) == 0)
+			is_pending = TRUE;
+	}
+	if (g_hash_table_lookup (uon->shares, path) != NULL)
+		is_shared = TRUE;
+
+	is_dir = nautilus_file_info_is_directory (file);
+	is_regular = nautilus_file_info_get_file_type (file) == G_FILE_TYPE_REGULAR;
+
+	cb_data = g_new0 (MenuCallbackData, 1);
+	cb_data->uon = uon;
+	cb_data->parent = window;
+	cb_data->path = g_strdup (path);
+
+	/* Create the root item */
+	root_item = nautilus_menu_item_new ("ubuntuone",
+					    _("_Ubuntu One"),
+					    _("Ubuntu One options"),
+					    "ubuntuone");
+	submenu = nautilus_menu_new ();
+	nautilus_menu_item_set_submenu (root_item, submenu);
+
+	g_object_weak_ref (G_OBJECT (root_item), (GWeakNotify) free_menu_cb_data, cb_data);
+
+	/* Share/unshare */
+	if ((is_managed || is_udf) && !is_root && is_dir) {
+
+		menu_item = nautilus_menu_item_new ("ubuntuone-share",
+						    _("_Share..."),
+						    _("Share this folder on Ubuntu One"),
+						    "ubuntuone");
+		if (is_pending)
+			g_object_set (menu_item, "sensitive", FALSE, NULL);
+
+		g_signal_connect (menu_item, "activate",
+				  G_CALLBACK (share_folder_cb), cb_data);
+	} else {
+		/* the different tooltips will probably do us no good */
+		if (is_root) {
+			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-root",
+							    _("_Share..."),
+							    _("Sorry, you can't share the root of a Ubuntu One volume"),
+							    "ubuntuone");
+		} else if (!(is_managed || is_udf)) {
+			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
+							    _("_Share..."),
+							    _("Sorry, you can't share folders not managed by Ubuntu One"),
+							    "ubuntuone");
+		} else {
+			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
+							    _("_Share..."),
+							    _("Sorry, you can only share folders"),
+							    "ubuntuone");
+		}
+		g_object_set (menu_item, "sensitive", FALSE, NULL);
+	}
+
+	nautilus_menu_append_item (submenu, menu_item);
+
+	if ((is_managed && is_shared) && !is_root && is_dir) {
+		menu_item = nautilus_menu_item_new ("ubuntuone-unshare",
+						    _("Stop _Sharing"),
+						    _("Stop sharing this folder on Ubuntu One"),
+						    "ubuntuone");
+		if (is_pending)
+			g_object_set (menu_item, "sensitive", FALSE, NULL);
+
+		g_signal_connect (menu_item, "activate",
+				  G_CALLBACK (unshare_folder_cb), cb_data);
+		nautilus_menu_append_item (submenu, menu_item);
+	}
+
+	/* UDF logic
+	 *
+	 * XXX: clean this up and separate the logic out and reuse this
+	 * and locationbar somewhere (libsd?)
+	 */
+	menu_item = NULL;
+
+	if (is_dir && is_inhome) {
+		/* UDFs could be happening */
+		if (is_managed) {
+			if (strcmp (path, uon->managed) == 0) {
+				/* the Ubuntu One directory, no UDFs */
+				menu_item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
+								    _("Stop Synchronizing This _Folder"),
+								    _("Sorry, you can't stop synchronizing ~/Ubuntu One"),
+								    "ubuntuone");
+				g_object_set (menu_item, "sensitive", FALSE, NULL);
+			} else if (is_root) {
+				/* the root of a UDF: disabling possible */
+
+				menu_item = nautilus_menu_item_new ("ubuntuone-disable-udf",
+								    _("Stop Synchronizing This _Folder"),
+								    _("Stop synchronizing this folder with Ubuntu One"),
+								    "ubuntuone");
+
+				g_signal_connect (menu_item, "activate",
+						  G_CALLBACK (unsubscribe_folder_cb), cb_data);
+			}
+		} else {
+			/* unmanaged */
+			menu_item = nautilus_menu_item_new ("ubuntuone-enable-udf",
+							    _("Synchronize This _Folder"),
+							    _("Start synchronizing this folder with Ubuntu One"),
+							    "ubuntuone");
+
+			g_signal_connect (menu_item, "activate",
+					  G_CALLBACK (subscribe_folder_cb), cb_data);
+		}
+	} else {
+		if (is_dir) {
+			menu_item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
+							    _("Synchronize This _Folder"),
+							    _("Sorry, you can only synchronize folders within your home folder"),
+							    "ubuntuone");
+		} else {
+			menu_item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
+							    _("Synchronize This _Folder"),
+							    _("Sorry, you can only synchronize folders"),
+							    "ubuntuone");
+		}
+
+		g_object_set (menu_item, "sensitive", FALSE, NULL);
+	}
+
+	if (!menu_item) {
+		menu_item = nautilus_menu_item_new ("ubuntuone-no-udf-operation-possible",
+						    _("Synchronize This _Folder"),
+						    _("Synchronization not possible for this folder"),
+						    "ubuntuone");
+		g_object_set (menu_item, "sensitive", FALSE, NULL);
+	}
+
+	nautilus_menu_append_item (submenu, menu_item);
+
+	/* public files */
+	menu_item = urlitem = NULL;
+
+	if (is_managed && is_regular) {
+		if (is_public) {
+			urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
+							  _("Copy Web _Link"),
+							  _("Copy the Ubuntu One public URL for this file to the clipboard."),
+							  "ubuntuone");
+			if (is_pending)
+				g_object_set (urlitem, "sensitive", FALSE, NULL);
+			g_signal_connect (urlitem, "activate",
+					  G_CALLBACK (copy_public_url_cb), cb_data);
+
+			menu_item = nautilus_menu_item_new ("ubuntuone-unpublish",
+							    _("Stop _Publishing"),
+							    _("No longer share this file with everyone via Ubuntu One."),
+							    "ubuntuone");
+			if (is_pending)
+				g_object_set (menu_item, "sensitive", FALSE, NULL);
+
+			cb_data->make_public = FALSE;
+		} else {
+			menu_item = nautilus_menu_item_new ("ubuntuone-publish",
+							    _("_Publish"),
+							    _("Make this file available to anyone via Ubuntu One."),
+							    "ubuntuone");
+			cb_data->make_public = TRUE;
+		}
+		g_signal_connect (menu_item, "activate",
+				  G_CALLBACK (toggle_publicity_cb), cb_data);
+	}
+
+	if (!urlitem) {
+		urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
+						  _("Copy Web _Link"),
+						  _("Sorry, no public URL for this file via Ubuntu One."),
+						  "ubuntuone");
+		g_object_set (urlitem, "sensitive", FALSE, NULL);
+	}
+
+	if (!menu_item) {
+		menu_item = nautilus_menu_item_new ("ubuntuone-publish",
+						    _("_Publish"),
+						    _("Sorry, unable to publish via Ubuntu One."),
+						    "ubuntuone");
+		g_object_set (menu_item, "sensitive", FALSE, NULL);
+	}
+
+	nautilus_menu_append_item (submenu, menu_item);
+	nautilus_menu_append_item (submenu, urlitem);
+
+	/* location bar enable/disable */
+	if (ubuntuone_is_location_bar_enabled ()) {
+		menu_item = nautilus_menu_item_new ("ubuntuone-location-hide",
+						    _("Hide _Ribbon"),
+						    _("Do not show the Ubuntu One ribbon"
+						      " in selected folders"),
+						    "ubuntuone");
+	} else {
+		menu_item = nautilus_menu_item_new ("ubuntuone-location-show",
+						    _("Show _Ribbon in Some Folders"),
+						    _("Show the Ubuntu One ribbon"
+						      " in selected folders"),
+						    "ubuntuone");
+	}
+
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (toggle_location_cb), cb_data);
+	nautilus_menu_append_item (submenu, menu_item);
+
+	return root_item;
+}
 
=== added file 'nautilus/context-menu.h'
--- nautilus/context-menu.h	1970-01-01 00:00:00 +0000
+++ nautilus/context-menu.h	2010-09-22 11:18:40 +0000
@@ -0,0 +1,32 @@
+/*
+ * UbuntuOne Nautilus plugin
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2009-2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __CONTEXT_MENU_H__
+#define __CONTEXT_MENU_H__
+
+#include <libnautilus-extension/nautilus-menu-provider.h>
+#include "ubuntuone-nautilus.h"
+
+NautilusMenuItem *context_menu_new (UbuntuOneNautilus *uon,
+				    GtkWidget *window,
+				    GList *files);
+
+#endif
 
=== modified file 'nautilus/error-dialog.c'
--- nautilus/error-dialog.c	2010-08-02 10:40:26 +0000
+++ nautilus/error-dialog.c	2010-09-22 11:18:40 +0000
@@ -37,7 +37,7 @@
 	va_end (args);
 
 	/* Show the dialog */
-	dialog = gtk_message_dialog_new (GTK_WINDOW (uon->cb_data->parent),
+	dialog = gtk_message_dialog_new (NULL,
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_CLOSE,
 
=== modified file 'nautilus/location-widget.h'
--- nautilus/location-widget.h	2010-08-11 22:38:44 +0000
+++ nautilus/location-widget.h	2010-09-22 11:18:40 +0000
@@ -61,7 +61,4 @@
 GType      location_widget_get_type (void);
 GtkWidget *location_widget_new (UbuntuOneNautilus *uon, const gchar *path);
 
-/* this is the wrong place for this, but it'll have to do for now */
-gboolean location_widget_check_shared_for_folder (SyncdaemonDaemon *daemon, SyncdaemonFolderInfo *folder_info, GtkWidget *widget);
-
 #endif
 
=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-09-14 14:20:39 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-09-22 11:18:40 +0000
@@ -33,8 +33,8 @@
 #include <libnautilus-extension/nautilus-location-widget-provider.h>
 #include <libsyncdaemon/libsyncdaemon.h>
 #include "ubuntuone-nautilus.h"
+#include "context-menu.h"
 #include "location-widget.h"
-#include "share-dialog.h"
 
 /* We need to do this explicitly because older versions of nautilus
  * don't seem to do it for us
@@ -49,17 +49,11 @@
 /* The header is generated from ubuntuone-marshallers.list */
 #include "ubuntuone-marshallers.h"
 
-/* This is used when a change is pending */
-#define UPDATE_PENDING "pending"
-
 static void ubuntuone_nautilus_finalize(GObject * object);
 
 static void ubuntuone_nautilus_register_type (GTypeModule * module);
 
 /* Utility functions */
-static void ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus * uon,
-					     const char * path);
-
 static void ubuntuone_nautilus_observed_file_unref (gpointer user_data,
                                                     GObject *where_the_object_was);
 
@@ -115,22 +109,6 @@
 
 static GObjectClass * parent_class = NULL;
 
-static void ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus * uon,
-					     const char * path) {
-
-  GHashTableIter iter;
-  gchar *key;
-  NautilusFileInfo *file;
-
-  /* Remove emblems from all files in the specified path */
-  g_hash_table_iter_init (&iter, uon->observed);
-  while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
-    if (g_str_has_prefix (key, path) || g_strcmp0 (key, path) == 0) {
-      nautilus_file_info_invalidate_extension_info (file);
-    }
-  }
-}
-
 /* Called when NautilusFileInfo is unreferenced */
 static void ubuntuone_nautilus_observed_file_unref (gpointer user_data,
                                                     GObject *where_the_object_was) {
@@ -157,8 +135,8 @@
   uon = UBUNTUONE_NAUTILUS(user_data);
   file = NAUTILUS_FILE_INFO(value);
 
-  g_object_weak_unref (G_OBJECT(file),
-		       (GWeakNotify)ubuntuone_nautilus_observed_file_unref,
+  g_object_weak_unref (G_OBJECT (file),
+		       (GWeakNotify) ubuntuone_nautilus_observed_file_unref,
 		       uon);
 
 }
@@ -316,44 +294,16 @@
   iface->update_file_info = ubuntuone_nautilus_update_file_info;
 }
 
-static gboolean
-show_location (void)
-{
-  GConfClient *conf_client;
-  GConfValue * show_location_value;
-  gboolean show_location;
-
-  conf_client = gconf_client_get_default ();
-  show_location_value = gconf_client_get (conf_client, EXPANDER_SHOWN_KEY, NULL);
-  g_object_unref (conf_client);
-
-  if (show_location_value == NULL) {
-    show_location = TRUE;
-  } else {
-    show_location = gconf_value_get_bool (show_location_value);
-  }
-  gconf_value_free (show_location_value);
-
-  return show_location;
-}
-
-static void toggle_location() {
-  GConfClient *conf_client;
-
-  conf_client = gconf_client_get_default ();
-  gconf_client_set_bool (conf_client, EXPANDER_SHOWN_KEY, !show_location(), NULL);
-}
-
 /* LocationWidget provider */
-static GtkWidget * ubuntuone_nautilus_get_location_widget(NautilusLocationWidgetProvider * provider,
-							  const char * uri,
-							  GtkWidget * parent) {
+static GtkWidget * ubuntuone_nautilus_get_location_widget (NautilusLocationWidgetProvider * provider,
+							   const char * uri,
+							   GtkWidget * parent) {
   UbuntuOneNautilus * uon;
   gchar *path;
   GtkWidget *location;
 
   /* if the bar is disabled, do nothing */
-  if (!show_location())
+  if (!ubuntuone_is_location_bar_enabled ())
     return NULL;
 
   uon = UBUNTUONE_NAUTILUS (provider);
@@ -378,151 +328,15 @@
   iface->get_widget = ubuntuone_nautilus_get_location_widget;
 }
 
-static void __cb_data_free (struct _CBData * data) {
-  if (!data)
-    return;
-
-  data->uon = NULL;
-  data->parent = NULL;
-
-  if (data->path) {
-    g_free (data->path);
-    data->path = NULL;
-  }
-
-  g_free (data);
-
-  data = NULL;
-}
-
-/* Menu callbacks */
-static void ubuntuone_nautilus_public_meta (SyncdaemonFilesystemInterface *interface,
-					    gboolean success,
-					    SyncdaemonMetadata *metadata,
-					    gpointer user_data) {
-  struct _CBData * data = (struct _CBData *) user_data;
-  GError * error = NULL;
-  const gchar * share_id, * node_id;
-  SyncdaemonInterface *public;
-
-  if (!success) {
-    g_warning ("ERROR: getting metadata for public file");
-    return;
-  }
-
-  share_id = syncdaemon_metadata_get_share_id (metadata);
-  node_id = syncdaemon_metadata_get_node_id (metadata);
-
-  public = syncdaemon_daemon_get_publicfiles_interface (data->uon->syncdaemon);
-  if (public != NULL) {
-    syncdaemon_publicfiles_interface_change_public_access (SYNCDAEMON_PUBLICFILES_INTERFACE (public),
-							   share_id, node_id, data->make_public);
-  }
-}
-
-static void ubuntuone_nautilus_unsubscribe_folder (NautilusMenuItem *item,
-						   gpointer user_data) {
-  SyncdaemonInterface *interface;
-  struct _CBData * data = (struct _CBData *) user_data;
-
-  /* Perform the removal of this folder */
-  interface = syncdaemon_daemon_get_folders_interface (data->uon->syncdaemon);
-  if (interface != NULL) {
-    SyncdaemonFolderInfo *folder_info;
-
-    folder_info = syncdaemon_folders_interface_get_info (SYNCDAEMON_FOLDERS_INTERFACE (interface),
-                                                         data->path);
-    if (folder_info != NULL) {
-      if (ubuntuone_nautilus_check_shares_and_public_files (data->uon, folder_info, data->parent)) {
-        syncdaemon_folders_interface_delete (SYNCDAEMON_FOLDERS_INTERFACE (interface),
-                                             syncdaemon_folder_info_get_volume_id (folder_info));
-      }
-      g_object_unref (G_OBJECT (folder_info));
-    }
-  }
-}
-
-static void ubuntuone_nautilus_subscribe_folder (NautilusMenuItem *item,
-						 gpointer user_data) {
-  SyncdaemonInterface *interface;
-  struct _CBData * data = (struct _CBData *) user_data;
-
-  /* Perform the addition of this folder */
-  interface = syncdaemon_daemon_get_folders_interface (data->uon->syncdaemon);
-  if (interface != NULL) {
-    /* If there is no user authenticated, make Syncdaemon do so */
-    if (!syncdaemon_authentication_has_credentials (syncdaemon_daemon_get_authentication (data->uon->syncdaemon)))
-      syncdaemon_daemon_connect (data->uon->syncdaemon);
-    syncdaemon_folders_interface_create (SYNCDAEMON_FOLDERS_INTERFACE (interface),
-                                         data->path);
-  }
-}
-
-static void ubuntuone_nautilus_copy_public_url (NautilusMenuItem * item,
-						gpointer user_data) {
-  struct _CBData * data = (struct _CBData *) user_data;
-  gchar * url;
-
-  url = g_hash_table_lookup (data->uon->public, data->path);
-  gtk_clipboard_set_text (gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
-			  url, strlen (url));
-  gtk_clipboard_store (gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
-}
-
-static void ubuntuone_nautilus_toggle_publicity (NautilusMenuItem * item,
-						 gpointer user_data) {
-  SyncdaemonFilesystemInterface *interface;
-  struct _CBData * data = (struct _CBData *) user_data;
-
-  interface = (SyncdaemonFilesystemInterface *) syncdaemon_daemon_get_filesystem_interface (data->uon->syncdaemon);
-  if (interface != NULL) {
-    /* we know this will not be a directory (so no need for _and_quick_tree_synced) */
-    syncdaemon_filesystem_interface_get_metadata_async (interface, data->path, FALSE,
-							(SyncdaemonGotMetadataFunc) ubuntuone_nautilus_public_meta,
-							data);
-  }
-
-  g_hash_table_replace (data->uon->public, g_strdup (data->path), UPDATE_PENDING);
-  ubuntuone_nautilus_reset_emblem (data->uon, data->path);
-}
-
-static void ubuntuone_nautilus_share_folder (NautilusMenuItem * item,
-					     gpointer * user_data) {
-  struct _CBData * data = (struct _CBData *) user_data;
-  GtkWidget * dialog;
-
-  dialog = share_dialog_new (data->parent, data->uon, data->path);
-  gtk_widget_show (dialog);
-}
-
-static void ubuntuone_nautilus_unshare_folder (NautilusMenuItem * item,
-					       gpointer * user_data) {
-  struct _CBData * data = (struct _CBData *) user_data;
-  gchar * share_id;
-  SyncdaemonSharesInterface *interface;
-
-  interface = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (data->uon->syncdaemon);
-  if (interface != NULL) {
-    share_id = g_hash_table_lookup (data->uon->shares, data->path);
-    syncdaemon_shares_interface_delete (interface, share_id);
-  }
-}
-
 /* Menu provider */
-static GList * ubuntuone_nautilus_get_menu_items (NautilusMenuProvider * provider,
-						  GtkWidget * window,
-						  GList * files) {
+static GList *
+ubuntuone_nautilus_get_menu_items (NautilusMenuProvider * provider,
+				   GtkWidget * window,
+				   GList * files)
+{
   UbuntuOneNautilus * uon;
-  NautilusFileInfo * file;
-  NautilusMenu * submenu;
-  NautilusMenuItem * root_item;
-  GList * items = NULL;
-  gchar * path;
-  gchar * item;
-  gchar * homedir_path;
-  gboolean is_managed, is_root, is_udf, is_public, is_shared, is_pending;
-  gboolean is_inhome, is_dir, is_regular;
-  struct _CBData * cb_data;
+  GList *items = NULL;
+  NautilusMenuItem *root_item;
 
   uon = UBUNTUONE_NAUTILUS (provider);
 
@@ -530,260 +344,9 @@
   if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
     return NULL;
 
-  is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
-  is_inhome = is_dir = is_regular = FALSE;
-
-  if (g_list_length (files) != 1)
-    return NULL;
-
-  file = g_list_nth_data (files, 0);
-  path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
-
-  if (path == NULL)
-    goto done;
-
-  if (ubuntuone_is_storagefs (uon, path, &is_root))
-    is_managed = TRUE;
-
-  homedir_path = g_strdup_printf ("%s/", g_get_home_dir());
-  if (strncmp (path, homedir_path, strlen (homedir_path)) == 0)
-	is_inhome = TRUE;
-  g_free (homedir_path);
-
-  if ((item = g_hash_table_lookup (uon->udfs, path)) != NULL) {
-    is_udf = TRUE;
-	if (strcmp (item, UPDATE_PENDING) == 0)
-	  is_pending = TRUE;
-  } else if ((item = g_hash_table_lookup (uon->public, path)) != NULL) {
-    is_public = TRUE;
-	if (strcmp (item, UPDATE_PENDING) == 0)
-	  is_pending = TRUE;
-  }
-  if (g_hash_table_lookup (uon->shares, path) != NULL)
-    is_shared = TRUE;
-
-  is_dir = nautilus_file_info_is_directory (file);
-  is_regular = nautilus_file_info_get_file_type (file) == G_FILE_TYPE_REGULAR;
-
-  if (uon->cb_data)
-    __cb_data_free (uon->cb_data);
-
-  cb_data = g_new0 (struct _CBData, 1);
-  cb_data->uon = uon;
-  cb_data->parent = window;
-  cb_data->path = g_strdup (path);
-
-  uon->cb_data = cb_data;
-
-  root_item = nautilus_menu_item_new ("ubuntuone",
-                                      _("_Ubuntu One"),
-                                      _("Ubuntu One options"),
-                                      "ubuntuone");
-  submenu = nautilus_menu_new ();
-  nautilus_menu_item_set_submenu (root_item, submenu);
-
-  items = g_list_append (items, root_item);
-
-  /* Share/unshare */
-  {
-    NautilusMenuItem * item;
-
-    if ((is_managed || is_udf) && !is_root && is_dir) {
-
-      item = nautilus_menu_item_new ("ubuntuone-share",
-                                     _("_Share..."),
-                                     _("Share this folder on Ubuntu One"),
-                                     "ubuntuone");
-          if (is_pending)
-            g_object_set (item, "sensitive", FALSE, NULL);
-
-      g_signal_connect (item, "activate",
-                        G_CALLBACK (ubuntuone_nautilus_share_folder),
-                        cb_data);
-    } else {
-      /* the different tooltips will probably do us no good */
-      if (is_root) {
-        item = nautilus_menu_item_new ("ubuntuone-noshare-root",
-                                       _("_Share..."),
-                                       _("Sorry, you can't share the root of a Ubuntu One volume"),
-                                       "ubuntuone");
-      } else if (!(is_managed || is_udf)) {
-        item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
-                                       _("_Share..."),
-                                       _("Sorry, you can't share folders not managed by Ubuntu One"),
-                                       "ubuntuone");
-      } else {
-        item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
-                                       _("_Share..."),
-                                       _("Sorry, you can only share folders"),
-                                       "ubuntuone");
-      }
-      g_object_set (item, "sensitive", FALSE, NULL);
-    }
-
-    nautilus_menu_append_item (submenu, item);
-  }
-
-  if ((is_managed && is_shared) && !is_root && is_dir) {
-    NautilusMenuItem * item;
-
-    item = nautilus_menu_item_new ("ubuntuone-unshare",
-				   _("Stop _Sharing"),
-				   _("Stop sharing this folder on Ubuntu One"),
-				   "ubuntuone");
-	if (is_pending)
-	  g_object_set (item, "sensitive", FALSE, NULL);
-
-    g_signal_connect (item, "activate",
-		      G_CALLBACK (ubuntuone_nautilus_unshare_folder),
-		      cb_data);
-    nautilus_menu_append_item (submenu, item);
-  }
-
-  {
-    /* UDF logic
-     *
-     * XXX: clean this up and separate the logic out and reuse this
-     * and locationbar somewhere (libsd?)
-     */
-    NautilusMenuItem * item = NULL;
-    if (is_dir && is_inhome) {
-      /* UDFs could be happening */
-      if (is_managed) {
-	if (strcmp (path, uon->managed) == 0) {
-	  /* the Ubuntu One directory, no UDFs */
-          item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
-                                         _("Stop Synchronizing This _Folder"),
-                                         _("Sorry, you can't stop synchronizing ~/Ubuntu One"),
-                                         "ubuntuone");
-          g_object_set (item, "sensitive", FALSE, NULL);
-	} else if (is_root) {
-	  /* the root of a UDF: disabling possible */
-
-	  item = nautilus_menu_item_new ("ubuntuone-disable-udf",
-					 _("Stop Synchronizing This _Folder"),
-					 _("Stop synchronizing this folder with Ubuntu One"),
-					 "ubuntuone");
-
-	  g_signal_connect (item, "activate",
-			    G_CALLBACK (ubuntuone_nautilus_unsubscribe_folder),
-			    cb_data);
-	}
-      } else {
-	/* unmanaged */
-
-	item = nautilus_menu_item_new ("ubuntuone-enable-udf",
-				       _("Synchronize This _Folder"),
-				       _("Start synchronizing this folder with Ubuntu One"),
-				       "ubuntuone");
-
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (ubuntuone_nautilus_subscribe_folder),
-			  cb_data);
-      }
-    } else {
-      if (is_dir) {
-        item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
-				       _("Synchronize This _Folder"),
-				       _("Sorry, you can only synchronize folders within your home folder"),
-                                       "ubuntuone");
-      } else {
-        item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
-				       _("Synchronize This _Folder"),
-				       _("Sorry, you can only synchronize folders"),
-                                       "ubuntuone");
-      }
-      g_object_set (item, "sensitive", FALSE, NULL);
-    }
-    if (!item) {
-	item = nautilus_menu_item_new ("ubuntuone-no-udf-operation-possible",
-				       _("Synchronize This _Folder"),
-				       _("Synchronization not possible for this folder"),
-				       "ubuntuone");
-	g_object_set (item, "sensitive", FALSE, NULL);
-    }
-    nautilus_menu_append_item (submenu, item);
-  }
-
-  /* public files */
-  {
-    NautilusMenuItem * item = NULL, * urlitem = NULL;
-
-    if (is_managed && is_regular) {
-
-      if (is_public) {
-        urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
-                                          _("Copy Web _Link"),
-                                          _("Copy the Ubuntu One public URL for this file to the clipboard."),
-                                          "ubuntuone");
-        if (is_pending)
-          g_object_set (urlitem, "sensitive", FALSE, NULL);
-
-        g_signal_connect (urlitem, "activate",
-                          G_CALLBACK (ubuntuone_nautilus_copy_public_url),
-                          cb_data);
-        item = nautilus_menu_item_new ("ubuntuone-unpublish",
-                                       _("Stop _Publishing"),
-                                       _("No longer share this file with everyone via Ubuntu One."),
-                                       "ubuntuone");
-        if (is_pending)
-          g_object_set (item, "sensitive", FALSE, NULL);
-
-        cb_data->make_public = FALSE;
-      } else {
-        item = nautilus_menu_item_new ("ubuntuone-publish",
-                                       _("_Publish"),
-                                       _("Make this file available to anyone via Ubuntu One."),
-                                       "ubuntuone");
-        cb_data->make_public = TRUE;
-      }
-      g_signal_connect (item, "activate",
-                        G_CALLBACK (ubuntuone_nautilus_toggle_publicity),
-                        cb_data);
-    }
-    if (!urlitem) {
-      urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
-                                        _("Copy Web _Link"),
-                                        _("Sorry, no public URL for this file via Ubuntu One."),
-                                        "ubuntuone");
-      g_object_set (urlitem, "sensitive", FALSE, NULL);
-    }
-    if (!item) {
-      item = nautilus_menu_item_new ("ubuntuone-publish",
-                                     _("_Publish"),
-                                     _("Sorry, unable to publish via Ubuntu One."),
-                                     "ubuntuone");
-      g_object_set (item, "sensitive", FALSE, NULL);
-    }
-
-    nautilus_menu_append_item (submenu, item);
-    nautilus_menu_append_item (submenu, urlitem);
-  }
-
-  /* location bar enable/disable */
-  {
-    NautilusMenuItem * item;
-    if (show_location()) {
-      item = nautilus_menu_item_new ("ubuntuone-location-hide",
-                                     _("Hide _Ribbon"),
-                                     _("Do not show the Ubuntu One ribbon"
-                                       " in selected folders"),
-                                     "ubuntuone");
-    } else {
-      item = nautilus_menu_item_new ("ubuntuone-location-show",
-                                     _("Show _Ribbon in Some Folders"),
-                                     _("Show the Ubuntu One ribbon"
-                                       " in selected folders"),
-                                     "ubuntuone");
-    }
-    g_signal_connect (item, "activate",
-                      G_CALLBACK (toggle_location),
-                      cb_data);
-    nautilus_menu_append_item (submenu, item);
-  }
-
- done:
-  g_free (path);
+  root_item = context_menu_new (uon, window, files);
+  if (root_item != NULL)
+	  items = g_list_append (items, root_item);
 
   return items;
 }
@@ -876,8 +439,6 @@
 static void ubuntuone_nautilus_finalize(GObject * object) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS(object);
 
-  __cb_data_free (uon->cb_data);
-
   if (uon->syncdaemon)
     g_object_unref (uon->syncdaemon);
 
 
=== modified file 'nautilus/ubuntuone-nautilus.h'
--- nautilus/ubuntuone-nautilus.h	2010-08-25 14:00:10 +0000
+++ nautilus/ubuntuone-nautilus.h	2010-09-22 11:18:40 +0000
@@ -31,8 +31,8 @@
 #define UBUNTUONE_TYPE_NAUTILUS  (ubuntuone_nautilus_get_type ())
 #define UBUNTUONE_NAUTILUS(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), UBUNTUONE_TYPE_NAUTILUS, UbuntuOneNautilus))
 
-/* Magical struct for passing data in callbacks */
-typedef struct _CBData CBData;
+/* This is used when a change is pending */
+#define UPDATE_PENDING "pending"
 
 typedef struct {
 	GObject parent_slot;
@@ -65,33 +65,24 @@
 
 	/* List of files that are observed for changes */
 	GHashTable * observed;
-
-	/* Extra data we need to free on finalization */
-	CBData * cb_data;
 } UbuntuOneNautilus;
 
 typedef struct {
 	GObjectClass parent_slot;
 } UbuntuOneNautilusClass;
 
-struct _CBData {
-	UbuntuOneNautilus * uon;
-	gchar * path;
-	GtkWidget * parent;
-
-	/* Whether to make a file public or private */
-	gboolean make_public;
-};
-
 GType ubuntuone_nautilus_get_type (void);
 
 /* Utility functions */
 gboolean ubuntuone_is_storagefs (UbuntuOneNautilus * uon,
 				 const char * path,
 				 gboolean * is_root);
+gboolean ubuntuone_is_location_bar_enabled (void);
+
 gboolean ubuntuone_nautilus_check_shares_and_public_files (UbuntuOneNautilus *uon,
 							   SyncdaemonFolderInfo *folder_info,
 							   GtkWidget *widget);
+void     ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus * uon, const char * path);
 
 void     ubuntuone_show_error_dialog (UbuntuOneNautilus *uon, const gchar *title, const gchar *error_message, ...);
 
 
=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2010-09-01 17:50:47 +0000
+++ nautilus/utils.c	2010-09-22 11:18:40 +0000
@@ -20,8 +20,10 @@
  */
 
 #include <glib/gi18n.h>
+#include <libnautilus-extension/nautilus-file-info.h>
 #include <libsyncdaemon/syncdaemon-shares-interface.h>
 #include "ubuntuone-nautilus.h"
+#include "location-widget.h"
 
 /* this is the wrong place for this, but it'll have to do for now */
 gboolean
@@ -98,3 +100,40 @@
 
 	return result;
 }
+
+gboolean
+ubuntuone_is_location_bar_enabled (void)
+{
+	GConfClient *conf_client;
+	GConfValue * show_location_value;
+	gboolean show_location;
+
+	conf_client = gconf_client_get_default ();
+	show_location_value = gconf_client_get (conf_client, EXPANDER_SHOWN_KEY, NULL);
+	g_object_unref (conf_client);
+
+	if (show_location_value == NULL)
+		show_location = TRUE;
+	else
+		show_location = gconf_value_get_bool (show_location_value);
+
+	gconf_value_free (show_location_value);
+
+	return show_location;
+}
+
+void
+ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus *uon, const char *path)
+{
+	GHashTableIter iter;
+	gchar *key;
+	NautilusFileInfo *file;
+
+	/* Remove emblems from all files in the specified path */
+	g_hash_table_iter_init (&iter, uon->observed);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
+		if (g_str_has_prefix (key, path) || g_strcmp0 (key, path) == 0) {
+			nautilus_file_info_invalidate_extension_info (file);
+		}
+	}
+}
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-08-25 20:00:32 +0000
+++ po/POTFILES.in	2010-09-22 11:18:40 +0000
@@ -7,6 +7,7 @@
 nautilus/add-contact-dialog.c
 nautilus/ubuntuone-nautilus.c
 nautilus/contacts-view.c
+nautilus/context-menu.c
 nautilus/u1-contacts-picker.c
 nautilus/location-widget.c
 nautilus/share-dialog.c