[patch] Patch to update nautilus's beagle code to the latest libbeagle API

nautilus-2.20-with-beagle-0.3.0.patch (text/plain), 1.93 KB, created by Nirbheek Chauhan (RETIRED) on 2008-03-01 13:22:29 UTC

diff -urN nautilus-2.20.0-orig/configure.in nautilus-2.20.0/configure.in
--- nautilus-2.20.0-orig/configure.in	2008-02-29 19:21:32.000000000 +0530
+++ nautilus-2.20.0/configure.in	2008-02-29 19:21:42.000000000 +0530
@@ -300,7 +300,14 @@
 AC_ARG_ENABLE(beagle, [  --disable-beagle     build without beagle support])
 msg_beagle=no
 if test "x$enable_beagle" != "xno"; then
-	PKG_CHECK_MODULES(BEAGLE, libbeagle-0.0 >= beagle_minver, [
+	BEAGLE_PKGCONFIG=
+	if $PKG_CONFIG --exists libbeagle-1.0; then
+		BEAGLE_PKGCONFIG=libbeagle-1.0
+	else
+		BEAGLE_PKGCONFIG=libbeagle-0.0
+	fi
+
+	PKG_CHECK_MODULES(BEAGLE, $BEAGLE_PKGCONFIG >= beagle_minver, [
 		  	  AM_CONDITIONAL(HAVE_BEAGLE, true)
 			  AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
 			  ]
diff -urN nautilus-2.20.0-orig/libnautilus-private/nautilus-search-engine-beagle.c nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c
--- nautilus-2.20.0-orig/libnautilus-private/nautilus-search-engine-beagle.c	2008-02-29 19:21:32.000000000 +0530
+++ nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c	2008-02-29 19:21:40.000000000 +0530
@@ -176,8 +176,8 @@
 			  "error", G_CALLBACK (beagle_error), engine);
 
 	/* We only want files */
-	beagle_query_add_hit_type (beagle->details->current_query,
-				   "File");
+	beagle_query_add_text (beagle->details->current_query," type:File");
+				   
 	beagle_query_set_max_hits (beagle->details->current_query,
 				   1000);
 	
@@ -187,9 +187,11 @@
 
 	mimetypes = nautilus_query_get_mime_types (beagle->details->query);
 	for (l = mimetypes; l != NULL; l = l->next) {
+		char* temp;
 		mimetype = l->data;
-		beagle_query_add_mime_type (beagle->details->current_query,
-					    mimetype);
+		temp = g_strconcat (" mimetype:", mimetype, NULL);
+		beagle_query_add_text (beagle->details->current_query,temp);
+		g_free (temp);
 	}
 
 	beagle->details->current_query_uri_prefix = nautilus_query_get_location (beagle->details->query);