--- nautilus-2.20.0/configure.old 2007-09-18 09:01:42.000000000 +0200 +++ nautilus-2.20.0/configure 2007-12-08 19:51:17.000000000 +0100 @@ -26223,12 +26223,12 @@ pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-0.0 >= 0.0.12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libbeagle-0.0 >= 0.0.12") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= 0.0.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= 0.0.12") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_BEAGLE_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-0.0 >= 0.0.12" 2>/dev/null` + pkg_cv_BEAGLE_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= 0.0.12" 2>/dev/null` else pkg_failed=yes fi @@ -26241,12 +26241,12 @@ pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-0.0 >= 0.0.12\"") >&5 - ($PKG_CONFIG --exists --print-errors "libbeagle-0.0 >= 0.0.12") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= 0.0.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= 0.0.12") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_BEAGLE_LIBS=`$PKG_CONFIG --libs "libbeagle-0.0 >= 0.0.12" 2>/dev/null` + pkg_cv_BEAGLE_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= 0.0.12" 2>/dev/null` else pkg_failed=yes fi @@ -26265,9 +26265,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-0.0 >= 0.0.12"` + BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= 0.0.12"` else - BEAGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-0.0 >= 0.0.12"` + BEAGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= 0.0.12"` fi # Put the nasty error message in config.log where it belongs echo "$BEAGLE_PKG_ERRORS" >&5 --- nautilus-2.20.0/configure.in.old 2007-09-18 08:55:14.000000000 +0200 +++ nautilus-2.20.0/configure.in 2007-12-08 19:50:09.000000000 +0100 @@ -300,7 +300,7 @@ 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, [ + PKG_CHECK_MODULES(BEAGLE, libbeagle-1.0 >= beagle_minver, [ AM_CONDITIONAL(HAVE_BEAGLE, true) AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support]) ] --- nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c.old 2007-04-03 12:08:46.000000000 +0200 +++ nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c 2007-12-08 19:50:09.000000000 +0100 @@ -175,9 +175,6 @@ g_signal_connect (beagle->details->current_query, "error", G_CALLBACK (beagle_error), engine); - /* We only want files */ - beagle_query_add_hit_type (beagle->details->current_query, - "File"); beagle_query_set_max_hits (beagle->details->current_query, 1000); @@ -186,11 +183,6 @@ text); mimetypes = nautilus_query_get_mime_types (beagle->details->query); - for (l = mimetypes; l != NULL; l = l->next) { - mimetype = l->data; - beagle_query_add_mime_type (beagle->details->current_query, - mimetype); - } beagle->details->current_query_uri_prefix = nautilus_query_get_location (beagle->details->query);