nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use File.delete_async() rather than File.delete(): Bug #714665

Browse source 
GLib minimum required version is now 2.34.
This commit is contained in:
Jim Nelson 2014-10-24 13:03:46 -07:00
parent b5a4feb207
commit edc83bd5e5
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/control vendored
View file

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Jim Nelson <jim@yorba.org> Maintainer: Jim Nelson <jim@yorba.org>
Build-Depends: debhelper (>= 8), Build-Depends: debhelper (>= 8),
libgee-0.8-dev, libgee-0.8-dev,
libglib2.0-dev (>= 2.32.0), libglib2.0-dev (>= 2.34.0),
libgtk-3-dev (>= 3.10.0), libgtk-3-dev (>= 3.10.0),
libnotify-dev (>=0.7.5), libnotify-dev (>=0.7.5),
libcanberra-dev (>= 0.28), libcanberra-dev (>= 0.28),
@ -29,7 +29,7 @@ Package: geary
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, Depends: ${shlibs:Depends}, ${misc:Depends},
libgee-0.8-2, libgee-0.8-2,
libglib2.0-0 (>= 2.32.0), libglib2.0-0 (>= 2.34.0),
libgtk-3-0 (>= 3.10.0), libgtk-3-0 (>= 3.10.0),
libnotify4 (>= 0.7.5), libnotify4 (>= 0.7.5),
libcanberra0 (>= 0.28), libcanberra0 (>= 0.28),

2
src/CMakeLists.txt
View file

@ -518,7 +518,7 @@ else ()
) )
endif () endif ()
set(TARGET_GLIB 2.32) set(TARGET_GLIB 2.34)
pkg_check_modules(DEPS REQUIRED pkg_check_modules(DEPS REQUIRED
gthread-2.0 gthread-2.0

4
src/engine/util/util-files.vala
View file

@ -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. // Children have been deleted, it's now safe to delete this file/folder.
try { try {
// TODO: Use File.delete_async() when GLib 2.34 is minimum requirement: yield folder.delete_async(Priority.DEFAULT, cancellable);
// http://redmine.yorba.org/issues/6323
folder.delete(cancellable);
} catch (Error e) { } catch (Error e) {
debug("Error removing file: %s", e.message); debug("Error removing file: %s", e.message);
} }