Merge lp:~dobey/ubuntuone-client/nautilus-crash-fix into lp:ubuntuone-client

[dobey]

[r=jblount, r=statik] Add some error checking to avoid crashing Nautilus on shutdown

[dobey (dobey)]

This fixes a new crash which has apparently been occurring a lot in Karmic. It also disallows sharing of the "My Files" directory itself, as it is extremely easy to accidentally do so, do to a bug in current Nautilus.

[Joshua Blount (jblount)]

Looks fine, but I'm confused, how does this dis-allow sharing ~/Ubuntu One/My Files/ ? I don't see sharing options in the contextual menu when right clicking folders.

review: Approve

[dobey (dobey)]

On Fri, 2009-07-24 at 12:17 +0000, Joshua Blount wrote:
> Review: Approve
> Looks fine, but I'm confused, how does this dis-allow sharing ~/Ubuntu
> One/My Files/ ? I don't see sharing options in the contextual menu
> when right clicking folders.

31- myfiles = g_build_filename (uon->managed, "My Files", NULL);
32+ myfiles = g_build_filename (uon->managed, "My Files", G_DIR_SEPARATOR_S, NULL);

This change will require the comparison following it, to contain the
directory separator character after the "My Files" preventing the menu
being available on the "My Files" folder, but it will appear for folders
underneath "My Files" still.

[Elliot Murphy (statik)]

nice branch, less crashing is good.

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-07-22 21:49:39 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-07-23 20:14:46 +0000
@@ -279,11 +279,20 @@
 };
 
 static void __share_cb_data_free (struct _ShareCBData * data) {
+  if (!data)
+    return;
+
   data->uon = NULL;
   data->parent = NULL;
 
-  g_free (data->path);
-  data->path = NULL;
+  data->user_entry = NULL;
+  data->name_entry = NULL;
+  data->allow_mods = NULL;
+
+  if (data->path) {
+    g_free (data->path);
+    data->path = NULL;
+  }
 
   g_free (data);
 
@@ -422,7 +431,7 @@
   path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
 
   shared = g_build_filename (uon->managed, "Shared with Me", NULL);
-  myfiles = g_build_filename (uon->managed, "My Files", NULL);
+  myfiles = g_build_filename (uon->managed, "My Files", G_DIR_SEPARATOR_S, NULL);
 
   if (!path || !ubuntuone_is_storagefs (uon, path))
     goto done;
@@ -433,6 +442,9 @@
   if (strncmp (path, myfiles, strlen (myfiles)) != 0)
     goto done;
 
+  if (uon->share_cb_data)
+    __share_cb_data_free (uon->share_cb_data);
+
   share_cb_data = g_new0 (struct _ShareCBData, 1);
   share_cb_data->uon = uon;
   share_cb_data->parent = window;