[grilo-plugins/rpm: 20/21] Merge commit 'grilo-plugins-0.1.14' into rpm

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit adeb9155a5ef577bdd4c5e83f20b0db64554cb4e
Merge: 36423b3 f6966de
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Wed Apr 13 16:43:08 2011 +0000

    Merge commit 'grilo-plugins-0.1.14' into rpm

 NEWS                                               |   30 ++
 configure.ac                                       |    6 +-
 src/media/apple-trailers/grl-apple-trailers.c      |   16 +-
 src/media/apple-trailers/grl-apple-trailers.xml    |    1 +
 src/media/bookmarks/grl-bookmarks.c                |   15 +-
 src/media/bookmarks/grl-bookmarks.xml              |    1 +
 src/media/filesystem/grl-filesystem.c              |   20 +-
 src/media/filesystem/grl-filesystem.xml            |    1 +
 src/media/flickr/grl-flickr.c                      |    8 +-
 src/media/flickr/grl-flickr.xml                    |    1 +
 src/media/jamendo/grl-jamendo.c                    |   31 +-
 src/media/jamendo/grl-jamendo.xml                  |    1 +
 src/media/podcasts/grl-podcasts.c                  |   18 +-
 src/media/podcasts/grl-podcasts.xml                |    1 +
 src/media/shoutcast/grl-shoutcast.c                |   13 +-
 src/media/shoutcast/grl-shoutcast.xml              |    1 +
 src/media/tracker/Makefile.am                      |    2 +
 src/media/tracker/grl-tracker-media-api.c          |  480 ++++++++++----------
 src/media/tracker/grl-tracker-media-api.h          |    4 +-
 src/media/tracker/grl-tracker-media-notif.c        |   20 +-
 src/media/tracker/grl-tracker-media-priv.h         |    1 -
 src/media/tracker/grl-tracker-media.c              |   39 ++-
 src/media/tracker/grl-tracker-media.h              |    3 +
 src/media/tracker/grl-tracker-metadata.c           |   25 +-
 src/media/tracker/grl-tracker-request-queue.c      |  229 ++++++++++
 src/media/tracker/grl-tracker-request-queue.h      |   83 ++++
 src/media/tracker/grl-tracker-utils.c              |    5 -
 src/media/tracker/grl-tracker.c                    |    4 +
 src/media/tracker/grl-tracker.h                    |    5 +
 src/media/tracker/grl-tracker.xml                  |    1 +
 src/media/upnp/grl-upnp.c                          |   31 +-
 src/media/upnp/grl-upnp.xml                        |    1 +
 src/media/vimeo/grl-vimeo.c                        |    8 +-
 src/media/vimeo/grl-vimeo.xml                      |    1 +
 src/media/youtube/grl-youtube.c                    |   18 +-
 src/media/youtube/grl-youtube.xml                  |    1 +
 src/metadata/fake-metadata/grl-fake-metadata.c     |    5 -
 src/metadata/fake-metadata/grl-fake-metadata.xml   |    1 +
 src/metadata/gravatar/grl-gravatar.c               |    7 +-
 src/metadata/gravatar/grl-gravatar.xml             |    1 +
 src/metadata/lastfm-albumart/grl-lastfm-albumart.c |   56 ++-
 .../lastfm-albumart/grl-lastfm-albumart.xml        |    1 +
 src/metadata/local-metadata/grl-local-metadata.c   |   61 ++-
 src/metadata/local-metadata/grl-local-metadata.xml |    1 +
 src/metadata/metadata-store/grl-metadata-store.c   |   10 +-
 src/metadata/metadata-store/grl-metadata-store.xml |    1 +
 test/main.c                                        |    4 +-
 47 files changed, 823 insertions(+), 450 deletions(-)
---