From ea26e6ddefca9b5f75f3d7485e420729bc038852 Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Tue, 5 Jun 2018 13:04:15 +0200

Subject: [PATCH 01/14] google: Do not create .desktop files for native files

Currently, .desktop file with a link to the original location is provided,

when a native file is opened because Google doesn't provide its proprietary

formats and GLocalFile doesn't know G_FILE_TYPE_SHORTCUT. It is a bit

tricky and confusing, among other because the .desktop files aren't

automatically converted back to native files when writing.

What is worse, Nautilus has dropped support for .desktop files recently,

so you see "There was an error launching the application." instead of the

requested file. It doesn't make more sense to provide this .desktop files,

so let's remove this fallback and return error instead.

https://gitlab.gnome.org/GNOME/nautilus/issues/448

---

 daemon/gvfsbackendgoogle.c | 68 ++++++++------------------------------

 1 file changed, 13 insertions(+), 55 deletions(-)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index 23bd8f58..7bea4bff 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -907,7 +907,6 @@ build_file_info (GVfsBackendGoogle      *self,

   gchar *escaped_name = NULL;

   gchar *content_type = NULL;

   gchar *copy_name = NULL;

-  gchar *generated_copy_name = NULL;

   gint64 atime;

   gint64 ctime;

   gint64 mtime;

@@ -1025,21 +1024,7 @@ build_file_info (GVfsBackendGoogle      *self,

   g_file_info_set_display_name (info, title);

   g_file_info_set_edit_name (info, title);

-  generated_copy_name = generate_copy_name (self, entry);

-

-  /* While copying remote Drive content to local storage, we want to

-   * create Link-type desktop files because GLocalFile doesn't know

-   * about shortcuts. That might change in future.

-   */

-  if (file_type == G_FILE_TYPE_SHORTCUT)

-    {

-      copy_name = g_strconcat (generated_copy_name, ".desktop", NULL);

-    }

-  else

-    {

-      copy_name = generated_copy_name;

-      generated_copy_name = NULL;

-    }

+  copy_name = generate_copy_name (self, entry);

   /* Sanitize copy-name by replacing slashes with dashes. This is

    * what nautilus does (for desktop files).

@@ -1097,7 +1082,6 @@ build_file_info (GVfsBackendGoogle      *self,

  out:

   g_free (copy_name);

-  g_free (generated_copy_name);

   g_free (escaped_name);

   g_free (content_type);

   g_list_free (links);

@@ -2249,6 +2233,8 @@ g_vfs_backend_google_open_for_read (GVfsBackend        *_self,

   GError *error;

   gchar *content_type = NULL;

   gchar *entry_path = NULL;

+  GDataAuthorizationDomain *auth_domain;

+  const gchar *uri;

   g_rec_mutex_lock (&self->mutex);

   g_debug ("+ open_for_read: %s\n", filename);

@@ -2278,47 +2264,19 @@ g_vfs_backend_google_open_for_read (GVfsBackend        *_self,

       goto out;

     }

-  /* While copying remote Drive content to local storage, we want to

-   * create Link-type desktop files because GLocalFile doesn't know

-   * about shortcuts. That might change in future.

-   */

-  if (g_str_has_prefix (content_type, CONTENT_TYPE_PREFIX_GOOGLE))

+  if (is_native_file (entry))

     {

-      GDataLink *alternate;

-      GKeyFile *file;

-      const gchar *title;

-      const gchar *uri;

-      gchar *data;

-      gsize length;

-

-      file = g_key_file_new ();

-

-      title = gdata_entry_get_title (entry);

-      g_key_file_set_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, title);

-      g_key_file_set_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TYPE, "Link");

-

-      alternate = gdata_entry_look_up_link (entry, GDATA_LINK_ALTERNATE);

-      uri = gdata_link_get_uri (alternate);

-      g_key_file_set_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_URL, uri);

-

-      data = g_key_file_to_data (file, &length, NULL);

-      stream = g_memory_input_stream_new_from_data (data, (gssize) length, g_free);

-

-      g_key_file_free (file);

+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, _("File is not a regular file"));

+      goto out;

     }

-  else

