Hi,

Please review and comment if this patch is a good idea or not:
It removes the code for the fallback option of opening folders with
nautilus when xdg-utils is not installed. The consequence is that one
must have xdg-utils installed for this to work.
I don't know nothing about config.in stuff to make the ./configure run
check for xdg-utils presence, so may someone help with that, please...
--- tracker_373/ChangeLog	2007-01-09 17:38:59.000000000 +0200
+++ tracker/ChangeLog	2007-01-09 21:32:57.000000000 +0200
@@ -1,3 +1,8 @@
+2007-01-09  Tshepang Lekhonkhobe <[EMAIL PROTECTED]>
+
+    * t-s-t: Got rid of gnome-open fallback since xdg-open works well.
+    * README: Added a mention that xdg-utils is a required run-time dependency.
+
 2007-01-09  Ignacio Casal Quinteiro  <[EMAIL PROTECTED]>
 
 	* configure.in: Added 'gl' to ALL_LINGUAS.
--- tracker_373/README	2007-01-09 17:38:59.000000000 +0200
+++ tracker/README	2007-01-09 21:26:00.000000000 +0200
@@ -150,7 +150,7 @@
 libgsf
 GTK and Gnome stack for GUI tools
 
-Optional run-time dependency:
+Required run-time dependency:
 
 xdg-utils (provides some functionality needed by tracker-search-tool)
 
--- tracker_373/src/tracker-search-tool/tracker-search-tool-callbacks.c	2007-01-09 17:38:58.000000000 +0200
+++ tracker/src/tracker-search-tool/tracker-search-tool-callbacks.c	2007-01-09 21:10:35.000000000 +0200
@@ -346,7 +346,7 @@
 	                                 GTK_BUTTONS_OK,
 	                                 primary);
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-	                                          _("The nautilus file manager is not running."));
+	                                          _("A file manager was not found. Check if xdg-utils is installed."));
 
 	gtk_window_set_title (GTK_WINDOW (dialog), "");
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -459,9 +459,7 @@
 					if (g_file_test (locale_file, G_FILE_TEST_IS_DIR)) {
 
 						if (open_file_with_xdg_open (gsearch->window, locale_file) == FALSE) {
-							if (open_file_with_nautilus (gsearch->window, locale_file) == FALSE) {
 								display_dialog_could_not_open_folder (gsearch->window, utf8_name);
-							}
 						}
 					}
 					else {
@@ -572,10 +570,8 @@
 		folder_locale = g_filename_from_utf8 (folder_utf8, -1, NULL, NULL, NULL);
 
 		if (open_file_with_xdg_open (gsearch->window, folder_locale) == FALSE) {
-			if (open_file_with_nautilus (gsearch->window, folder_locale) == FALSE) {
 
-				display_dialog_could_not_open_folder (gsearch->window, folder_utf8);
-			}
+			display_dialog_could_not_open_folder (gsearch->window, folder_utf8);
 			g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
 			g_list_free (list);
 			g_free (folder_locale);
--- tracker_373/src/tracker-search-tool/tracker-search-tool-support.c	2007-01-09 17:38:58.000000000 +0200
+++ tracker/src/tracker-search-tool/tracker-search-tool-support.c	2007-01-09 21:22:05.000000000 +0200
@@ -1227,6 +1227,7 @@
 	return result;
 }
 
+/* if open_file_with_xdg_open() is bug-free, the following seem unnecessary
 gboolean
 open_file_with_nautilus (GtkWidget * window,
                          const gchar * file)
@@ -1288,7 +1289,7 @@
 		return FALSE;
 	}
 	return TRUE;
-}
+}*/
 
 gboolean
 open_file_with_application (GtkWidget * window,

--- tracker_373/src/tracker-search-tool/tracker-search-tool-support.h   2007-01-09 17:38:58.000000000 +0200
+++ tracker/src/tracker-search-tool/tracker-search-tool-support.h       2007-01-09 21:10:25.000000000 +0200
@@ -111,9 +111,9 @@
 gboolean
 open_file_with_xdg_open (GtkWidget * window,
                          const gchar * file);
-gboolean
+/*gboolean
 open_file_with_nautilus (GtkWidget * window,
-                         const gchar * file);
+                         const gchar * file);*/
 gboolean
 open_file_with_application (GtkWidget * window,
                             const gchar * file);
_______________________________________________
tracker-list mailing list
tracker-list@gnome.org
http://mail.gnome.org/mailman/listinfo/tracker-list

Reply via email to