[gnome-utils/gnome-2-28] [gsearchtool] Bug 595371

[Dennis Cranston <dcransto src gnome org>]

commit 66673dd7dcac676804951fdbbeab6dfda3a3cfa1
Author: Dennis Cranston <dennis_cranston yahoo com>
Date:   Mon Sep 28 22:26:18 2009 -0700

    [gsearchtool] Bug 595371
    
    Fix possible crash after deleting files.

 gsearchtool/ChangeLog               |    6 ++++++
 gsearchtool/gsearchtool-callbacks.c |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index 9984487..f2a28cf 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-28  Dennis Cranston  <dennis_cranston yahoo com>
+
+	*  gsearchtool-callbacks.c:  Fix possible crash after
+	delete files.  Patch submitted by Sebastien Bacher.  
+	Bug 595371.
+	
 2009-08-26  Dennis Cranston  <dennis_cranston yahoo com>
 
 	* gsearchtool-callbacks.c:  Always show application icons
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 47efe0d..1496b8d 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -796,7 +796,7 @@ move_to_trash_cb (GtkAction * action,
 		GtkTreeIter iter;
 		GList * list;
 		GFile * g_file;
-		GError * error;
+		GError * error = NULL;
 		gchar * utf8_basename;
 		gchar * utf8_filename;
 		gchar * locale_filename;
@@ -851,7 +851,7 @@ move_to_trash_cb (GtkAction * action,
 
 			if (response == GTK_RESPONSE_OK) {
 				GFile * g_file_tmp;
-				GError * error_tmp;
+				GError * error_tmp = NULL;
 
 				g_file_tmp = g_file_new_for_path (locale_filename);
 				result = g_file_delete (g_file_tmp, NULL, &error_tmp);