-    {

-      GDataAuthorizationDomain *auth_domain;

-      const gchar *uri;

-      auth_domain = gdata_documents_service_get_primary_authorization_domain ();

-      uri = gdata_entry_get_content_uri (entry);

-      stream = gdata_download_stream_new (GDATA_SERVICE (self->service), auth_domain, uri, cancellable);

-      if (stream == NULL)

-        {

-          g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, G_IO_ERROR_FAILED, _("Error getting data from file"));

-          goto out;

-        }

+  auth_domain = gdata_documents_service_get_primary_authorization_domain ();

+  uri = gdata_entry_get_content_uri (entry);

+  stream = gdata_download_stream_new (GDATA_SERVICE (self->service), auth_domain, uri, cancellable);

+  if (stream == NULL)

+    {

+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, G_IO_ERROR_FAILED, _("Error getting data from file"));

+      goto out;

     }

   g_object_set_data_full (G_OBJECT (stream), "g-vfs-backend-google-entry", g_object_ref (entry), g_object_unref);

-- 

2.36.1

From fec7d2162966c3574226564b62c6dd252bf4706f Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Mon, 23 Jul 2018 13:39:33 +0200

Subject: [PATCH 02/14] google: Drop the (GDestroyNotify) cast

"warning: function called through a non-compatible type" is printed

by GCC 8 because of (GDestroyNotfiy) cast in g_clear_pointer, see for

more info: https://gitlab.gnome.org/GNOME/glib/issues/1425. Let's

drop the (GDestroyNotify) cast in order to prevent those warnings.

The cast was not needed anyway.

---

 daemon/gvfsbackendgoogle.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index 7bea4bff..2e96cca4 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -2866,8 +2866,8 @@ g_vfs_backend_google_dispose (GObject *_self)

   g_clear_object (&self->service);

   g_clear_object (&self->root);

   g_clear_object (&self->client);

-  g_clear_pointer (&self->entries, (GDestroyNotify) g_hash_table_unref);

-  g_clear_pointer (&self->dir_entries, (GDestroyNotify) g_hash_table_unref);

+  g_clear_pointer (&self->entries, g_hash_table_unref);

+  g_clear_pointer (&self->dir_entries, g_hash_table_unref);

   G_OBJECT_CLASS (g_vfs_backend_google_parent_class)->dispose (_self);

 }

-- 

2.36.1

From 2d5fc426acb1bff385258d860ec97ff30242285d Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Wed, 1 Aug 2018 13:43:16 +0200

Subject: [PATCH 03/14] google: Move debug prints before releasing entry

Debug output contains mess because id and title are const gchar *

and are released together with GDataEntry on previous line. Let's

just swap the lines.

