Use File.delete_async() rather than File.delete(): Bug #714665
GLib minimum required version is now 2.34.
This commit is contained in:
parent
b5a4feb207
commit
edc83bd5e5
3 changed files with 4 additions and 6 deletions
4
debian/control
vendored
4
debian/control
vendored
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -518,7 +518,7 @@ else ()
|
|||
)
|
||||
endif ()
|
||||
|
||||
set(TARGET_GLIB 2.32)
|
||||
set(TARGET_GLIB 2.34)
|
||||
|
||||
pkg_check_modules(DEPS REQUIRED
|
||||
gthread-2.0
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue