gnome-utils r7386 - trunk/gsearchtool

[dcransto svn gnome org]

Author: dcransto
Date: 2007-02-08 22:37:55 +0000 (Thu, 08 Feb 2007)
New Revision: 7386
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-utils?rev=7386&view=rev

Modified:
   trunk/gsearchtool/ChangeLog
   trunk/gsearchtool/gsearchtool-callbacks.c
   trunk/gsearchtool/gsearchtool-support.c
   trunk/gsearchtool/gsearchtool-support.h
Log:
2007-02-08  Dennis Cranston  <dennis_cranston yahoo com>

	* gsearchtool-callbacks.c: (move_to_trash_cb):
	* gsearchtool-support.c: (make_valid_utf8), (extract_string_until),
	(parse_previous_duplicate_name), (make_next_duplicate_name),
	(get_duplicate_name), (gsearchtool_get_next_duplicate_name):
	* gsearchtool-support.h: Fix bug #404158, do not overwrite files
	in the trash folder.  Use same file renaming logic as nautilus.