Merge lp:~ralsina/ubuntuone-client/fix_712674_on_1.4 into lp:ubuntuone-client/stable-1-4

[Roberto Alsina]

Don't offer the "Publish" option in the context menu for files/folders that are being shared to the user, because it's not supported.

Adds a utility function to determine if a file or directory is inside a share, and uses that to modify the context menu so you can't try to publish those files/directories.

To fieldtest it, build it using these commands:

WARNING, this overwrites part of ubuntuone-client-gnome, you may need to reinstall it later

./autogen.sh
./configure --prefix=/usr
make
cd nautilus && sudo make install
pkill nautilus
nautilus nautilus ~/Ubuntu\ One/Shared\ With\ Me/

Then check the context menus, the "Ubuntu One->Publish" option should be disabled.
Check also in a subdirectory, with folders and files, and that the Publish option is enabled for contents outside the shares.

[lp:~ralsina/ubuntuone-client/fix_712674_on_1.4]

750. By Roberto Alsina on 2011-02-11

mark the bug this fixes

[dobey (dobey)]

54 +
55 +
56 +
57 +

85 +
86 +
87 +

What are all the extra blank lines being added for?

review: Needs Information

[Roberto Alsina (ralsina)]

> 54 +
> 55 +
> 56 +
> 57 +
>
> 85 +
> 86 +
> 87 +
>
> What are all the extra blank lines being added for?

No reason, I'll remove them.

[lp:~ralsina/ubuntuone-client/fix_712674_on_1.4]

751. By Roberto Alsina on 2011-02-14

remove empty lines

[dobey (dobey)]

review: Approve

[Roman Yepishev (rye)]

Yep, no publish in shares.

review: Approve (fieldtest)

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-12-07 22:00:23 +0000
+++ nautilus/ubuntuone-nautilus.c	2011-02-14 14:39:13 +0000
@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
+#include <stdlib.h>
 #include <glib/gi18n-lib.h>
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
@@ -163,6 +163,36 @@
 
 }
 
+/* 
+ * Check if the passed folder is inside a folder shared TO the user.
+ *
+ * Added to fix bug #712674
+ */
+gboolean
+ubuntuone_is_inside_shares (UbuntuOneNautilus *uon, const gchar *path)
+{
+  gboolean is_shared_to_me = FALSE;
+  gchar *resolved_path;
+  gchar *prefix = g_build_filename (g_get_user_data_dir (), "ubuntuone", "shares", G_DIR_SEPARATOR_S, NULL);
+
+  /* 
+   *  Have to use realpath because path contains a symlink like
+   * ~/Ubuntu One/Shared With Me -> ~/.local/share/ubuntuone/shares
+   * 
+   * This also claims ~/Ubuntu One/Shared with Me/foo is
+   * in a share even if it's not true. that's intentional since
+   * those files are never uploaded, and thus it makes no sense
+   * to publish them.
+   */
+  resolved_path = realpath(path, NULL);
+  if (g_str_has_prefix (resolved_path, prefix)) {
+    is_shared_to_me = TRUE;
+  }
+  free (resolved_path);
+  g_free (prefix);
+  return is_shared_to_me;
+}
+
 /* Are we in an Ubuntu One managed (root or udf) directory */
 gboolean ubuntuone_is_storagefs (UbuntuOneNautilus * uon,
 				 const char * path,
@@ -524,7 +554,7 @@
   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;
+  gboolean is_shared_to_me, is_inhome, is_dir, is_regular;
 
   uon = UBUNTUONE_NAUTILUS (provider);
 
@@ -533,7 +563,7 @@
     return NULL;
 
   is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
-  is_inhome = is_dir = is_regular = FALSE;
+  is_shared_to_me = is_inhome = is_dir = is_regular = FALSE;
 
   if (g_list_length (files) != 1)
     return NULL;
@@ -547,6 +577,9 @@
   if (ubuntuone_is_storagefs (uon, path, &is_root))
     is_managed = TRUE;
 
+  if (ubuntuone_is_inside_shares (uon, path))
+    is_shared_to_me = TRUE;
+
   homedir_path = g_strdup_printf ("%s/", g_get_home_dir());
   if (strncmp (path, homedir_path, strlen (homedir_path)) == 0)
 	is_inhome = TRUE;
@@ -711,7 +744,7 @@
   {
     NautilusMenuItem * item = NULL, * urlitem = NULL;
 
-    if (is_managed && is_regular) {
+    if (!is_shared_to_me && is_managed && is_regular) {
 
       if (is_public) {
         urlitem = nautilus_menu_item_new ("ubuntuone-geturl",