gnome-control-center r9152 - branches/gnome-2-24/capplets/common

[jensg svn gnome org]

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

Log:
2008-11-27  Jens Granseuer  <jensgr gmx net>

	Merged from trunk.

	* 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:
   branches/gnome-2-24/capplets/common/ChangeLog
   branches/gnome-2-24/capplets/common/capplet-util.c

Modified: branches/gnome-2-24/capplets/common/capplet-util.c
==============================================================================
--- branches/gnome-2-24/capplets/common/capplet-util.c	(original)
+++ branches/gnome-2-24/capplets/common/capplet-util.c	Thu Nov 27 19:54:40 2008
@@ -76,7 +76,7 @@
 		"user-guide",
 		helpfile, section, &error);
 	if (error != NULL)
-		capplet_error_dialog (parent, 
+		capplet_error_dialog (parent,
 			_("There was an error displaying help: %s"),
 			error);
 }
@@ -120,11 +120,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);