don't try to delete the directory twice; fixes cleaning up after theme

2008-11-27  Jens Granseuer  <jensgr@gmx.net>

	* capplet-util.c: (directory_delete_recursive): don't try to delete
	the directory twice; fixes cleaning up after theme installations, for
	example (bug #562371)

svn path=/trunk/; revision=9151
This commit is contained in:
Jens Granseuer 2008-11-27 19:52:54 +00:00 committed by Jens Granseuer
parent 23b2f39aae
commit 3b04b8642c
2 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2008-11-27 Jens Granseuer <jensgr@gmx.net>
* capplet-util.c: (directory_delete_recursive): don't try to delete
the directory twice; fixes cleaning up after theme installations, for
example (bug #562371)
==================== 2.25.1 ====================
2008-10-26 Jens Granseuer <jensgr@gmx.net>

View file

@ -131,11 +131,10 @@ directory_delete_recursive (GFile *directory, GError **error)
if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
success = directory_delete_recursive (child, error);
} else {
success = g_file_delete (child, NULL, error);
}
g_object_unref (info);
if (success)
success = g_file_delete (child, NULL, error);
}
g_file_enumerator_close (enumerator, NULL, NULL);