---

 daemon/gvfsbackendgoogle.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index 2e96cca4..e157458b 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -510,13 +510,13 @@ remove_entry (GVfsBackendGoogle *self,

   parent_id = get_parent_id (self, entry);

   k = dir_entries_key_new (id, parent_id);

-  g_hash_table_remove (self->dir_entries, k);

   g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", id, parent_id, entry);

+  g_hash_table_remove (self->dir_entries, k);

   dir_entries_key_free (k);

   k = dir_entries_key_new (title, parent_id);

-  g_hash_table_remove (self->dir_entries, k);

   g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", title, parent_id, entry);

+  g_hash_table_remove (self->dir_entries, k);

   dir_entries_key_free (k);

   for (l = self->dir_collisions; l != NULL; l = l->next)

-- 

2.36.1

From b3f8db69522fdbdc965219e403da6e8e60997907 Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Wed, 1 Aug 2018 13:44:59 +0200

Subject: [PATCH 04/14] google: Remove also dir_collisions entries

dir_collisions are not properly invalidated if removed entry is on this list.

Let's remove the entry also from this list.

---

 daemon/gvfsbackendgoogle.c | 7 +++++++

 1 file changed, 7 insertions(+)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index e157458b..e9eaec1f 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -519,6 +519,13 @@ remove_entry (GVfsBackendGoogle *self,

   g_hash_table_remove (self->dir_entries, k);

   dir_entries_key_free (k);

+  l = g_list_find (self->dir_collisions, entry);

+  if (l != NULL)

+    {

+      self->dir_collisions = g_list_remove_link (self->dir_collisions, l);

+      g_object_unref (entry);

+    }

+

   for (l = self->dir_collisions; l != NULL; l = l->next)

     {

       GDataEntry *colliding_entry = GDATA_ENTRY (l->data);

-- 

2.36.1

From ab007b1f3215a30c3ef49492cf22e6ef1383b0fd Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Tue, 31 Jul 2018 18:43:44 +0200

Subject: [PATCH 05/14] google: Ignore entries without parents

Entries without parents are not shown on the web and there isn't any

reason to list them here. Such entries belongs to some web services

and we have no control over them.

---

 daemon/gvfsbackendgoogle.c | 18 +-----------------

 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index e9eaec1f..897df61f 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -347,14 +347,6 @@ get_parent_id (GVfsBackendGoogle *self,

         }

     }

-  if (ret_val == NULL)

-    {

-      const gchar *root_id;

-

-      root_id = gdata_entry_get_id (self->root);

-      ret_val = g_strdup (root_id);

-    }

-

   g_list_free (links);

   return ret_val;

 }

@@ -903,10 +895,8 @@ build_file_info (GVfsBackendGoogle      *self,

 {

   GFileType file_type;

   GList *authors;

-  GList *links;

   gboolean is_folder = FALSE;

   gboolean is_root = FALSE;

-  gboolean has_parent = FALSE;

   const gchar *etag;

   const gchar *id;

   const gchar *name;

@@ -925,9 +915,6 @@ build_file_info (GVfsBackendGoogle      *self,

   if (entry == self->root)

     is_root = TRUE;

-  links = gdata_entry_look_up_links (entry, GDATA_LINK_PARENT);

-  has_parent = (links != NULL);

-

   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, !is_root);

   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE, is_folder);

@@ -936,9 +923,7 @@ build_file_info (GVfsBackendGoogle      *self,

   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_VOLATILE, is_symlink);

   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE);

-  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, !is_root && has_parent);

-

-  g_file_info_set_is_hidden (info, !has_parent);

+  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, !is_root);

   if (is_folder)

     {

@@ -1091,7 +1076,6 @@ build_file_info (GVfsBackendGoogle      *self,

   g_free (copy_name);

   g_free (escaped_name);

   g_free (content_type);

-  g_list_free (links);

 }

 /* ---------------------------------------------------------------------------------------------------- */

-- 

2.36.1

From 631f794a4a660f49be9d30744e5c66a1f60da4de Mon Sep 17 00:00:00 2001

From: Ondrej Holy <oholy@redhat.com>

Date: Tue, 31 Jul 2018 19:08:39 +0200

Subject: [PATCH 06/14] google: Add support for files with multiple parents

One entry can have multiple parents. You can create such entry on

the web in a pretty simple way, e.g. Ctrl + Drag&Drop. Such entries

are currently shown only on one place in the backend. Also the backend

rely on get_parent_id() and get_entry_path() functions which are tottaly

wrong. Let's introduce get_parent_ids() and resolve entry_path only

from given filename.

---

 daemon/gvfsbackendgoogle.c | 388 ++++++++++++++++---------------------

 1 file changed, 168 insertions(+), 220 deletions(-)

diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c

index 897df61f..7f812448 100644

--- a/daemon/gvfsbackendgoogle.c

+++ b/daemon/gvfsbackendgoogle.c

@@ -99,11 +99,13 @@ typedef struct

   GDataEntry *document;

   GDataUploadStream *stream;

   gchar *filename;

+  gchar *entry_path;

 } WriteHandle;

 static GDataEntry *resolve_dir (GVfsBackendGoogle  *self,

                                 const gchar        *filename,

                                 gchar             **out_basename,

+                                gchar             **out_path,

                                 GError            **error);

 /* ---------------------------------------------------------------------------------------------------- */

@@ -160,7 +162,7 @@ entries_in_folder_equal (gconstpointer a, gconstpointer b)

 /* ---------------------------------------------------------------------------------------------------- */

 static WriteHandle *

-write_handle_new (GDataEntry *document, GDataUploadStream *stream, const gchar *filename)

+write_handle_new (GDataEntry *document, GDataUploadStream *stream, const gchar *filename, const gchar *entry_path)

 {

   WriteHandle *handle;

@@ -177,6 +179,7 @@ write_handle_new (GDataEntry *document, GDataUploadStream *stream, const gchar *

     }

   handle->filename = g_strdup (filename);

+  handle->entry_path = g_strdup (entry_path);

   return handle;

 }

