[grilo-plugins/0.1.x] tracker: Get rid of older Tracker versions
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins/0.1.x] tracker: Get rid of older Tracker versions
- Date: Thu, 21 Jul 2011 15:18:55 +0000 (UTC)
commit 55f9283dabf411dda0ac2e11d42baa9337268794
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Thu Jul 21 15:09:05 2011 +0000
tracker: Get rid of older Tracker versions
Remove support for tracker < 0.10.5
Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>
configure.ac | 17 +++--------------
src/media/tracker/grl-tracker-media-api.c | 2 --
src/media/tracker/grl-tracker-utils.c | 2 --
3 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f5d988c..fa93013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,20 +132,9 @@ PKG_CHECK_MODULES(GMIME, gmime-2.4, HAVE_GMIME=yes, HAVE_GMIME=no)
PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
HAVE_TRACKER_SPARQL=yes,
- [PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10,
+ [PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10 >= 0.10.5,
HAVE_TRACKER_SPARQL=yes,
- [PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.9,
- HAVE_TRACKER_SPARQL=yes,
- HAVE_TRACKER_SPARQL=no)])])
-
-PKG_CHECK_MODULES(TRACKER_0_10_5,
- tracker-sparql-0.10 >= 0.10.5,
- TRACKER_0_10_5=yes,
- [AC_MSG_WARN([nfo:lastPlayedPosition not defined])])
-
-if test "x$TRACKER_0_10_5" = "xyes"; then
- AC_DEFINE_UNQUOTED([TRACKER_0_10_5], [1], [Tracker >= 0.10.5])
-fi
+ HAVE_TRACKER_SPARQL=no)])
PKG_CHECK_MODULES(GLIB_2_26, glib-2.0 >= 2.26.0,
HAVE_GLIB_2_26=yes,
@@ -679,7 +668,7 @@ AC_ARG_ENABLE(tracker,
case "$enableval" in
yes)
if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
- AC_MSG_ERROR([tracker-sparql-0.9 not found, install it or use --disable-tracker])
+ AC_MSG_ERROR([tracker-sparql-0.10.5 or higher not found, install it or use --disable-tracker])
fi
if test "x$HAVE_GLIB_2_26" = "xno"; then
AC_MSG_ERROR([glib-2.26.0 or above not found, install it or use --disable-tracker])
diff --git a/src/media/tracker/grl-tracker-media-api.c b/src/media/tracker/grl-tracker-media-api.c
index 00293d7..59be6f9 100644
--- a/src/media/tracker/grl-tracker-media-api.c
+++ b/src/media/tracker/grl-tracker-media-api.c
@@ -463,9 +463,7 @@ grl_tracker_media_writable_keys (GrlMetadataSource *source)
if (!keys) {
keys = grl_metadata_key_list_new (GRL_METADATA_KEY_PLAY_COUNT,
GRL_METADATA_KEY_LAST_PLAYED,
-#ifdef TRACKER_0_10_5
GRL_METADATA_KEY_LAST_POSITION,
-#endif
NULL);
}
return keys;
diff --git a/src/media/tracker/grl-tracker-utils.c b/src/media/tracker/grl-tracker-utils.c
index 40ca7ab..9c37c42 100644
--- a/src/media/tracker/grl-tracker-utils.c
+++ b/src/media/tracker/grl-tracker-utils.c
@@ -286,12 +286,10 @@ grl_tracker_setup_key_mappings (void)
"nie:contentAccessed(?urn)",
"media");
-#ifdef TRACKER_0_10_5
insert_key_mapping (GRL_METADATA_KEY_LAST_POSITION,
"nfo:lastPlayedPosition",
"nfo:lastPlayedPosition(?urn)",
"media");
-#endif
if (grl_tracker_upnp_present) {
insert_key_mapping (GRL_METADATA_KEY_THUMBNAIL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]