gnome-control-center r9151 - trunk/capplets/common

[jensg svn gnome org]

Author: jensg
Date: Thu Nov 27 19:52:54 2008
New Revision: 9151
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9151&view=rev

Log:
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)


Modified:
   trunk/capplets/common/ChangeLog
   trunk/capplets/common/capplet-util.c

Modified: trunk/capplets/common/capplet-util.c
==============================================================================
--- trunk/capplets/common/capplet-util.c	(original)
+++ trunk/capplets/common/capplet-util.c	Thu Nov 27 19:52:54 2008
@@ -131,11 +131,10 @@
 
 		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);