@@ -192,6 +195,7 @@ write_handle_free (gpointer data)

   g_clear_object (&handle->document);

   g_clear_object (&handle->stream);

   g_free (handle->filename);

+  g_free (handle->entry_path);

   g_slice_free (WriteHandle, handle);

 }

@@ -313,13 +317,13 @@ get_content_type_from_entry (GDataEntry *entry)

 /* ---------------------------------------------------------------------------------------------------- */

-static gchar *

-get_parent_id (GVfsBackendGoogle *self,

-               GDataEntry        *entry)

+static GList *

+get_parent_ids (GVfsBackendGoogle *self,

+                GDataEntry        *entry)

 {

   GList *l;

   GList *links = NULL;

-  gchar *ret_val = NULL;

+  GList *ids = NULL;

   links = gdata_entry_look_up_links (entry, GDATA_LINK_PARENT);

   for (l = links; l != NULL; l = l->next)

@@ -341,68 +345,13 @@ get_parent_id (GVfsBackendGoogle *self,

           id = uri + uri_prefix_len;

           if (id[0] != '\0')

             {

-              ret_val = g_strdup (uri + uri_prefix_len);

-              break;

+              ids = g_list_prepend (ids, g_strdup (id));

             }

         }

     }

   g_list_free (links);

-  return ret_val;

-}

-

-static gchar *

-get_entry_path (GVfsBackendGoogle *self, GDataEntry *entry)

-{

-  GString *path = NULL;

-  const gchar *base_id;

-  const gchar *root_id;

-  gchar *id = NULL;

-  gchar *ret_val = NULL;

-

-  if (entry == self->root)

-    {

-      ret_val = g_strdup ("/");

-      goto out;

-    }

-

-  base_id = gdata_entry_get_id (entry);

-  path = g_string_new (base_id);

-  g_string_prepend_c (path, '/');

-

-  id = get_parent_id (self, entry);

-  root_id = gdata_entry_get_id (self->root);

-

-  while (id != NULL)

-    {

-      GDataEntry *parent_entry;

-

-      /* The root folder itself has an ID, so path can become

-       * /root/folder1/folder2/file. Instead, we want it to be

-       * /folder1/folder2/file.

-       */

-

-      if (g_strcmp0 (id, root_id) == 0)

-        break;

-

-      parent_entry = g_hash_table_lookup (self->entries, id);

-      if (parent_entry == NULL)

-        goto out;

-

-      g_string_prepend (path, id);

-      g_string_prepend_c (path, '/');

-

-      g_free (id);

-      id = get_parent_id (self, parent_entry);

-    }

-

-  ret_val = g_strdup (path->str);

-

- out:

-  g_free (id);

-  if (path != NULL)

-    g_string_free (path, TRUE);

-  return ret_val;

+  return ids;

 }

 /* ---------------------------------------------------------------------------------------------------- */

