From 96dd87a4f3af61cb4a20dea8632b533b8b59740f Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Sat, 24 May 2014 13:48:45 +1000
Subject: [PATCH] Treat trashed files as deleted.  Fixes #4374

---
 src/internet/googledriveclient.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/internet/googledriveclient.cpp b/src/internet/googledriveclient.cpp
index 1beeecb51..5987e5165 100644
--- a/src/internet/googledriveclient.cpp
+++ b/src/internet/googledriveclient.cpp
@@ -218,13 +218,14 @@ void Client::ListChangesFinished(ListChangesResponse* response,
   QList<QUrl> files_deleted;
   for (const QVariant& v : result["items"].toList()) {
     QVariantMap change = v.toMap();
-    if (!change["deleted"].toBool()) {
-      files << File(change["file"].toMap());
-    } else {
+    if (change["deleted"].toBool() ||
+        change["file"].toMap()["labels"].toMap()["trashed"].toBool()) {
       QUrl url;
       url.setScheme("googledrive");
       url.setPath(change["fileId"].toString());
       files_deleted << url;
+    } else {
+      files << File(change["file"].toMap());
     }
   }