From edc83bd5e5f8569c1a2b5567526f68dc7da1e5c2 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Fri, 24 Oct 2014 13:03:46 -0700
Subject: [PATCH] Use File.delete_async() rather than File.delete(): Bug
 #714665

GLib minimum required version is now 2.34.
---
 debian/control                  | 4 ++--
 src/CMakeLists.txt              | 2 +-
 src/engine/util/util-files.vala | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 9383736b..95583785 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jim Nelson <jim@yorba.org>
 Build-Depends: debhelper (>= 8),
  libgee-0.8-dev,
- libglib2.0-dev (>= 2.32.0),
+ libglib2.0-dev (>= 2.34.0),
  libgtk-3-dev (>= 3.10.0),
  libnotify-dev (>=0.7.5),
  libcanberra-dev (>= 0.28),
@@ -29,7 +29,7 @@ Package: geary
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libgee-0.8-2,
- libglib2.0-0 (>= 2.32.0),
+ libglib2.0-0 (>= 2.34.0),
  libgtk-3-0 (>= 3.10.0),
  libnotify4 (>= 0.7.5),
  libcanberra0 (>= 0.28),
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dbae9fee..ccd38fd0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -518,7 +518,7 @@ else ()
     )
 endif ()
 
-set(TARGET_GLIB 2.32)
+set(TARGET_GLIB 2.34)
 
 pkg_check_modules(DEPS REQUIRED
     gthread-2.0
diff --git a/src/engine/util/util-files.vala b/src/engine/util/util-files.vala
index 5ac97acd..5309031b 100644
--- a/src/engine/util/util-files.vala
+++ b/src/engine/util/util-files.vala
@@ -59,9 +59,7 @@ public async void recursive_delete_async(File folder, Cancellable? cancellable =
     
     // Children have been deleted, it's now safe to delete this file/folder.
     try {
-        // TODO: Use File.delete_async() when GLib 2.34 is minimum requirement:
-        // http://redmine.yorba.org/issues/6323
-        folder.delete(cancellable);
+        yield folder.delete_async(Priority.DEFAULT, cancellable);
     } catch (Error e) {
         debug("Error removing file: %s", e.message);
     }