Merge lp:~alecu/ubuntuone-client/fix-nautilus-symlinks-udfs into lp:ubuntuone-client

[Alejandro J. Cura]

Do not show share/synchronize/publish options on symlinks (LP: #747299)

Do not show share/synchronize/publish options on symlinks (LP: #747299)

[dobey (dobey)]

+ gfile = g_file_new_for_uri (nautilus_file_info_get_uri (file));

This will leak memory. You need to assign the result of nautilus_file_info_get_uri () to a gchar *, and then g_free () it when done using it, as it does not return a const. I think.

review: Needs Fixing

[lp:~alecu/ubuntuone-client/fix-nautilus-symlinks-udfs]

934. By Alejandro J. Cura on 2011-04-04

replace g_file_info_get_file_type with the much simpler g_file_test; freed two strings

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

To test this:

1) install the nautilus plugin from this branch
2) create a symlink in your home directory from a folder in your home directory
3) right click on both. The Ubuntu One pop-up menu should gray out the "Synchronize this folder" option only for the symlink
4) create a symlink in your Ubuntu One directory from a folder in your Ubuntu One directory
5) right click on both. The Ubuntu One pop-up menu should gray out the "Share..." option only for the symlink
6) create a symlink in your Ubuntu One directory from a file in your Ubuntu One directory
7) right click on both. The Ubuntu One pop-up menu should gray out the "Publish" option only for the symlink

[Natalia Bidart (nataliabidart)]

Great!

review: Approve

=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2011-02-11 15:20:11 +0000
+++ nautilus/context-menu.c	2011-04-04 18:02:47 +0000
@@ -180,19 +180,21 @@
 	NautilusFileInfo *file;
 	NautilusMenu *submenu;
 	NautilusMenuItem *root_item, *menu_item, *urlitem;
-	gchar *path, *item, *homedir_path;
+	gchar *path, *item, *homedir_path, *path_uri;
 	gboolean is_managed, is_root, is_udf, is_public, is_shared, is_pending;
-	gboolean is_shared_to_me, is_inhome, is_dir, is_regular;
+	gboolean is_shared_to_me, is_inhome, is_dir, is_regular, is_symlink;
 	MenuCallbackData *cb_data;
 
 	is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
-	is_shared_to_me = is_inhome = is_dir = is_regular = FALSE;
+	is_shared_to_me = is_inhome = is_dir = is_regular = is_symlink = 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);
+	path_uri = nautilus_file_info_get_uri (file);
+	path = g_filename_from_uri (path_uri, NULL, NULL);
+	g_free (path_uri);
 
 	if (path == NULL)
 		return NULL;
@@ -224,6 +226,8 @@
 	is_dir = nautilus_file_info_is_directory (file);
 	is_regular = nautilus_file_info_get_file_type (file) == G_FILE_TYPE_REGULAR;
 
+	is_symlink = g_file_test (path, G_FILE_TEST_IS_SYMLINK);
+
 	cb_data = g_new0 (MenuCallbackData, 1);
 	cb_data->uon = uon;
 	cb_data->parent = window;
@@ -240,7 +244,7 @@
 	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) {
+	if ((is_managed || is_udf) && !is_root && is_dir && !is_symlink) {
 
 		menu_item = nautilus_menu_item_new ("ubuntuone-share",
 						    _("_Share..."),
@@ -274,7 +278,7 @@
 
 	nautilus_menu_append_item (submenu, menu_item);
 
-	if ((is_managed && is_shared) && !is_root && is_dir) {
+	if ((is_managed && is_shared) && !is_root && is_dir && !is_symlink) {
 		menu_item = nautilus_menu_item_new ("ubuntuone-unshare",
 						    _("Stop _Sharing"),
 						    _("Stop sharing this folder on Ubuntu One"),
@@ -294,7 +298,7 @@
 	 */
 	menu_item = NULL;
 
-	if (is_dir && is_inhome) {
+	if (is_dir && is_inhome && !is_symlink) {
 		/* UDFs could be happening */
 		if (is_managed) {
 			if (strcmp (path, uon->managed) == 0) {
@@ -354,7 +358,7 @@
 	/* public files */
 	menu_item = urlitem = NULL;
 
-	if (!is_shared_to_me && is_managed && is_regular) {
+	if (!is_shared_to_me && is_managed && is_regular && !is_symlink) {
 		if (is_public) {
 			urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
 							  _("Copy Web _Link"),
@@ -422,5 +426,6 @@
 			  G_CALLBACK (toggle_location_cb), cb_data);
 	nautilus_menu_append_item (submenu, menu_item);
 
+	g_free (path);
 	return root_item;
 }