File nautilus-search-tool-code-cleanup.patch of Package nautilus-search-tool

Index: nautilus-search-tool-0.3.0/configure.ac
===================================================================
--- nautilus-search-tool-0.3.0.orig/configure.ac
+++ nautilus-search-tool-0.3.0/configure.ac
@@ -46,7 +46,6 @@ AC_C_CONST
 GETTEXT_PACKAGE=nautilus-search-tool
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
-AC_DEFINE_UNQUOTED(GNOME_EXPLICIT_TRANSLATION_DOMAIN, "$GETTEXT_PACKAGE", [library gettext package])
 ALL_LINGUAS="es fr it sv tr"
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
Index: nautilus-search-tool-0.3.0/src/nautilus-search-tool.c
===================================================================
--- nautilus-search-tool-0.3.0.orig/src/nautilus-search-tool.c
+++ nautilus-search-tool-0.3.0/src/nautilus-search-tool.c
@@ -30,8 +30,7 @@
 #include <libnautilus-extension/nautilus-menu-provider.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -60,6 +59,12 @@ search_tool_callback (NautilusMenuItem *
 			else
 				{
 					working_directory = g_filename_from_uri (uri, NULL, NULL);
+					if (!nautilus_file_info_is_directory (file_info)) {
+						char *tmp;
+						tmp = g_path_get_dirname (working_directory);
+						g_free (working_directory);
+						working_directory = tmp;
+					}
 				}
 		}
 	else
@@ -67,16 +72,13 @@ search_tool_callback (NautilusMenuItem *
 			working_directory = g_strdup (g_get_home_dir ());
 		}
 
-	if (!nautilus_file_info_is_directory (file_info))
-		working_directory = g_path_get_dirname (working_directory);
-
 	g_free (uri);
 
 	argv[0] = gnome_search_tool;
 
 #ifdef GNOME_SEARCH_TOOL_VERSION
 	guint i;
-	gchar *version;
+	gchar *version = NULL;
 
 	gchar **array_version = g_strsplit (GNOME_SEARCH_TOOL_VERSION, " ", -1);
 	guint array_lenght = g_strv_length (array_version);