@@ -418,62 +367,66 @@ insert_entry_full (GVfsBackendGoogle *self,

   const gchar *id;

   const gchar *old_id;

   const gchar *title;

-  gchar *parent_id;

+  GList *parent_ids, *l;

   id = gdata_entry_get_id (entry);

   title = gdata_entry_get_title (entry);

   g_hash_table_insert (self->entries, g_strdup (id), g_object_ref (entry));

-  parent_id = get_parent_id (self, entry);

+  parent_ids = get_parent_ids (self, entry);

+  for (l = parent_ids; l != NULL; l = l->next)

+    {

+      gchar *parent_id = l->data;

-  k = dir_entries_key_new (id, parent_id);

-  g_hash_table_insert (self->dir_entries, k, g_object_ref (entry));

-  g_debug ("  insert_entry: Inserted (%s, %s) -> %p\n", id, parent_id, entry);

+      k = dir_entries_key_new (id, parent_id);

+      g_hash_table_insert (self->dir_entries, k, g_object_ref (entry));

+      g_debug ("  insert_entry: Inserted (%s, %s) -> %p\n", id, parent_id, entry);

-  k = dir_entries_key_new (title, parent_id);

-  old_entry = g_hash_table_lookup (self->dir_entries, k);

-  if (old_entry != NULL)

-    {

-      old_id = gdata_entry_get_id (old_entry);

-      if (g_strcmp0 (old_id, title) == 0)

-        {

-          insert_title = FALSE;

-        }

-      else

+      k = dir_entries_key_new (title, parent_id);

+      old_entry = g_hash_table_lookup (self->dir_entries, k);

+      if (old_entry != NULL)

         {

-          /* If the collision is not due to the title matching the ID

-           * of an earlier GDataEntry, then it is due to duplicate

-           * titles.

-           */

-          if (g_strcmp0 (old_id, id) < 0)

-            insert_title = FALSE;

+          old_id = gdata_entry_get_id (old_entry);

+          if (g_strcmp0 (old_id, title) == 0)

+            {

+              insert_title = FALSE;

+            }

+          else

+            {

+              /* If the collision is not due to the title matching the ID

+               * of an earlier GDataEntry, then it is due to duplicate

+               * titles.

+               */

+              if (g_strcmp0 (old_id, id) < 0)

+                insert_title = FALSE;

+            }

         }

-    }

-  if (insert_title)

-    {

-      if (old_entry != NULL && track_dir_collisions)

+      if (insert_title)

         {

-          self->dir_collisions = g_list_prepend (self->dir_collisions, g_object_ref (old_entry));

-          g_debug ("  insert_entry: Ejected (%s, %s, %s) -> %p\n", old_id, title, parent_id, old_entry);

-        }

+          if (old_entry != NULL && track_dir_collisions)

+            {

+              self->dir_collisions = g_list_prepend (self->dir_collisions, g_object_ref (old_entry));

+              g_debug ("  insert_entry: Ejected (%s, %s, %s) -> %p\n", old_id, title, parent_id, old_entry);

+            }

-      g_hash_table_insert (self->dir_entries, k, g_object_ref (entry));

-      g_debug ("  insert_entry: Inserted (%s, %s) -> %p\n", title, parent_id, entry);

-    }

-  else

-    {

-      if (track_dir_collisions)

-        {

-          self->dir_collisions = g_list_prepend (self->dir_collisions, g_object_ref (entry));

-          g_debug ("  insert_entry: Skipped (%s, %s, %s) -> %p\n", id, title, parent_id, entry);

+          g_hash_table_insert (self->dir_entries, k, g_object_ref (entry));

+          g_debug ("  insert_entry: Inserted (%s, %s) -> %p\n", title, parent_id, entry);

         }

+      else

+        {

+          if (track_dir_collisions)

+            {

+              self->dir_collisions = g_list_prepend (self->dir_collisions, g_object_ref (entry));

+              g_debug ("  insert_entry: Skipped (%s, %s, %s) -> %p\n", id, title, parent_id, entry);

+            }

-      dir_entries_key_free (k);

+          dir_entries_key_free (k);

+        }

     }

+  g_list_free_full (parent_ids, g_free);

-  g_free (parent_id);

   return insert_title;

 }

@@ -492,47 +445,50 @@ remove_entry (GVfsBackendGoogle *self,

   GList *l;

   const gchar *id;

   const gchar *title;

-  gchar *parent_id;

+  GList *parent_ids, *ll;

   id = gdata_entry_get_id (entry);

   title = gdata_entry_get_title (entry);

   g_hash_table_remove (self->entries, id);

-  parent_id = get_parent_id (self, entry);

-

-  k = dir_entries_key_new (id, parent_id);

-  g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", id, parent_id, entry);

-  g_hash_table_remove (self->dir_entries, k);

-  dir_entries_key_free (k);

-

-  k = dir_entries_key_new (title, parent_id);

-  g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", title, parent_id, entry);

-  g_hash_table_remove (self->dir_entries, k);

-  dir_entries_key_free (k);

-

-  l = g_list_find (self->dir_collisions, entry);

-  if (l != NULL)

+  parent_ids = get_parent_ids (self, entry);

+  for (ll = parent_ids; ll != NULL; ll = ll->next)

     {

-      self->dir_collisions = g_list_remove_link (self->dir_collisions, l);

-      g_object_unref (entry);

-    }

+      gchar *parent_id = ll->data;

-  for (l = self->dir_collisions; l != NULL; l = l->next)

-    {

-      GDataEntry *colliding_entry = GDATA_ENTRY (l->data);

+      k = dir_entries_key_new (id, parent_id);

+      g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", id, parent_id, entry);

+      g_hash_table_remove (self->dir_entries, k);

+      dir_entries_key_free (k);

+

+      k = dir_entries_key_new (title, parent_id);

+      g_debug ("  remove_entry: Removed (%s, %s) -> %p\n", title, parent_id, entry);

+      g_hash_table_remove (self->dir_entries, k);

+      dir_entries_key_free (k);

-      if (insert_entry_full (self, colliding_entry, FALSE))

+      l = g_list_find (self->dir_collisions, entry);

+      if (l != NULL)

         {

           self->dir_collisions = g_list_remove_link (self->dir_collisions, l);

-          g_debug ("  remove_entry: Restored %p\n", colliding_entry);

-          g_list_free (l);

-          g_object_unref (colliding_entry);

-          break;

+          g_object_unref (entry);

         }

-    }

-  g_free (parent_id);

+      for (l = self->dir_collisions; l != NULL; l = l->next)

+        {

+          GDataEntry *colliding_entry = GDATA_ENTRY (l->data);

+

+          if (insert_entry_full (self, colliding_entry, FALSE))

+            {

+              self->dir_collisions = g_list_remove_link (self->dir_collisions, l);

+              g_debug ("  remove_entry: Restored %p\n", colliding_entry);

+              g_list_free (l);

+              g_object_unref (colliding_entry);

+              break;

+            }

+        }

+    }

+  g_list_free_full (parent_ids, g_free);

 }

 static void

