From 32c8166b2581e112560390fc8a0bc46e510313fd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 2 Dec 2011 17:58:45 -0500
Subject: [PATCH] core: Ensure we clean up leftover directories during merge

(Not sure why this regressed)
---
 src/libotutil/ot-gio-utils.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index ed730e77..cff99445 100644
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -276,6 +276,8 @@ ot_gfile_merge_dirs (GFile    *destination,
   else
     goto out;
 
+  (void) rmdir (ot_gfile_get_path_cached (src));
+
   ret = TRUE;
  out:
   g_clear_object (&src_fileinfo);