[gnome-utils] Bugs 649016 & 647072

[Dennis Cranston <dcransto src gnome org>]

commit 7d4bafc09935eea390c9ff74ede23069c75ef158
Author: Dennis Cranston <dennis_cranston yahoo com>
Date:   Mon May 23 22:16:19 2011 -0700

    Bugs 649016 & 647072
    
    Unable to open folders.  Segfault on window close.  Patches contributed by Edward Sheldrake.

 gsearchtool/ChangeLog                              |   12 ++++++++++++
 gsearchtool/gsearchtool-support.c                  |    1 -
 .../libgnomeui-deprecated/gsearchtool-entry.c      |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index 014fc71..6d1c49d 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-23  Dennis Cranston  <dennis_cranston yahoo com>
+
+        * gsearchtool-support.c:
+        Fix bug 649016, unable to open folders.
+        Patch contributed by Edward Sheldrake.
+	
+2011-05-23  Dennis Cranston  <dennis_cranston yahoo com>
+
+        * libgnomeui-deprecated/gsearchtool-entry.c:
+        Fix bug 647072, segfault on window close.
+        Patch contributed by Edward Sheldrake.
+
 2010-10-17  Dennis Cranston  <dennis_cranston yahoo com>
 
         * gsearchtool.c, gsearchtool-callbacks.c,
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c
index 79f7dac..3defd73 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/gsearchtool-support.c
@@ -1212,7 +1212,6 @@ open_file_with_filemanager (GtkWidget * window,
 
 	if (strcmp (g_app_info_get_executable (g_app_info), "nautilus") == 0) {
 		command = g_strconcat ("nautilus ",
-		                       "--sm-disable ",
 		                       "--no-desktop ",
 		                       "--no-default-window ",
 		                       NULL);
diff --git a/gsearchtool/libgnomeui-deprecated/gsearchtool-entry.c b/gsearchtool/libgnomeui-deprecated/gsearchtool-entry.c
index df4bcb3..4b7ed86 100644
--- a/gsearchtool/libgnomeui-deprecated/gsearchtool-entry.c
+++ b/gsearchtool/libgnomeui-deprecated/gsearchtool-entry.c
@@ -117,7 +117,7 @@ gsearch_history_entry_destroy (GtkWidget *object)
 	gsearch_history_entry_set_enable_completion (GSEARCH_HISTORY_ENTRY (object),
 						   FALSE);
 
-	GTK_WIDGET_CLASS (gsearch_history_entry_parent_class)->destroy_event (object, NULL);
+	GTK_WIDGET_CLASS (gsearch_history_entry_parent_class)->destroy (object);
 }
 
 static void