@@ -617,6 +573,7 @@ resolve_child (GVfsBackendGoogle *self,

 static GDataEntry *

 resolve (GVfsBackendGoogle  *self,

          const gchar        *filename,

+         gchar             **out_path,

          GError            **error)

 {

   GDataEntry *parent;

@@ -627,11 +584,15 @@ resolve (GVfsBackendGoogle  *self,

   if (g_strcmp0 (filename, "/") == 0)

     {

       ret_val = self->root;

+

+      if (out_path != NULL)

+        *out_path = g_strdup ("/");

+

       goto out;

     }

   local_error = NULL;

-  parent = resolve_dir (self, filename, &basename, &local_error);

+  parent = resolve_dir (self, filename, &basename, out_path, &local_error);

   if (local_error != NULL)

     {

       g_propagate_error (error, local_error);

@@ -645,6 +606,14 @@ resolve (GVfsBackendGoogle  *self,

       goto out;

     }

+  if (out_path != NULL)

+    {

+      gchar *tmp;

+      tmp = g_build_path ("/", *out_path, gdata_entry_get_id (ret_val), NULL);

+      g_free (*out_path);

+      *out_path = tmp;

+    }

+

  out:

   g_free (basename);

   return ret_val;

@@ -654,6 +623,7 @@ static GDataEntry *

 resolve_dir (GVfsBackendGoogle  *self,

              const gchar        *filename,

              gchar             **out_basename,

+             gchar             **out_path,

              GError            **error)

 {

   GDataEntry *parent;

@@ -666,7 +636,7 @@ resolve_dir (GVfsBackendGoogle  *self,

   parent_path = g_path_get_dirname (filename);

   local_error = NULL;

-  parent = resolve (self, parent_path, &local_error);

+  parent = resolve (self, parent_path, out_path, &local_error);

   if (local_error != NULL)

     {

       g_propagate_error (error, local_error);

@@ -699,12 +669,13 @@ static GDataEntry *

 resolve_and_rebuild (GVfsBackendGoogle  *self,

                      const gchar        *filename,

                      GCancellable       *cancellable,

+                     gchar             **out_path,

                      GError            **error)

 {

   GDataEntry *entry;

   GDataEntry *ret_val = NULL;

-  entry = resolve (self, filename, NULL);

+  entry = resolve (self, filename, out_path, NULL);

   if (entry == NULL)

     {

       GError *local_error;

@@ -718,7 +689,7 @@ resolve_and_rebuild (GVfsBackendGoogle  *self,

         }