diff -Nru grilo-0.2.9/aclocal.m4 grilo-0.2.10/aclocal.m4
--- grilo-0.2.9/aclocal.m4	2014-02-18 14:15:48.000000000 +0000
+++ grilo-0.2.10/aclocal.m4	2014-03-20 09:13:39.000000000 +0000
@@ -1000,7 +1000,8 @@
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff -Nru grilo-0.2.9/bindings/vala/grilo-0.2.vapi grilo-0.2.10/bindings/vala/grilo-0.2.vapi
--- grilo-0.2.9/bindings/vala/grilo-0.2.vapi	2014-02-18 14:16:03.000000000 +0000
+++ grilo-0.2.10/bindings/vala/grilo-0.2.vapi	2014-03-20 09:13:39.000000000 +0000
@@ -130,6 +130,7 @@
 		public unowned string get_region_data (out unowned GLib.DateTime publication_date, string certificate);
 		public unowned string get_region_data_nth (uint index, out unowned GLib.DateTime publication_date, string certificate);
 		public unowned string get_site ();
+		public int get_size ();
 		public unowned string get_source ();
 		public float get_start_time ();
 		public unowned string get_studio ();
@@ -164,6 +165,7 @@
 		public void set_region (string region);
 		public void set_region_data (string region, GLib.DateTime publication_date, string certificate);
 		public void set_site (string site);
+		public void set_size (int size);
 		public void set_source (string source);
 		public void set_studio (string studio);
 		public void set_thumbnail (string thumbnail);
@@ -449,6 +451,7 @@
 		public bool register_source (Grl.Plugin plugin, Grl.Source source) throws GLib.Error;
 		public bool unload_plugin (string plugin_id) throws GLib.Error;
 		public bool unregister_source (Grl.Source source) throws GLib.Error;
+		public virtual signal void metadata_key_added (string p0);
 		public virtual signal void source_added (Grl.Source p0);
 		public virtual signal void source_removed (Grl.Source p0);
 	}
@@ -498,6 +501,7 @@
 		public unowned Grl.Plugin get_plugin ();
 		public int get_rank ();
 		public Grl.MediaType get_supported_media ();
+		public unowned string get_tags ();
 		public virtual bool may_resolve (Grl.Media media, Grl.KeyID key_id, out GLib.List<weak Grl.KeyID> missing_keys);
 		[NoWrapper]
 		public virtual void media_from_uri (Grl.SourceMediaFromUriSpec mfus);
@@ -536,6 +540,9 @@
 		public string source_id { owned get; set construct; }
 		[NoAccessorMethod]
 		public string source_name { owned get; set construct; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] source_tags { owned get; set construct; }
 		[NoAccessorMethod]
 		public Grl.MediaType supported_media { get; set construct; }
 		public virtual signal void content_changed (GLib.PtrArray p0, Grl.SourceChangeType p1, bool p2);
diff -Nru grilo-0.2.9/ChangeLog grilo-0.2.10/ChangeLog
--- grilo-0.2.9/ChangeLog	2014-02-18 14:17:02.000000000 +0000
+++ grilo-0.2.10/ChangeLog	2014-03-20 09:13:39.000000000 +0000
@@ -1,3 +1,367 @@
+commit d88e91c9abc801266f3a5a06b3d9689307f6d9ba
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Wed Mar 19 12:04:31 2014 +0000
+
+    Release 0.2.10
+
+ NEWS                 | 29 +++++++++++++++++++++++++++++
+ configure.ac         |  6 +++---
+ src/data/grl-media.c |  4 ++++
+ src/grl-registry.c   |  2 ++
+ 4 files changed, 38 insertions(+), 3 deletions(-)
+
+commit b88a996231a70334f08bef1153d9cf88ab54f48e
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Tue Mar 18 18:08:34 2014 +0100
+
+    pls: Set file size attribute
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=629002
+
+ libs/pls/grl-pls.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 09d9b0a88286a5bf29414187ebcf636474d83c75
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Mon Mar 3 00:03:14 2014 +0000
+
+    core: Add metadata key for size
+    
+    Add GRL_METADATA_KEY_SIZE, and proper functions, that get/set the size in media
+    size in bytes.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=629002
+
+ doc/grilo/grilo-sections.txt |  2 ++
+ src/data/grl-media.c         | 28 ++++++++++++++++++++++++++++
+ src/data/grl-media.h         |  4 ++++
+ src/grl-metadata-key.c       | 13 +++++++++++++
+ src/grl-metadata-key.h       |  1 +
+ 5 files changed, 48 insertions(+)
+
+commit 21e6fb514884251d5dfb042b56b78e687d05d5a0
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Mar 14 14:01:39 2014 +0100
+
+    core: Add guards for public API
+    
+    Add guards for all the grl_data_* public API functions.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=726340
+
+ src/data/grl-data.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 73 insertions(+), 6 deletions(-)
+
+commit 1d806abd6310e013035eb98347df700d93b11dd6
+Author: Ryan Lortie <desrt@desrt.ca>
+Date:   Wed Mar 12 15:35:03 2014 -0400
+
+    configure: don't hardcode lib64
+    
+    If the user wants libraries installed in a directory called lib64 then
+    they will specify this via the --libdir option.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=726197
+
+ configure.ac | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+commit 8f82675b221a15287e12546bb2fc8cc08f67c618
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 21:54:21 2014 +0000
+
+    core: Rename variable
+
+ src/grl-source.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 90253afd0e30bc1e33a69c6cc6c89b28461dd04c
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 21:52:18 2014 +0000
+
+    doc: Update grl-inspect man page
+    
+    Add documentation about inspecting metadata keys.
+
+ grl-inspect.1 | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+commit 4ce8e5056180a54c027e88b4c7ed9b11038aa029
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 19:32:02 2014 +0000
+
+    test-ui: Show new registered metadata keys.
+
+ tools/grilo-test-ui/main.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+commit f2a3ad3cadffb35833dd8ab00280aaa62b0c2110
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 19:31:21 2014 +0000
+
+    core: Add "metadata-key-added" signal
+    
+    This signal is emitted when a source registers a new custom metadata key.
+
+ src/grl-registry.c | 36 ++++++++++++++++++++++++++++++++----
+ 1 file changed, 32 insertions(+), 4 deletions(-)
+
+commit 2c331dfe66e79459ca85a8fd8c888edbb9e30c45
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 17:29:44 2014 +0000
+
+    core: Pull plugin leak
+
+ src/grl-registry.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1c3bd7f7d76f13c43f7d66d2836adac6f88cabd0
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 16:11:33 2014 +0000
+
+    core: Use a hashtable to store metadatakeys
+    
+    Do not use a GParamSpecPool for it, as this class does not have a way to free
+    it.
+    
+    Instead, use a GHashTable.
+
+ src/grl-metadata-key.c  | 908 ++++++++++++++++++++++++------------------------
+ src/grl-registry-priv.h |   8 +-
+ src/grl-registry.c      | 106 +++---
+ 3 files changed, 517 insertions(+), 505 deletions(-)
+
+commit 90aa982ee7a75da374424064d3ffe5552e3e3435
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 00:36:49 2014 +0000
+
+    core: Free tags
+
+ src/grl-source.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 0c3913e2a01f8949c380dc3c5eb86c73020410d8
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 9 00:03:32 2014 +0000
+
+    core: configurations are stored in a list
+    
+    When freeing the list of configurations, do not unref directly because they are
+    inside a list. Use g_list_free_full() to do the job.
+
+ src/grl-registry.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit 806a8598c34d5b408eeebd3b699d50a03bd5c105
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Thu Mar 6 17:28:08 2014 +0000
+
+    core: Use g_clear_pointer/object when possible
+    
+    Reduces the number of lines and makes the code more readable.
+
+ configure.ac               |  2 +-
+ libs/net/grl-net-mock.c    | 37 ++++++++-------------------
+ libs/net/grl-net-wc.c      | 10 +++-----
+ libs/pls/grl-pls.c         | 32 ++++++-----------------
+ src/grl-caps.c             |  8 ++----
+ src/grl-plugin.c           |  9 +++----
+ src/grl-range-value.c      |  9 ++-----
+ src/grl-registry.c         | 31 ++++++-----------------
+ src/grl-source.c           | 13 +++-------
+ tools/grilo-test-ui/main.c | 63 ++++++++++++----------------------------------
+ 10 files changed, 58 insertions(+), 156 deletions(-)
+
+commit 0d380b7e10b84740a54ec108df61fc4c62b43e0f
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Feb 28 21:22:32 2014 +0100
+
+    core: Add names to all the timeouts and idles
+    
+    For debugging purposes.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=725419
+
+ libs/net/grl-net-wc.c |   1 +
+ libs/pls/grl-pls.c    |   5 +-
+ src/grl-multiple.c    |   8 ++-
+ src/grl-source.c      | 151 ++++++++++++++++++++++++++++++--------------------
+ 4 files changed, 101 insertions(+), 64 deletions(-)
+
+commit 5520b4e219d9a9e1dd66aefcd27b2bda2d040a8e
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Sun Mar 2 01:24:03 2014 +0000
+
+    core: Free registry resources before unreffing it
+    
+    We can't unref the registry to finalize all the sources and plugins, because
+    they can try to access the registry again in their finalize method.
+    
+    This commit first finalizes the sources, plugins, and other resources, and at
+    the end it unrefs the registry.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724660
+
+ src/grilo.c             |   2 +-
+ src/grl-registry-priv.h |   2 +
+ src/grl-registry.c      | 141 ++++++++++++++++++++++++------------------------
+ 3 files changed, 72 insertions(+), 73 deletions(-)
+
+commit 30823a258d7340436bf0c6f79f77cc2947d9086c
+Author: Marcus Lundblad <ml@update.uu.se>
+Date:   Fri Feb 28 21:17:16 2014 +0000
+
+    Added Swedish translation
+
+ po/LINGUAS |   1 +
+ po/sv.po   | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 193 insertions(+)
+
+commit f6b7305afcf1264f90e51004ea0eda95d4413089
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Fri Feb 28 00:23:35 2014 +0000
+
+    build: Detect Vala presence
+    
+    Build vala bindings if vala is present.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724648
+
+ configure.ac | 51 +++++++++++++++++++++++++++++++--------------------
+ 1 file changed, 31 insertions(+), 20 deletions(-)
+
+commit 171211cfc75d241b0208308c198f0495e80f3f80
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Feb 21 12:25:28 2014 +0100
+
+    core: Add documentation for source-tags
+    
+    Explain usage and commonly used tags.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724019
+
+ src/grl-source.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+commit 636ac50f093c11afbc68a0158fe8baaab363085b
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Tue Feb 25 14:37:13 2014 +0100
+
+    core: Fix gtk-doc for source-tags
+    
+    They were referred to as "tags" in some places, and "source-tags"
+    in others.
+
+ src/grl-source.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 790f3508d5f805577f4d9187ab5bf6e89262d4b5
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Sun Feb 23 19:02:02 2014 +0100
+
+    pls: Fix build with grilo never installed
+    
+    This re-applies the fix from:
+    https://git.gnome.org/browse/grilo/commit/?id=3f66bb29a2d0f81479a435c1fabc80c08c4961be
+    
+    Which got broken by the wrong de-duplicating done in
+    5f88b535800d1105439641795ddd2e07fd113744
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724871
+
+ libs/pls/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit bd2a3875e3460e8a93ba30a9c7841650669a8c3f
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Feb 21 12:30:26 2014 +0100
+
+    core: Fix API documentation typo
+    
+    ../../src/data/grl-data.c:389: warning: Parameter description
+    for grl_data_get_boolean::key is missing in source code comment block.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724871
+
+ src/data/grl-data.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 5f88b535800d1105439641795ddd2e07fd113744
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Feb 21 12:24:59 2014 +0100
+
+    pls: Fix redefinition of compiler args
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724871
+
+ libs/pls/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 71def91bc93da36d1abf7332e899b5fd88dd1cf1
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Fri Feb 21 00:35:42 2014 +0100
+
+    travis: Update package dependencies
+
+ .travis.yml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 0defc30bd6e432cfb04c8956fef13d035d9c2178
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Mon Feb 10 12:39:44 2014 +0100
+
+    test-ui: Show "source-tags" property
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724019
+
+ tools/grilo-test-ui/main.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+commit 5fd88084afe8a7469fc65abe1eff3b0a7ac5488f
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Mon Feb 10 12:37:40 2014 +0100
+
+    core: Add "source-tags" property
+    
+    So that more information can be conveyed about the source's content
+    to the front-end applications, such as:
+    - the genre of the media (tv, cinema, radio, music, etc.)
+    - the countries the media is relevant to
+    - whether the media served is from the same machine, or from
+      the local network
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724019
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ src/grl-source.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/grl-source.h |  2 ++
+ 2 files changed, 60 insertions(+), 1 deletion(-)
+
+commit 4f68bcff087ad0a073a86fbbeaec88a1dae2d4f3
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Tue Feb 18 16:46:21 2014 +0100
+
+    test-ui: Fix crasher on exit
+    
+    The test UI was crashing because we left closing through the
+    "Close" button destroy the window, which left all the pointers
+    dangling.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=724658
+
+ tools/grilo-test-ui/main.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+commit 4e38032dc0bdc62d868ebdb8c2d08983b5865760
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Tue Feb 18 14:18:14 2014 +0000
+
+    Post-release version bump to 0.2.10
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit c3add1a606383bd0e583d48cf85ad5c714ff1639
 Author: Juan A. Suarez Romero <jasuarez@igalia.com>
 Date:   Tue Feb 18 14:15:33 2014 +0000
diff -Nru grilo-0.2.9/configure grilo-0.2.10/configure
--- grilo-0.2.9/configure	2014-02-18 14:15:49.000000000 +0000
+++ grilo-0.2.10/configure	2014-03-20 09:13:39.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for grilo 0.2.9.
+# Generated by GNU Autoconf 2.69 for grilo 0.2.10.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='grilo'
 PACKAGE_TARNAME='grilo'
-PACKAGE_VERSION='0.2.9'
-PACKAGE_STRING='grilo 0.2.9'
+PACKAGE_VERSION='0.2.10'
+PACKAGE_STRING='grilo 0.2.10'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core'
 PACKAGE_URL='https://wiki.gnome.org/Projects/Grilo'
 
@@ -1455,7 +1455,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures grilo 0.2.9 to adapt to many kinds of systems.
+\`configure' configures grilo 0.2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1525,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grilo 0.2.9:";;
+     short | recursive ) echo "Configuration of grilo 0.2.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1555,7 +1555,7 @@
   --enable-grl-pls        Enable Grilo Pls library (default: auto)
   --enable-debug include debug symbols
   --enable-tests          build unit tests
-  --enable-vala           Enable Vala plugin support
+  --enable-vala           Enable Vala plugin support (default: auto)
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
@@ -1672,7 +1672,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grilo configure 0.2.9
+grilo configure 0.2.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1950,7 +1950,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by grilo $as_me 0.2.9, which was
+It was created by grilo $as_me 0.2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2814,7 +2814,7 @@
 
 # Define the identity of the package.
  PACKAGE='grilo'
- VERSION='0.2.9'
+ VERSION='0.2.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2910,6 +2910,7 @@
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -11777,9 +11778,9 @@
 # Libtool library version, not to confuse with API version
 # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
 
-GRL_LT_VERSION=6:1:5
-GRLNET_LT_VERSION=1:6:1
-GRLPLS_LT_VERSION=0:1:0
+GRL_LT_VERSION=7:0:6
+GRLNET_LT_VERSION=1:7:1
+GRLPLS_LT_VERSION=0:2:0
 
 
 
@@ -11985,17 +11986,6 @@
    exec_prefix="${prefix}"
 fi
 
-if test "${libdir}" = '${exec_prefix}/lib'; then
-   case `uname -m` in
-        x86_64|ppc64|powerpc64)
-                libdir='${exec_prefix}/lib64'
-        ;;
-        *)
-                libdir='${exec_prefix}/lib'
-        ;;
-esac
-fi
-
 # Plugins directory
 
 GRL_PLUGINS_DIR=`eval echo ${libdir}/${GRL_NAME}`
@@ -12139,12 +12129,12 @@
     pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 \\
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.34 \\
 			gobject-2.0 \\
 			gmodule-2.0 \\
 			gio-2.0 \\
 			libxml-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 \
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12152,7 +12142,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32 \
+  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12168,12 +12158,12 @@
     pkg_cv_DEPS_LIBS="$DEPS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 \\
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.34 \\
 			gobject-2.0 \\
 			gmodule-2.0 \\
 			gio-2.0 \\
 			libxml-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 \
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12181,7 +12171,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32 \
+  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12206,13 +12196,13 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32 \
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
 			libxml-2.0" 2>&1`
         else
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32 \
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12221,7 +12211,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$DEPS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.32 \
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -12719,19 +12709,7 @@
 # VALA BINDINGS
 # ----------------------------------------------------------
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Vala plugin support is requested" >&5
-$as_echo_n "checking whether Vala plugin support is requested... " >&6; }
-# Check whether --enable-vala was given.
-if test "${enable_vala+set}" = set; then :
-  enableval=$enable_vala; enable_vala=$enableval have_vala=$enableval
-else
-  enable_vala=autodetect have_vala=yes
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vala" >&5
-$as_echo "$enable_vala" >&6; }
-if test "x$enable_vala" != "xno"; then
-                # Extract the first word of "valac", so it can be a program name with args.
+# Extract the first word of "valac", so it can be a program name with args.
 set dummy valac; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -12771,11 +12749,7 @@
 fi
 
 
-                if test "x$VALAC" = "x"; then
-                        as_fn_error $? "No Vala compiler found." "$LINENO" 5
-                fi
-
-                # Extract the first word of "vala-gen-introspect", so it can be a program name with args.
+# Extract the first word of "vala-gen-introspect", so it can be a program name with args.
 set dummy vala-gen-introspect; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -12815,11 +12789,7 @@
 fi
 
 
-                if test "x$VALA_GEN_INTROSPECT" = "x"; then
-                        as_fn_error $? "Cannot find \"vala-gen-introspect\" in your PATH" "$LINENO" 5
-                fi
-
-                # Extract the first word of "vapigen", so it can be a program name with args.
+# Extract the first word of "vapigen", so it can be a program name with args.
 set dummy vapigen; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -12859,11 +12829,39 @@
 fi
 
 
-                if test "x$VAPIGEN" = "x"; then
-                        as_fn_error $? "Cannot fine \"vapigen\" in your PATH" "$LINENO" 5
+
+# Check whether --enable-vala was given.
+if test "${enable_vala+set}" = set; then :
+  enableval=$enable_vala;
+                case "$enableval" in
+                     yes)
+                        if test "x$VALAC" = "x"; then
+                           as_fn_error $? "valac not found, install it or use --disable-vala" "$LINENO" 5
+                        fi
+                        if test "x$VALA_GEN_INTROSPECT" = "x"; then
+                           as_fn_error $? "vala-gen-introspect not found, install it or use --disable-vala" "$LINENO" 5
+                        fi
+                        if test "x$VAPIGEN" = "x"; then
+                           as_fn_error $? "vapigen not found, install it or use --disable-vala" "$LINENO" 5
+                        fi
+                        ;;
+                     no)
+                        enable_vala=no
+                        ;;
+                esac
+
+else
+
+                if test "x$VALAC" != "x" -a "x$VALA_GEN_INTROSPECT" != "x" -a "x$VAPIGEN" != "x"; then
+                   enable_vala=yes
+                else
+                   enable_vala=no
                 fi
+
 fi
- if test "x$enable_vala" != "xno"; then
+
+
+ if test "x$enable_vala" = "xyes"; then
   HAVE_VALA_TRUE=
   HAVE_VALA_FALSE='#'
 else
@@ -14554,7 +14552,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by grilo $as_me 0.2.9, which was
+This file was extended by grilo $as_me 0.2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14621,7 +14619,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-grilo config.status 0.2.9
+grilo config.status 0.2.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru grilo-0.2.9/configure.ac grilo-0.2.10/configure.ac
--- grilo-0.2.9/configure.ac	2014-02-18 14:11:02.000000000 +0000
+++ grilo-0.2.10/configure.ac	2014-03-20 09:13:39.000000000 +0000
@@ -9,7 +9,7 @@
 m4_define([prj_gir_name], [Grilo])
 m4_define([grl_major_version], [0])
 m4_define([grl_minor_version], [2])
-m4_define([grl_micro_version], [9])
+m4_define([grl_micro_version], [10])
 m4_define([prj_version], grl_major_version.grl_minor_version.grl_micro_version)
 
 AC_INIT([prj_name],
@@ -57,9 +57,9 @@
 # Libtool library version, not to confuse with API version
 # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
 
-GRL_LT_VERSION=6:1:5
-GRLNET_LT_VERSION=1:6:1
-GRLPLS_LT_VERSION=0:1:0
+GRL_LT_VERSION=7:0:6
+GRLNET_LT_VERSION=1:7:1
+GRLPLS_LT_VERSION=0:2:0
 
 AC_SUBST([GRL_LT_VERSION])
 AC_SUBST([GRLNET_LT_VERSION])
@@ -102,17 +102,6 @@
    exec_prefix="${prefix}"
 fi
 
-if test "${libdir}" = '${exec_prefix}/lib'; then
-   case `uname -m` in
-        x86_64|ppc64|powerpc64)
-                libdir='${exec_prefix}/lib64'
-        ;;
-        *)
-                libdir='${exec_prefix}/lib'
-        ;;
-esac
-fi
-
 # Plugins directory
 
 GRL_PLUGINS_DIR=`eval echo ${libdir}/${GRL_NAME}`
@@ -123,7 +112,7 @@
 # DEPENDENCIES
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES(DEPS, glib-2.0 >= 2.32 \
+PKG_CHECK_MODULES(DEPS, glib-2.0 >= 2.34 \
 			gobject-2.0 \
 			gmodule-2.0 \
 			gio-2.0 \
@@ -252,29 +241,40 @@
 # VALA BINDINGS
 # ----------------------------------------------------------
 
-AC_MSG_CHECKING([whether Vala plugin support is requested])
-AC_ARG_ENABLE([vala],
-        AS_HELP_STRING([--enable-vala],[Enable Vala plugin support]),
-        [enable_vala=$enableval have_vala=$enableval],
-        [enable_vala=autodetect have_vala=yes])
-AC_MSG_RESULT([$enable_vala])
-if test "x$enable_vala" != "xno"; then
-                AC_PATH_PROG([VALAC], [valac])
-                if test "x$VALAC" = "x"; then
-                        AC_MSG_ERROR([No Vala compiler found.])
-                fi
+AC_PATH_PROG([VALAC], [valac])
+AC_PATH_PROG([VALA_GEN_INTROSPECT], [vala-gen-introspect])
+AC_PATH_PROG([VAPIGEN], [vapigen])
 
-                AC_PATH_PROG([VALA_GEN_INTROSPECT], [vala-gen-introspect])
-                if test "x$VALA_GEN_INTROSPECT" = "x"; then
-                        AC_MSG_ERROR([Cannot find "vala-gen-introspect" in your PATH])
+AC_ARG_ENABLE([vala],
+        AS_HELP_STRING([--enable-vala],
+                [Enable Vala plugin support (default: auto)]),
+        [
+                case "$enableval" in
+                     yes)
+                        if test "x$VALAC" = "x"; then
+                           AC_MSG_ERROR([valac not found, install it or use --disable-vala])
+                        fi
+                        if test "x$VALA_GEN_INTROSPECT" = "x"; then
+                           AC_MSG_ERROR([vala-gen-introspect not found, install it or use --disable-vala])
+                        fi
+                        if test "x$VAPIGEN" = "x"; then
+                           AC_MSG_ERROR([vapigen not found, install it or use --disable-vala])
+                        fi
+                        ;;
+                     no)
+                        enable_vala=no
+                        ;;
+                esac
+        ],
+        [
+                if test "x$VALAC" != "x" -a "x$VALA_GEN_INTROSPECT" != "x" -a "x$VAPIGEN" != "x"; then
+                   enable_vala=yes
+                else
+                   enable_vala=no
                 fi
+        ])
 
-                AC_PATH_PROG([VAPIGEN], [vapigen])
-                if test "x$VAPIGEN" = "x"; then
-                        AC_MSG_ERROR([Cannot fine "vapigen" in your PATH])
-                fi
-fi
-AM_CONDITIONAL(HAVE_VALA, test "x$enable_vala" != "xno")
+AM_CONDITIONAL([HAVE_VALA], [test "x$enable_vala" = "xyes"])
 
 # ----------------------------------------------------------
 # GTK-DOC
diff -Nru grilo-0.2.9/debian/changelog grilo-0.2.10/debian/changelog
--- grilo-0.2.9/debian/changelog	2014-02-19 21:40:44.000000000 +0000
+++ grilo-0.2.10/debian/changelog	2014-03-20 10:14:07.000000000 +0000
@@ -1,307 +1,193 @@
-grilo (0.2.9-1~saucy1) saucy; urgency=low
+grilo (0.2.10-1~saucy1) saucy; urgency=medium
 
-  * New release
+  * Backport from Debian Experimental
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 19 Feb 2014 22:32:03 +0100
+ -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 20 Mar 2014 11:00:26 +0100
 
-grilo (0.2.8-2) unstable; urgency=low
+grilo (0.2.10-1) unstable; urgency=medium
 
-  * Synchronize with Debian
+  * New upstream release.
+  * debian/control: update build dependency on libglib2.0-dev to 2.34.
+  * debian/libgrilo-0.2-1.symbols: update.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 17 Feb 2014 23:12:08 +0100
+ -- Alberto Garcia <berto@igalia.com>  Wed, 19 Mar 2014 16:12:33 +0200
 
-grilo (0.2.8-1) unstable; urgency=low
+grilo (0.2.9-1) unstable; urgency=medium
 
-  * New release
+  * New upstream release.
+  * Drop drop-libvala.patch, this is already integrated in this release.
+  * debian/rules: disable Automake's silent rules.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 10 Feb 2014 23:54:29 +0100
+ -- Alberto Garcia <berto@igalia.com>  Tue, 18 Feb 2014 23:27:55 +0200
 
-grilo (0.2.7-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Tue, 17 Sep 2013 21:29:30 +0200
-
-grilo (0.2.6-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 16 May 2013 20:52:11 +0200
-
-grilo (0.2.5-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Tue, 19 Mar 2013 13:29:26 +0100
-
-grilo (0.2.4-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 30 Nov 2012 18:23:50 +0100
-
-grilo (0.2.3-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 08 Nov 2012 17:24:03 +0100
-
-grilo (0.2.2-3) unstable; urgency=low
-
-  * Add missing copyright file
-  * Install into multiarch libdir
-  * Add package for debugging symbols
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 05 Oct 2012 13:34:45 +0000
-
-grilo (0.2.2-2) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 05 Oct 2012 00:45:37 +0200
-
-grilo (0.2.1-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 03 Oct 2012 13:27:30 +0200
+grilo (0.2.8-1) unstable; urgency=medium
 
-grilo (0.2.0-2) unstable; urgency=low
+  * New upstream release (Closes: #739025, #739028).
+  * debian/control:
+    - Update Standards-Version to 3.9.5 (no changes).
+    - Bump build dependency on libglib2.0-dev to 2.32.
+    - Add build dependency on libtotem-plparser-dev.
+    - Build depend on the generic valac package, there's no need for any
+      specific version of Vala.
+  * Don't require libvala, it's not used by Grilo at all.
+    - debian/patches/drop-libvala.patch: remove check in configure.ac
+    - debian/control: remove build dependency.
+  * debian/libgrilo-0.2-1.symbols: update.
+  * debian/copyright: update copyright years.
 
-  * Debianizing system synced from Debian upstream.
+ -- Alberto Garcia <berto@igalia.com>  Sat, 15 Feb 2014 18:06:20 +0200
 
- -- Andrés Gómez García <agomez@igalia.com>  Tue, 04 Sep 2012 14:39:22 +0300
-
-grilo-0.2 (0.2.0-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 13 Aug 2012 13:28:31 +0200
-
-grilo-0.1 (0.1.20-1) unstable; urgency=low
-
-  * New release
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 10 Aug 2012 18:00:09 +0200
-
-grilo-0.1 (0.1.19-1) unstable; urgency=low
-
-  * Fixes in the Test UI
-  * Improvements in Grilo Net library
-  * Added support for Vala 0.16 and 0.18
-  * Improvements in the build system
-
-  * Several fixes, including: BGO#662748 - tracker plugin: support
-    multiple resources in a larger file, BGO#665938 - Do not dist
-    gir_DATA, BGO#672923 - Make it possible to override the user-agent
-    in GrlNetWc
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 24 May 2012 10:21:36 +0200
-
-grilo-0.1 (0.1.18-1) unstable; urgency=low
-
-  * Added support for Windows building
-  * Several fixes, including BGO#662762 - critical when HTTP request
-    fails, BGO#662763 - Bad unref in grl-net
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 09 Dec 2011 14:01:09 +0100
-
-grilo-0.1 (0.1.17-1) unstable; urgency=low
-
-  * Minor improvements in documentation
-  * Well-manage end of search/browse in splitted sources
-  * Minor fixes in build system
-  * Install XML files in the same place as libraries
-  * Restrict loading of a subset of plugins
-  * Added support for Vala 0.14
-  * Fixed some bugs, including, BGO#657549 - add
-    GRL_METADATA_KEY_TRACK_NUMBER, BGO#657920 - Add Grilo
-    documentation
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 05 Sep 2011 11:31:50 +0000
-
-grilo-0.1 (0.1.16-1) unstable; urgency=low
-
-  * Several fixes
-  * Minor improvements in build system
-  * Make Test UI compliant with Gtk+ 3.0
-  * Test UI no more long needs GConf
-  * Lots of updates in documentation
-  * Added manpage for grl-inspect tool
-  * Added new API to handle operation cancellation
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 01 Aug 2011 09:10:07 +0200
-
-grilo-0.1 (0.1.15-1) unstable; urgency=low
-
-  * Several fixes
-  * Updated documentation
-  * Updated grl-inspect tool
-
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 20 Apr 2011 16:05:37 +0200
-
-grilo-0.1 (0.1.14-1) unstable; urgency=low
+grilo (0.2.7-1) unstable; urgency=low
 
-  * Several fixes, including: BGO#628898 - Grilo could do with a function to
-    load a plugin by ID, BGO#644383 - [feature-request] Metadata request are not
-    cancellable
-  * Re-worked "content-changed" signal: several elements can be sent in just one
-    signal
-  * Operations in GrlMetadataSource are now cancellable too
+  * New upstream release.
+  * Update my e-mail address in debian/*.
+  * Remove libsoup.patch, it's no longer relevant for this release.
+  * debian/libgrilo-0.2-1.symbols: update.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 13 Apr 2011 15:49:34 +0000
+ -- Alberto Garcia <berto@igalia.com>  Wed, 18 Sep 2013 01:18:10 +0300
 
-grilo-0.1 (0.1.13-1) unstable; urgency=low
+grilo (0.2.6-2) unstable; urgency=low
 
-  * Do not store keys without values in GrlData
-  * Deprecated grl_data_key_is_known()
-  * Deprecated GrlData "overwrite" property
-  * Renamed grl_data_get_single_related_keys()
-  * Some fixes, including: BGO#645525 - CPU load and grilo requests
+  * libsoup.patch: fix FTBFS with libsoup < 2.42.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 06 Apr 2011 17:51:20 +0200
+ -- Alberto Garcia <agarcia@igalia.com>  Wed, 29 May 2013 16:53:43 +0200
 
-grilo-0.1 (0.1.12-1) unstable; urgency=low
+grilo (0.2.6-1) unstable; urgency=low
 
-  * Several fixes and improvements, including fixes for: BGO#645542 -
-    grl_metadata_source_set_metadata() broken
-  * Added support for caching in GrlNet
-  * Added new metadata keys suited for camera pictures
-  * Improved GObject Introspection support
+  * New upstream release.
+  * Upload to unstable.
+  * debian/libgrilo-0.2-1.symbols: add symbols file.
+    - debian/rules: remove the dh_makeshlibs override.
+  * debian/control:
+    - Set build dependency on Vala to 0.20 (Closes: #709692).
+    - Build depend on libglib >= 2.29.10.
+    - Downgrade grilo plugins from recommended to suggested. Just because
+      a program supports Grilo does not mean that it has a strong dependency
+      on its plugins.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Wed, 30 Mar 2011 20:28:57 +0200
+ -- Alberto Garcia <agarcia@igalia.com>  Wed, 29 May 2013 02:28:34 +0200
 
-grilo-0.1 (0.1.11-1) unstable; urgency=low
+grilo (0.2.5-2) experimental; urgency=low
 
-  * Fixed a segmentation fault
-  * Added new keys
+  [ Jonny Lamb ]
+  * Add libgrilo-0.2-1-dbg debug package (Closes: #704511).
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 17 Mar 2011 22:53:00 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Tue, 02 Apr 2013 17:30:41 +0300
 
-grilo-0.1 (0.1.10-1) unstable; urgency=low
+grilo (0.2.5-1) experimental; urgency=low
 
-  * Several fixes
-  * Deprecated grl_metadata_source_key_depends() in benefit of grl_metadata_source_may_resolve()
-  * Rewritten full resolution mode to handle correctly metadata sources
-  * Added support for multi-valued keys.
+  * New upstream release.
+  * debian/control: update Standards-Version to 3.9.4 (no changes).
+  * debian/copyright: update copyright years.
+  * Build with dh-autoreconf to ensure that the autotools helper files are
+    being regenerated (this fixes lintian outdated-autotools-helper-file).
+    - debian/rules: pass '--with autoreconf' to dh.
+    - debian/control: add build dependency on dh-autoreconf.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 04 Mar 2011 16:49:00 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Wed, 20 Mar 2013 11:04:26 +0200
 
-grilo-0.1 (0.1.9-1) unstable; urgency=low
+grilo (0.2.4-1) experimental; urgency=low
 
-  * Several fixes
-  * Added support for content-changed notifications
-  * Added support for NULL-text search (aka search all)
-  * Added support for cancelled operations notification
-  * Added support for binary data in GrlConfig and GrlData
-  * Added new configuration key: api-key-blob
-  * Added new metadata key: thumbnail-binary
+  * New upstream release.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 10 Feb 2011 18:41:15 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Sat, 01 Dec 2012 13:22:37 +0200
 
-grilo-0.1 (0.1.8-1) unstable; urgency=low
+grilo (0.2.3-1) experimental; urgency=low
 
-  * Several fixes
-  * Improved documentation
-  * Reworked GrlConfig
-  * Added new types and functions in GrlConfig
-  * Added padded for public structures
-  * Added sync version of grl_media_source_get_media_from_uri()
+  * New upstream version.
+  * debian/rules: new API, bump package version in dh_makeshlibs.
+  * debian/rules: configure with --disable-debug, otherwise it's enabled
+    by default.
+  * Drop all lintian-overrides files, there are no longer hardening
+    warnings.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 27 Jan 2011 20:07:56 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Mon, 12 Nov 2012 18:12:56 +0200
 
-grilo-0.1 (0.1.7-2) unstable; urgency=low
+grilo (0.2.2-1) experimental; urgency=low
 
-  * Fix configure.ac
+  * New upstream release, first in the 0.2 series in Debian.
+  * debian/*: rename everything from *grilo-0.1* to *grilo-0.2*.
+  * debian/control: make libgrilo-0.2-doc conflict with libgrilo-0.1-doc,
+    they can't be installed at the same time.
+  * debian/control: remove the DM-Upload-Allowed field, it's now obsolete.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Sat, 22 Jan 2011 00:36:35 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Fri, 12 Oct 2012 16:42:22 +0300
 
-grilo-0.1 (0.1.7-1) unstable; urgency=low
+grilo (0.1.20-1) experimental; urgency=low
 
-  * Several fixes, including fixes for bugs #627864, #628506, #629369,
-    #630493, #635394.
-  * Added Grilo Net Web Client (GrlNetWc)
-  * Implemented grl_multiple_get_media_from_site(): build a GrlMedia
-    from given a site url
-  * Implemented grl_plugin_registry_add_config_from_file(): load
-    plugin configuration from a file
-  * Added a GError parameter to GrlPluginRegistry functions that can fail
-  * Added new GrlCoreError
-  * Log system revamp
-  * Improved documentation
-  * Improved gobject introspection annotations
-  * Improved Vala bindings
-  * Using functions instead of definitions in grl-media-plugin
-  * Updated tests infrastructure
-  * Added new python tests using gobject introspection
+  * New upstream release.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 21 Jan 2011 22:03:07 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Fri, 17 Aug 2012 10:09:18 +0300
 
-grilo-0.1 (0.1.6-1) unstable; urgency=low
+grilo (0.1.19-1) unstable; urgency=low
 
-  * Several fixes, including fixes for GB#620143, GB#62047 and GB#627207
-  * Use SILENCE mode when building
-  * Added (un)serialization API to GrlMedia
-  * New metadata key system based on GParamSpec
-  * Added API to get all available keys
-  * Added API to initialize Grilo
-  * Added API to search in several plugins at the same time
-  * Added API with utility functions
-  * Added command-line options
-  * Use XML to define plugins
-  * Added new keys: external-url, external-player, studio, certificate and license
-  * grl_media_source_metadata() is cancelable
-  * Handle flickr authorization in test-ui
-  * Added synchronous functions for the asynchronous partners
-  * Added grl-inspect utility
-  * Renamed grl_plugin_registry_get_instance() to grl_plugin_registry_get_default()
-  * Improved Vala bindings
-  * Improved GObject introspection support
+  * New upstream release.
+  * Build using Vala 0.16:
+    - debian/control: update build dependencies.
+    - debian/rules: install Vala API files in /usr/share/vala/vapi.
+    - debian/libgrilo-0.1-dev.install: update path of Vala API files.
+  * Create a new libgrilo-0.1-bin package and move grl-inspect-0.1 there.
+    - debian/rules: rename manpage to match the binary name.
+  * Drop libgrilo-0.1-0.shlibs and use dh_makeshlibs to generate a shlibs
+    file.
+  * Multi-arch support:
+    - debian/compat: set compatibility level to 9.
+    - debian/control: build depend on debhelper >= 9.
+    - debian/control: Add Multi-Arch and Pre-Depends fields to
+      libgrilo-0.1-0.
+    - debian/libgrilo-0.1-{0,dev}.install: replace usr/lib/ with
+      usr/lib/*/.
+    - bump shlibs to 0.1.19 and break grilo-plugins-0.1 << 0.1.19.
+  * libgrilo-0.1-{0,bin}.lintian-overrides: ignore the
+    hardening-no-stackprotector warning, Grilo does not use character
+    arrays on the stack.
+  * debian/copyright: update copyright years and add section for Debian
+    files.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Thu, 26 Aug 2010 18:58:30 +0200
+ -- Alberto Garcia <agarcia@igalia.com>  Thu, 24 May 2012 18:05:32 +0200
 
-grilo-0.1 (0.1.5-1) unstable; urgency=low
+grilo (0.1.18-2) unstable; urgency=low
 
-  * General fixes
-  * Added initial support for testing
-  * Added new documentation: ovewview, quick start, examples, ...
-  * Updated Vala bindings
-  * Changed GrlConfig: now keys are strings instead of GrlKeyID
-  * Improved build system
-  * Added Vimeo plugin in Test UI
+  * debian/control: build using Vala 0.14 (Closes: #663307).
+  * debian/libgrilo-0.1-dev.install: update path of Vala API files.
+  * debian/control: update Standards-Version to 3.9.3.
+  * debian/control: change section of gir1.2-grilo-0.1 to 'introspection'.
+  * debian/copyright: update debian copyright format URL.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 07 May 2010 15:44:11 +0200
+ -- Alberto Garcia <agarcia@igalia.com>  Sat, 10 Mar 2012 16:19:10 +0200
 
-grilo-0.1 (0.1.4-1) unstable; urgency=low
+grilo (0.1.18-1) unstable; urgency=low
 
-  * Improved code and documentation
-  * New API to configure plugins and sources
-  * New API to modify content in sources
-  * New keys: play-count, last-played, last-position
-  * Introspection support in build system
-  * Refactored content classes
-  * Renamed sources_by_capabilities() to sources_by_operations()
+  * New upstream release.
+  * debian/watch: scan for .xz files, upstream no longer uses bz2.
+  * debian/copyright: rewrite using the machine-readable format.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 12 Mar 2010 17:31:51 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Sat, 10 Dec 2011 15:14:51 +0200
 
-grilo-0.1 (0.1.3-1) unstable; urgency=low
+grilo (0.1.17-1) unstable; urgency=low
 
-  * Added ranks to plugins
-  * Added functions to search sources by capabilities
-  * Gtk-doc for GrlMediaPlugin and GrlMetadataSource
+  * New upstream release.
+  * debian/libgrilo-0.1-0.shlibs: new API, bump shlibs to 0.1.17.
+  * debian/libgrilo-0.1-doc.doc-base.grilo-libs: the grilo-libs manual
+    doesn't exist anymore since it has been merged into the main one.
+  * debian/libgrilo-0.1-doc.links: ditto.
+  * debian/control: this release breaks grilo-plugins-0.1 << 0.1.17 since
+    now plugin XML files are located in a different place.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Mon, 01 Mar 2010 11:13:35 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Mon, 05 Sep 2011 23:25:51 +0300
 
-grilo-0.1 (0.1.2-1) unstable; urgency=low
+grilo (0.1.16-1) unstable; urgency=low
 
-  * Improved Vala bindings
-  * Fixed some bugs
-  * Started initial support for gtk-doc
+  * New upstream release.
+  * debian/{grl-inspect.1,libgrilo-0.1-0.manpages,libgrilo-0.1-0.install}:
+    use manpage shipped by upstream.
+  * debian/libgrilo-0.1-0.shlibs: new API, bump shlibs to 0.1.16.
+  * debian/copyright: Author(s) => Authors.
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Fri, 19 Feb 2010 21:12:23 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Sat, 02 Jul 2011 13:48:46 +0300
 
-grilo-0.1 (0.1.1-1) unstable; urgency=low
+grilo (0.1.15-1) unstable; urgency=low
 
-  * Initial release.
+  * Initial release (Closes: #573737, #629396).
 
- -- Juan A. Suarez Romero <jasuarez@igalia.com>  Tue, 09 Feb 2010 21:11:05 +0100
+ -- Alberto Garcia <agarcia@igalia.com>  Thu, 16 Jun 2011 12:26:33 +0300
diff -Nru grilo-0.2.9/debian/control grilo-0.2.10/debian/control
--- grilo-0.2.9/debian/control	2014-02-19 21:31:38.000000000 +0000
+++ grilo-0.2.10/debian/control	2014-03-20 10:06:43.000000000 +0000
@@ -1,22 +1,21 @@
 Source: grilo
 Section: libs
 Priority: optional
-Maintainer: Juan A. Suarez Romero <jasuarez@igalia.com>
+Maintainer: Alberto Garcia <berto@igalia.com>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               libglib2.0-dev (>= 2.34),
+               libxml2-dev,
+               libsoup2.4-dev,
+               libtotem-plparser-dev,
                gobject-introspection,
-               gtk-doc-tools,
                libgirepository1.0-dev,
-               libglib2.0-dev (>= 2.32),
-               liboauth-dev,
-               libsoup2.4-dev (>= 2.33.4),
-               libtotem-plparser-dev (>= 3.4.1),
-               libxml2-dev,
-               valac (>= 0.7.2)
+               valac,
+               gtk-doc-tools
 Standards-Version: 3.9.5
 Homepage: http://live.gnome.org/Grilo
 
-Package: libgrilo-0.2-0
+Package: libgrilo-0.2-1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -42,7 +41,7 @@
 Package: libgrilo-0.2-dev
 Section: libdevel
 Architecture: any
-Depends: libgrilo-0.2-0 (= ${binary:Version}),
+Depends: libgrilo-0.2-1 (= ${binary:Version}),
          gir1.2-grilo-0.2 (= ${binary:Version}),
          libxml2-dev,
          libglib2.0-dev,
@@ -91,6 +90,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: devhelp
+Conflicts: libgrilo-0.1-doc
 Description: Framework for discovering and browsing media - Documentation
  Grilo is a framework focused on making media discovery and browsing
  easy for application developers.
@@ -107,13 +107,13 @@
  .
  This package contains the documentation.
 
-Package: libgrilo-0.2-0-dbg
+Package: libgrilo-0.2-1-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libgrilo-0.2-0 (= ${binary:Version}),
+Depends: libgrilo-0.2-1 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: grilo-plugins-0.2-dbg
 Description: Framework for discovering and browsing media - debugging symbols
diff -Nru grilo-0.2.9/debian/copyright grilo-0.2.10/debian/copyright
--- grilo-0.2.9/debian/copyright	2014-02-10 23:41:11.000000000 +0000
+++ grilo-0.2.10/debian/copyright	2014-03-20 10:06:43.000000000 +0000
@@ -3,48 +3,11 @@
 Source: http://ftp.gnome.org/pub/GNOME/sources/grilo/
 
 Files: *
-Copyright: 2010-2012 Igalia, S.L.
-License: LGPL-2.1+
-
-Files:
- libs/net/grl-net-soup-stable.c
- libs/net/grl-net-soup-unstable.c
- libs/net/grl-net-wc.c
- libs/net/grl-net-wc.h
-Copyright:
- 2010-2012 Igalia, S.L.
- 2012 Canonical Ltd
-License: LGPL-2.1+
-
-Files:
- src/data/grl-config.c
- src/data/grl-config.h
- src/grl-registry.c
- src/grl-sync.c
- tools/grilo-test-ui/main.c
-Copyright:
- 2011 Intel Corporation
- 2010-2012 Igalia, S.L.
-License: LGPL-2.1+
-
-Files: src/grl-log-priv.h
-Copyright: 2010 Intel Corporation
-License: LGPL-2.1+
-
-Files: src/grl-log.h
-Copyright: 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
-License: LGPL-2.1+
-
-Files: tests/registry.c
-Copyright: 2010 Stefan Kost <ensonic@users.sf.net>
-License: LGPL-2.1+
-
-Files: tests/metadata_source.c
-Copyright: 2010 Víctor M. Jáquez Leal <vjaquez@igalia.com>
+Copyright: 2010-2014 Igalia, S.L.
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2011-2012 Alberto Garcia <agarcia@igalia.com>
+Copyright: 2011-2014 Alberto Garcia <berto@igalia.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-0.docs grilo-0.2.10/debian/libgrilo-0.2-0.docs
--- grilo-0.2.9/debian/libgrilo-0.2-0.docs	2014-02-10 23:41:11.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-0.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-0.install grilo-0.2.10/debian/libgrilo-0.2-0.install
--- grilo-0.2.9/debian/libgrilo-0.2-0.install	2014-02-17 21:46:57.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-0.symbols grilo-0.2.10/debian/libgrilo-0.2-0.symbols
--- grilo-0.2.9/debian/libgrilo-0.2-0.symbols	2014-02-17 22:21:39.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-0.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,446 +0,0 @@
-libgrilo-0.2.so.1 libgrilo-0.2-0 #MINVER#
- GRL_LOG_DOMAIN_DEFAULT@Base 0.2.2
- (optional)_grl_log_free_core_domains@Base 0.2.2
- (optional)_grl_log_init_core_domains@Base 0.2.2
- (optional)config_log_domain@Base 0.2.2
- (optional)data_log_domain@Base 0.2.2
- grl_caps_get_key_filter@Base 0.2.2
- grl_caps_get_key_range_filter@Base 0.2.2
- grl_caps_get_type@Base 0.2.2
- grl_caps_get_type_filter@Base 0.2.2
- grl_caps_is_key_filter@Base 0.2.2
- grl_caps_is_key_range_filter@Base 0.2.2
- grl_caps_new@Base 0.2.2
- grl_caps_set_key_filter@Base 0.2.2
- grl_caps_set_key_range_filter@Base 0.2.2
- grl_caps_set_type_filter@Base 0.2.2
- grl_caps_test_option@Base 0.2.2
- grl_config_get_api_key@Base 0.2.2
- grl_config_get_api_key_blob@Base 0.2.2
- grl_config_get_api_secret@Base 0.2.2
- grl_config_get_api_token@Base 0.2.2
- grl_config_get_api_token_secret@Base 0.2.6
- grl_config_get_binary@Base 0.2.2
- grl_config_get_boolean@Base 0.2.2
- grl_config_get_float@Base 0.2.2
- grl_config_get_int@Base 0.2.2
- grl_config_get_password@Base 0.2.2
- grl_config_get_plugin@Base 0.2.2
- grl_config_get_source@Base 0.2.2
- grl_config_get_string@Base 0.2.2
- grl_config_get_type@Base 0.2.2
- grl_config_get_username@Base 0.2.2
- grl_config_has_param@Base 0.2.2
- grl_config_new@Base 0.2.2
- grl_config_set@Base 0.2.2
- grl_config_set_api_key@Base 0.2.2
- grl_config_set_api_key_blob@Base 0.2.2
- grl_config_set_api_secret@Base 0.2.2
- grl_config_set_api_token@Base 0.2.2
- grl_config_set_api_token_secret@Base 0.2.6
- grl_config_set_binary@Base 0.2.2
- grl_config_set_boolean@Base 0.2.2
- grl_config_set_float@Base 0.2.2
- grl_config_set_int@Base 0.2.2
- grl_config_set_password@Base 0.2.2
- grl_config_set_plugin@Base 0.2.2
- grl_config_set_source@Base 0.2.2
- grl_config_set_string@Base 0.2.2
- grl_config_set_username@Base 0.2.2
- grl_data_add_binary@Base 0.2.2
- grl_data_add_boxed@Base 0.2.2
- grl_data_add_float@Base 0.2.2
- grl_data_add_int@Base 0.2.2
- grl_data_add_related_keys@Base 0.2.2
- grl_data_add_string@Base 0.2.2
- grl_data_dup@Base 0.2.2
- grl_data_get@Base 0.2.2
- grl_data_get_binary@Base 0.2.2
- grl_data_get_boolean@Base 0.2.3
- grl_data_get_boxed@Base 0.2.2
- grl_data_get_float@Base 0.2.2
- grl_data_get_int@Base 0.2.2
- grl_data_get_keys@Base 0.2.2
- grl_data_get_related_keys@Base 0.2.2
- grl_data_get_single_values_for_key@Base 0.2.2
- grl_data_get_single_values_for_key_string@Base 0.2.2
- grl_data_get_string@Base 0.2.2
- grl_data_get_type@Base 0.2.2
- grl_data_has_key@Base 0.2.2
- grl_data_length@Base 0.2.2
- grl_data_new@Base 0.2.2
- grl_data_remove@Base 0.2.2
- grl_data_remove_nth@Base 0.2.2
- grl_data_set@Base 0.2.2
- grl_data_set_binary@Base 0.2.2
- grl_data_set_boolean@Base 0.2.3
- grl_data_set_boxed@Base 0.2.2
- grl_data_set_float@Base 0.2.2
- grl_data_set_int@Base 0.2.2
- grl_data_set_related_keys@Base 0.2.2
- grl_data_set_string@Base 0.2.2
- grl_date_time_from_iso8601@Base 0.2.2
- grl_deinit@Base 0.2.8
- grl_g_value_dup@Base 0.2.2
- grl_g_value_free@Base 0.2.2
- grl_g_value_hashtable_new@Base 0.2.2
- grl_g_value_hashtable_new_direct@Base 0.2.2
- grl_g_value_new@Base 0.2.2
- grl_init@Base 0.2.2
- grl_init_get_option_group@Base 0.2.2
- grl_list_from_va@Base 0.2.2
- grl_log@Base 0.2.2
- grl_log_configure@Base 0.2.2
- grl_log_domain_free@Base 0.2.2
- grl_log_domain_new@Base 0.2.2
- grl_marshal_VOID__BOXED_ENUM_BOOLEAN@Base 0.2.2
- grl_media_add_author@Base 0.2.2
- grl_media_add_external_player@Base 0.2.2
- grl_media_add_external_url@Base 0.2.2
- grl_media_add_keyword@Base 0.2.3
- grl_media_add_region_data@Base 0.2.3
- grl_media_add_thumbnail@Base 0.2.2
- grl_media_add_thumbnail_binary@Base 0.2.2
- grl_media_add_url_data@Base 0.2.2
- grl_media_audio_add_artist@Base 0.2.2
- grl_media_audio_add_genre@Base 0.2.2
- grl_media_audio_add_lyrics@Base 0.2.2
- grl_media_audio_add_url_data@Base 0.2.2
- grl_media_audio_get_album@Base 0.2.2
- grl_media_audio_get_artist@Base 0.2.2
- grl_media_audio_get_artist_nth@Base 0.2.2
- grl_media_audio_get_bitrate@Base 0.2.2
- grl_media_audio_get_genre@Base 0.2.2
- grl_media_audio_get_genre_nth@Base 0.2.2
- grl_media_audio_get_lyrics@Base 0.2.2
- grl_media_audio_get_lyrics_nth@Base 0.2.2
- grl_media_audio_get_track_number@Base 0.2.2
- grl_media_audio_get_type@Base 0.2.2
- grl_media_audio_get_url_data@Base 0.2.2
- grl_media_audio_get_url_data_nth@Base 0.2.2
- grl_media_audio_new@Base 0.2.2
- grl_media_audio_set_album@Base 0.2.2
- grl_media_audio_set_artist@Base 0.2.2
- grl_media_audio_set_bitrate@Base 0.2.2
- grl_media_audio_set_genre@Base 0.2.2
- grl_media_audio_set_lyrics@Base 0.2.2
- grl_media_audio_set_track_number@Base 0.2.2
- grl_media_audio_set_url_data@Base 0.2.2
- grl_media_box_get_childcount@Base 0.2.2
- grl_media_box_get_type@Base 0.2.2
- grl_media_box_new@Base 0.2.2
- grl_media_box_set_childcount@Base 0.2.2
- grl_media_get_author@Base 0.2.2
- grl_media_get_author_nth@Base 0.2.2
- grl_media_get_certificate@Base 0.2.2
- grl_media_get_creation_date@Base 0.2.2
- grl_media_get_description@Base 0.2.2
- grl_media_get_duration@Base 0.2.2
- grl_media_get_external_url@Base 0.2.2
- grl_media_get_external_url_nth@Base 0.2.2
- grl_media_get_favourite@Base 0.2.3
- grl_media_get_id@Base 0.2.2
- grl_media_get_keyword@Base 0.2.3
- grl_media_get_keyword_nth@Base 0.2.3
- grl_media_get_last_played@Base 0.2.2
- grl_media_get_last_position@Base 0.2.2
- grl_media_get_license@Base 0.2.2
- grl_media_get_mime@Base 0.2.2
- grl_media_get_modification_date@Base 0.2.2
- grl_media_get_play_count@Base 0.2.2
- grl_media_get_player@Base 0.2.2
- grl_media_get_player_nth@Base 0.2.2
- grl_media_get_publication_date@Base 0.2.2
- grl_media_get_rating@Base 0.2.2
- grl_media_get_region@Base 0.2.3
- grl_media_get_region_data@Base 0.2.3
- grl_media_get_region_data_nth@Base 0.2.3
- grl_media_get_site@Base 0.2.2
- grl_media_get_source@Base 0.2.2
- grl_media_get_start_time@Base 0.2.2
- grl_media_get_studio@Base 0.2.2
- grl_media_get_thumbnail@Base 0.2.2
- grl_media_get_thumbnail_binary@Base 0.2.2
- grl_media_get_thumbnail_binary_nth@Base 0.2.2
- grl_media_get_thumbnail_nth@Base 0.2.2
- grl_media_get_title@Base 0.2.2
- grl_media_get_type@Base 0.2.2
- grl_media_get_url@Base 0.2.2
- grl_media_get_url_data@Base 0.2.2
- grl_media_get_url_data_nth@Base 0.2.2
- grl_media_image_add_url_data@Base 0.2.2
- grl_media_image_get_camera_model@Base 0.2.2
- grl_media_image_get_exposure_time@Base 0.2.2
- grl_media_image_get_flash_used@Base 0.2.2
- grl_media_image_get_height@Base 0.2.2
- grl_media_image_get_iso_speed@Base 0.2.2
- grl_media_image_get_orientation@Base 0.2.2
- grl_media_image_get_type@Base 0.2.2
- grl_media_image_get_url_data@Base 0.2.2
- grl_media_image_get_url_data_nth@Base 0.2.2
- grl_media_image_get_width@Base 0.2.2
- grl_media_image_new@Base 0.2.2
- grl_media_image_set_camera_model@Base 0.2.2
- grl_media_image_set_exposure_time@Base 0.2.2
- grl_media_image_set_flash_used@Base 0.2.2
- grl_media_image_set_height@Base 0.2.2
- grl_media_image_set_iso_speed@Base 0.2.2
- grl_media_image_set_orientation@Base 0.2.2
- grl_media_image_set_size@Base 0.2.2
- grl_media_image_set_url_data@Base 0.2.2
- grl_media_image_set_width@Base 0.2.2
- grl_media_new@Base 0.2.2
- grl_media_serialize@Base 0.2.2
- grl_media_serialize_extended@Base 0.2.2
- grl_media_serialize_type_get_type@Base 0.2.3
- grl_media_set_author@Base 0.2.2
- grl_media_set_certificate@Base 0.2.2
- grl_media_set_creation_date@Base 0.2.2
- grl_media_set_description@Base 0.2.2
- grl_media_set_duration@Base 0.2.2
- grl_media_set_external_player@Base 0.2.2
- grl_media_set_external_url@Base 0.2.2
- grl_media_set_favourite@Base 0.2.3
- grl_media_set_id@Base 0.2.2
- grl_media_set_keyword@Base 0.2.3
- grl_media_set_last_played@Base 0.2.2
- grl_media_set_last_position@Base 0.2.2
- grl_media_set_license@Base 0.2.2
- grl_media_set_mime@Base 0.2.2
- grl_media_set_modification_date@Base 0.2.2
- grl_media_set_play_count@Base 0.2.2
- grl_media_set_publication_date@Base 0.2.2
- grl_media_set_rating@Base 0.2.2
- grl_media_set_region@Base 0.2.3
- grl_media_set_region_data@Base 0.2.3
- grl_media_set_site@Base 0.2.2
- grl_media_set_source@Base 0.2.2
- grl_media_set_studio@Base 0.2.2
- grl_media_set_thumbnail@Base 0.2.2
- grl_media_set_thumbnail_binary@Base 0.2.2
- grl_media_set_title@Base 0.2.2
- grl_media_set_url@Base 0.2.2
- grl_media_set_url_data@Base 0.2.2
- grl_media_type_get_type@Base 0.2.3
- grl_media_unserialize@Base 0.2.2
- grl_media_video_add_director@Base 0.2.3
- grl_media_video_add_performer@Base 0.2.3
- grl_media_video_add_producer@Base 0.2.3
- grl_media_video_add_url_data@Base 0.2.2
- grl_media_video_get_director@Base 0.2.3
- grl_media_video_get_director_nth@Base 0.2.3
- grl_media_video_get_episode@Base 0.2.2
- grl_media_video_get_framerate@Base 0.2.2
- grl_media_video_get_height@Base 0.2.2
- grl_media_video_get_original_title@Base 0.2.3
- grl_media_video_get_performer@Base 0.2.3
- grl_media_video_get_performer_nth@Base 0.2.3
- grl_media_video_get_producer@Base 0.2.3
- grl_media_video_get_producer_nth@Base 0.2.3
- grl_media_video_get_season@Base 0.2.2
- grl_media_video_get_show@Base 0.2.2
- grl_media_video_get_type@Base 0.2.2
- grl_media_video_get_url_data@Base 0.2.2
- grl_media_video_get_url_data_nth@Base 0.2.2
- grl_media_video_get_width@Base 0.2.2
- grl_media_video_new@Base 0.2.2
- grl_media_video_set_director@Base 0.2.3
- grl_media_video_set_episode@Base 0.2.2
- grl_media_video_set_framerate@Base 0.2.2
- grl_media_video_set_height@Base 0.2.2
- grl_media_video_set_original_title@Base 0.2.3
- grl_media_video_set_performer@Base 0.2.3
- grl_media_video_set_producer@Base 0.2.3
- grl_media_video_set_season@Base 0.2.2
- grl_media_video_set_show@Base 0.2.2
- grl_media_video_set_size@Base 0.2.2
- grl_media_video_set_url_data@Base 0.2.2
- grl_media_video_set_width@Base 0.2.2
- grl_metadata_key_get_desc@Base 0.2.2
- grl_metadata_key_get_name@Base 0.2.2
- grl_metadata_key_get_type@Base 0.2.2
- grl_metadata_key_list_new@Base 0.2.2
- grl_metadata_key_setup_system_keys@Base 0.2.2
- grl_multiple_get_media_from_uri@Base 0.2.2
- grl_multiple_search@Base 0.2.2
- grl_multiple_search_sync@Base 0.2.2
- grl_operation_cancel@Base 0.2.2
- grl_operation_generate_id@Base 0.2.2
- grl_operation_get_data@Base 0.2.2
- grl_operation_get_private_data@Base 0.2.2
- grl_operation_init@Base 0.2.2
- grl_operation_options_copy@Base 0.2.2
- grl_operation_options_get_count@Base 0.2.2
- grl_operation_options_get_flags@Base 0.2.2
- grl_operation_options_get_key_filter@Base 0.2.2
- grl_operation_options_get_key_filter_list@Base 0.2.2
- grl_operation_options_get_key_range_filter@Base 0.2.2
- grl_operation_options_get_key_range_filter_list@Base 0.2.2
- grl_operation_options_get_skip@Base 0.2.2
- grl_operation_options_get_type@Base 0.2.2
- grl_operation_options_get_type_filter@Base 0.2.2
- grl_operation_options_key_is_set@Base 0.2.2
- grl_operation_options_new@Base 0.2.2
- grl_operation_options_obey_caps@Base 0.2.2
- grl_operation_options_set_count@Base 0.2.2
- grl_operation_options_set_flags@Base 0.2.2
- grl_operation_options_set_key_filter_dictionary@Base 0.2.2
- grl_operation_options_set_key_filter_value@Base 0.2.2
- grl_operation_options_set_key_filters@Base 0.2.2
- grl_operation_options_set_key_range_filter@Base 0.2.2
- grl_operation_options_set_key_range_filter_value@Base 0.2.2
- grl_operation_options_set_skip@Base 0.2.2
- grl_operation_options_set_type_filter@Base 0.2.2
- grl_operation_remove@Base 0.2.2
- grl_operation_set_data@Base 0.2.2
- grl_operation_set_data_full@Base 0.2.7
- grl_operation_set_private_data@Base 0.2.2
- grl_paging_translate@Base 0.2.2
- grl_plugin_get_author@Base 0.2.2
- grl_plugin_get_description@Base 0.2.2
- grl_plugin_get_filename@Base 0.2.2
- grl_plugin_get_id@Base 0.2.2
- grl_plugin_get_info@Base 0.2.2
- grl_plugin_get_info_keys@Base 0.2.2
- grl_plugin_get_license@Base 0.2.2
- grl_plugin_get_module@Base 0.2.2
- grl_plugin_get_name@Base 0.2.2
- grl_plugin_get_site@Base 0.2.2
- grl_plugin_get_sources@Base 0.2.2
- grl_plugin_get_type@Base 0.2.2
- grl_plugin_get_version@Base 0.2.2
- grl_plugin_load@Base 0.2.2
- grl_plugin_set_filename@Base 0.2.2
- grl_plugin_set_id@Base 0.2.2
- grl_plugin_set_info@Base 0.2.2
- grl_plugin_set_load_func@Base 0.2.2
- grl_plugin_set_module@Base 0.2.2
- grl_plugin_set_optional_info@Base 0.2.2
- grl_plugin_set_unload_func@Base 0.2.2
- grl_plugin_unload@Base 0.2.2
- grl_range_value_dup@Base 0.2.2
- grl_range_value_free@Base 0.2.2
- grl_range_value_get_type@Base 0.2.2
- grl_range_value_hashtable_insert@Base 0.2.2
- grl_range_value_hashtable_new@Base 0.2.2
- grl_range_value_new@Base 0.2.2
- grl_registry_add_config@Base 0.2.2
- grl_registry_add_config_from_file@Base 0.2.2
- grl_registry_add_config_from_resource@Base 0.2.8
- grl_registry_add_directory@Base 0.2.2
- grl_registry_get_default@Base 0.2.2
- grl_registry_get_metadata_keys@Base 0.2.2
- grl_registry_get_plugins@Base 0.2.2
- grl_registry_get_sources@Base 0.2.2
- grl_registry_get_sources_by_operations@Base 0.2.2
- grl_registry_get_type@Base 0.2.2
- grl_registry_load_all_plugins@Base 0.2.2
- grl_registry_load_plugin@Base 0.2.2
- grl_registry_load_plugin_by_id@Base 0.2.2
- grl_registry_load_plugin_directory@Base 0.2.2
- grl_registry_lookup_metadata_key@Base 0.2.2
- grl_registry_lookup_metadata_key_desc@Base 0.2.2
- grl_registry_lookup_metadata_key_name@Base 0.2.2
- grl_registry_lookup_metadata_key_relation@Base 0.2.2
- grl_registry_lookup_metadata_key_type@Base 0.2.2
- grl_registry_lookup_plugin@Base 0.2.2
- grl_registry_lookup_source@Base 0.2.2
- grl_registry_metadata_key_validate@Base 0.2.2
- grl_registry_register_metadata_key@Base 0.2.2
- grl_registry_register_metadata_key_full@Base 0.2.2
- grl_registry_register_metadata_key_relation@Base 0.2.2
- grl_registry_register_source@Base 0.2.2
- grl_registry_restrict_plugins@Base 0.2.2
- grl_registry_unload_plugin@Base 0.2.2
- grl_registry_unregister_source@Base 0.2.2
- grl_related_keys_dup@Base 0.2.2
- grl_related_keys_get@Base 0.2.2
- grl_related_keys_get_binary@Base 0.2.2
- grl_related_keys_get_boolean@Base 0.2.3
- grl_related_keys_get_boxed@Base 0.2.2
- grl_related_keys_get_float@Base 0.2.2
- grl_related_keys_get_int@Base 0.2.2
- grl_related_keys_get_keys@Base 0.2.2
- grl_related_keys_get_string@Base 0.2.2
- grl_related_keys_get_type@Base 0.2.2
- grl_related_keys_has_key@Base 0.2.2
- grl_related_keys_new@Base 0.2.2
- grl_related_keys_new_valist@Base 0.2.2
- grl_related_keys_new_with_keys@Base 0.2.2
- grl_related_keys_remove@Base 0.2.3
- grl_related_keys_set@Base 0.2.2
- grl_related_keys_set_binary@Base 0.2.2
- grl_related_keys_set_boolean@Base 0.2.3
- grl_related_keys_set_boxed@Base 0.2.2
- grl_related_keys_set_float@Base 0.2.2
- grl_related_keys_set_int@Base 0.2.2
- grl_related_keys_set_string@Base 0.2.2
- grl_resolution_flags_get_type@Base 0.2.2
- grl_source_browse@Base 0.2.2
- grl_source_browse_sync@Base 0.2.2
- grl_source_change_type_get_type@Base 0.2.2
- grl_source_get_auto_split_threshold@Base 0.2.2
- grl_source_get_caps@Base 0.2.2
- grl_source_get_description@Base 0.2.2
- grl_source_get_icon@Base 0.2.8
- grl_source_get_id@Base 0.2.2
- grl_source_get_media_from_uri@Base 0.2.2
- grl_source_get_media_from_uri_sync@Base 0.2.2
- grl_source_get_name@Base 0.2.2
- grl_source_get_plugin@Base 0.2.2
- grl_source_get_rank@Base 0.2.2
- grl_source_get_supported_media@Base 0.2.3
- grl_source_get_type@Base 0.2.2
- grl_source_may_resolve@Base 0.2.2
- grl_source_notify_change@Base 0.2.2
- grl_source_notify_change_list@Base 0.2.2
- grl_source_notify_change_start@Base 0.2.2
- grl_source_notify_change_stop@Base 0.2.2
- grl_source_query@Base 0.2.2
- grl_source_query_sync@Base 0.2.2
- grl_source_remove@Base 0.2.2
- grl_source_remove_sync@Base 0.2.2
- grl_source_resolve@Base 0.2.2
- grl_source_resolve_sync@Base 0.2.2
- grl_source_search@Base 0.2.2
- grl_source_search_sync@Base 0.2.2
- grl_source_set_auto_split_threshold@Base 0.2.2
- grl_source_slow_keys@Base 0.2.2
- grl_source_store@Base 0.2.2
- grl_source_store_metadata@Base 0.2.2
- grl_source_store_metadata_sync@Base 0.2.2
- grl_source_store_sync@Base 0.2.2
- grl_source_supported_keys@Base 0.2.2
- grl_source_supported_operations@Base 0.2.2
- grl_source_test_media_from_uri@Base 0.2.2
- grl_source_writable_keys@Base 0.2.2
- grl_supported_ops_get_type@Base 0.2.2
- grl_type_filter_get_type@Base 0.2.2
- grl_wait_for_async_operation_complete@Base 0.2.2
- grl_write_flags_get_type@Base 0.2.2
- (optional)log_log_domain@Base 0.2.2
- (optional)media_log_domain@Base 0.2.2
- (optional)multiple_log_domain@Base 0.2.2
- (optional)plugin_log_domain@Base 0.2.2
- (optional)registry_log_domain@Base 0.2.2
- (optional)source_log_domain@Base 0.2.2
-libgrlnet-0.2.so.0 libgrilo-0.2-0 #MINVER#
- grl_net_wc_error_quark@Base 0.2.2
- grl_net_wc_flush_delayed_requests@Base 0.2.2
- grl_net_wc_get_type@Base 0.2.2
- grl_net_wc_new@Base 0.2.2
- grl_net_wc_request_async@Base 0.2.2
- grl_net_wc_request_finish@Base 0.2.2
- grl_net_wc_request_with_headers_async@Base 0.2.2
- grl_net_wc_request_with_headers_hash_async@Base 0.2.2
- grl_net_wc_set_cache@Base 0.2.2
- grl_net_wc_set_cache_size@Base 0.2.2
- grl_net_wc_set_log_level@Base 0.2.2
- grl_net_wc_set_throttling@Base 0.2.2
-libgrlpls-0.2.so.0 libgrilo-0.2-0 #MINVER#
- grl_pls_browse@Base 0.2.8
- grl_pls_browse_by_spec@Base 0.2.8
- grl_pls_browse_sync@Base 0.2.8
- grl_pls_file_to_media@Base 0.2.8
- grl_pls_get_file_attributes@Base 0.2.8
- grl_pls_media_is_playlist@Base 0.2.8
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-1.docs grilo-0.2.10/debian/libgrilo-0.2-1.docs
--- grilo-0.2.9/debian/libgrilo-0.2-1.docs	1970-01-01 00:00:00.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-1.docs	2014-03-20 10:06:43.000000000 +0000
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-1.install grilo-0.2.10/debian/libgrilo-0.2-1.install
--- grilo-0.2.9/debian/libgrilo-0.2-1.install	1970-01-01 00:00:00.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-1.install	2014-03-20 10:06:43.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru grilo-0.2.9/debian/libgrilo-0.2-1.symbols grilo-0.2.10/debian/libgrilo-0.2-1.symbols
--- grilo-0.2.9/debian/libgrilo-0.2-1.symbols	1970-01-01 00:00:00.000000000 +0000
+++ grilo-0.2.10/debian/libgrilo-0.2-1.symbols	2014-03-20 10:06:43.000000000 +0000
@@ -0,0 +1,450 @@
+libgrilo-0.2.so.1 libgrilo-0.2-1 #MINVER#
+ GRL_LOG_DOMAIN_DEFAULT@Base 0.2.2
+ (optional)_grl_log_free_core_domains@Base 0.2.2
+ (optional)_grl_log_init_core_domains@Base 0.2.2
+ (optional)config_log_domain@Base 0.2.2
+ (optional)data_log_domain@Base 0.2.2
+ grl_caps_get_key_filter@Base 0.2.2
+ grl_caps_get_key_range_filter@Base 0.2.2
+ grl_caps_get_type@Base 0.2.2
+ grl_caps_get_type_filter@Base 0.2.2
+ grl_caps_is_key_filter@Base 0.2.2
+ grl_caps_is_key_range_filter@Base 0.2.2
+ grl_caps_new@Base 0.2.2
+ grl_caps_set_key_filter@Base 0.2.2
+ grl_caps_set_key_range_filter@Base 0.2.2
+ grl_caps_set_type_filter@Base 0.2.2
+ grl_caps_test_option@Base 0.2.2
+ grl_config_get_api_key@Base 0.2.2
+ grl_config_get_api_key_blob@Base 0.2.2
+ grl_config_get_api_secret@Base 0.2.2
+ grl_config_get_api_token@Base 0.2.2
+ grl_config_get_api_token_secret@Base 0.2.6
+ grl_config_get_binary@Base 0.2.2
+ grl_config_get_boolean@Base 0.2.2
+ grl_config_get_float@Base 0.2.2
+ grl_config_get_int@Base 0.2.2
+ grl_config_get_password@Base 0.2.2
+ grl_config_get_plugin@Base 0.2.2
+ grl_config_get_source@Base 0.2.2
+ grl_config_get_string@Base 0.2.2
+ grl_config_get_type@Base 0.2.2
+ grl_config_get_username@Base 0.2.2
+ grl_config_has_param@Base 0.2.2
+ grl_config_new@Base 0.2.2
+ grl_config_set@Base 0.2.2
+ grl_config_set_api_key@Base 0.2.2
+ grl_config_set_api_key_blob@Base 0.2.2
+ grl_config_set_api_secret@Base 0.2.2
+ grl_config_set_api_token@Base 0.2.2
+ grl_config_set_api_token_secret@Base 0.2.6
+ grl_config_set_binary@Base 0.2.2
+ grl_config_set_boolean@Base 0.2.2
+ grl_config_set_float@Base 0.2.2
+ grl_config_set_int@Base 0.2.2
+ grl_config_set_password@Base 0.2.2
+ grl_config_set_plugin@Base 0.2.2
+ grl_config_set_source@Base 0.2.2
+ grl_config_set_string@Base 0.2.2
+ grl_config_set_username@Base 0.2.2
+ grl_data_add_binary@Base 0.2.2
+ grl_data_add_boxed@Base 0.2.2
+ grl_data_add_float@Base 0.2.2
+ grl_data_add_int@Base 0.2.2
+ grl_data_add_related_keys@Base 0.2.2
+ grl_data_add_string@Base 0.2.2
+ grl_data_dup@Base 0.2.2
+ grl_data_get@Base 0.2.2
+ grl_data_get_binary@Base 0.2.2
+ grl_data_get_boolean@Base 0.2.3
+ grl_data_get_boxed@Base 0.2.2
+ grl_data_get_float@Base 0.2.2
+ grl_data_get_int@Base 0.2.2
+ grl_data_get_keys@Base 0.2.2
+ grl_data_get_related_keys@Base 0.2.2
+ grl_data_get_single_values_for_key@Base 0.2.2
+ grl_data_get_single_values_for_key_string@Base 0.2.2
+ grl_data_get_string@Base 0.2.2
+ grl_data_get_type@Base 0.2.2
+ grl_data_has_key@Base 0.2.2
+ grl_data_length@Base 0.2.2
+ grl_data_new@Base 0.2.2
+ grl_data_remove@Base 0.2.2
+ grl_data_remove_nth@Base 0.2.2
+ grl_data_set@Base 0.2.2
+ grl_data_set_binary@Base 0.2.2
+ grl_data_set_boolean@Base 0.2.3
+ grl_data_set_boxed@Base 0.2.2
+ grl_data_set_float@Base 0.2.2
+ grl_data_set_int@Base 0.2.2
+ grl_data_set_related_keys@Base 0.2.2
+ grl_data_set_string@Base 0.2.2
+ grl_date_time_from_iso8601@Base 0.2.2
+ grl_deinit@Base 0.2.8
+ grl_g_value_dup@Base 0.2.2
+ grl_g_value_free@Base 0.2.2
+ grl_g_value_hashtable_new@Base 0.2.2
+ grl_g_value_hashtable_new_direct@Base 0.2.2
+ grl_g_value_new@Base 0.2.2
+ grl_init@Base 0.2.2
+ grl_init_get_option_group@Base 0.2.2
+ grl_list_from_va@Base 0.2.2
+ grl_log@Base 0.2.2
+ grl_log_configure@Base 0.2.2
+ grl_log_domain_free@Base 0.2.2
+ grl_log_domain_new@Base 0.2.2
+ grl_marshal_VOID__BOXED_ENUM_BOOLEAN@Base 0.2.2
+ grl_media_add_author@Base 0.2.2
+ grl_media_add_external_player@Base 0.2.2
+ grl_media_add_external_url@Base 0.2.2
+ grl_media_add_keyword@Base 0.2.3
+ grl_media_add_region_data@Base 0.2.3
+ grl_media_add_thumbnail@Base 0.2.2
+ grl_media_add_thumbnail_binary@Base 0.2.2
+ grl_media_add_url_data@Base 0.2.2
+ grl_media_audio_add_artist@Base 0.2.2
+ grl_media_audio_add_genre@Base 0.2.2
+ grl_media_audio_add_lyrics@Base 0.2.2
+ grl_media_audio_add_url_data@Base 0.2.2
+ grl_media_audio_get_album@Base 0.2.2
+ grl_media_audio_get_artist@Base 0.2.2
+ grl_media_audio_get_artist_nth@Base 0.2.2
+ grl_media_audio_get_bitrate@Base 0.2.2
+ grl_media_audio_get_genre@Base 0.2.2
+ grl_media_audio_get_genre_nth@Base 0.2.2
+ grl_media_audio_get_lyrics@Base 0.2.2
+ grl_media_audio_get_lyrics_nth@Base 0.2.2
+ grl_media_audio_get_track_number@Base 0.2.2
+ grl_media_audio_get_type@Base 0.2.2
+ grl_media_audio_get_url_data@Base 0.2.2
+ grl_media_audio_get_url_data_nth@Base 0.2.2
+ grl_media_audio_new@Base 0.2.2
+ grl_media_audio_set_album@Base 0.2.2
+ grl_media_audio_set_artist@Base 0.2.2
+ grl_media_audio_set_bitrate@Base 0.2.2
+ grl_media_audio_set_genre@Base 0.2.2
+ grl_media_audio_set_lyrics@Base 0.2.2
+ grl_media_audio_set_track_number@Base 0.2.2
+ grl_media_audio_set_url_data@Base 0.2.2
+ grl_media_box_get_childcount@Base 0.2.2
+ grl_media_box_get_type@Base 0.2.2
+ grl_media_box_new@Base 0.2.2
+ grl_media_box_set_childcount@Base 0.2.2
+ grl_media_get_author@Base 0.2.2
+ grl_media_get_author_nth@Base 0.2.2
+ grl_media_get_certificate@Base 0.2.2
+ grl_media_get_creation_date@Base 0.2.2
+ grl_media_get_description@Base 0.2.2
+ grl_media_get_duration@Base 0.2.2
+ grl_media_get_external_url@Base 0.2.2
+ grl_media_get_external_url_nth@Base 0.2.2
+ grl_media_get_favourite@Base 0.2.3
+ grl_media_get_id@Base 0.2.2
+ grl_media_get_keyword@Base 0.2.3
+ grl_media_get_keyword_nth@Base 0.2.3
+ grl_media_get_last_played@Base 0.2.2
+ grl_media_get_last_position@Base 0.2.2
+ grl_media_get_license@Base 0.2.2
+ grl_media_get_mime@Base 0.2.2
+ grl_media_get_modification_date@Base 0.2.2
+ grl_media_get_play_count@Base 0.2.2
+ grl_media_get_player@Base 0.2.2
+ grl_media_get_player_nth@Base 0.2.2
+ grl_media_get_publication_date@Base 0.2.2
+ grl_media_get_rating@Base 0.2.2
+ grl_media_get_region@Base 0.2.3
+ grl_media_get_region_data@Base 0.2.3
+ grl_media_get_region_data_nth@Base 0.2.3
+ grl_media_get_site@Base 0.2.2
+ grl_media_get_size@Base 0.2.10
+ grl_media_get_source@Base 0.2.2
+ grl_media_get_start_time@Base 0.2.2
+ grl_media_get_studio@Base 0.2.2
+ grl_media_get_thumbnail@Base 0.2.2
+ grl_media_get_thumbnail_binary@Base 0.2.2
+ grl_media_get_thumbnail_binary_nth@Base 0.2.2
+ grl_media_get_thumbnail_nth@Base 0.2.2
+ grl_media_get_title@Base 0.2.2
+ grl_media_get_type@Base 0.2.2
+ grl_media_get_url@Base 0.2.2
+ grl_media_get_url_data@Base 0.2.2
+ grl_media_get_url_data_nth@Base 0.2.2
+ grl_media_image_add_url_data@Base 0.2.2
+ grl_media_image_get_camera_model@Base 0.2.2
+ grl_media_image_get_exposure_time@Base 0.2.2
+ grl_media_image_get_flash_used@Base 0.2.2
+ grl_media_image_get_height@Base 0.2.2
+ grl_media_image_get_iso_speed@Base 0.2.2
+ grl_media_image_get_orientation@Base 0.2.2
+ grl_media_image_get_type@Base 0.2.2
+ grl_media_image_get_url_data@Base 0.2.2
+ grl_media_image_get_url_data_nth@Base 0.2.2
+ grl_media_image_get_width@Base 0.2.2
+ grl_media_image_new@Base 0.2.2
+ grl_media_image_set_camera_model@Base 0.2.2
+ grl_media_image_set_exposure_time@Base 0.2.2
+ grl_media_image_set_flash_used@Base 0.2.2
+ grl_media_image_set_height@Base 0.2.2
+ grl_media_image_set_iso_speed@Base 0.2.2
+ grl_media_image_set_orientation@Base 0.2.2
+ grl_media_image_set_size@Base 0.2.2
+ grl_media_image_set_url_data@Base 0.2.2
+ grl_media_image_set_width@Base 0.2.2
+ grl_media_new@Base 0.2.2
+ grl_media_serialize@Base 0.2.2
+ grl_media_serialize_extended@Base 0.2.2
+ grl_media_serialize_type_get_type@Base 0.2.3
+ grl_media_set_author@Base 0.2.2
+ grl_media_set_certificate@Base 0.2.2
+ grl_media_set_creation_date@Base 0.2.2
+ grl_media_set_description@Base 0.2.2
+ grl_media_set_duration@Base 0.2.2
+ grl_media_set_external_player@Base 0.2.2
+ grl_media_set_external_url@Base 0.2.2
+ grl_media_set_favourite@Base 0.2.3
+ grl_media_set_id@Base 0.2.2
+ grl_media_set_keyword@Base 0.2.3
+ grl_media_set_last_played@Base 0.2.2
+ grl_media_set_last_position@Base 0.2.2
+ grl_media_set_license@Base 0.2.2
+ grl_media_set_mime@Base 0.2.2
+ grl_media_set_modification_date@Base 0.2.2
+ grl_media_set_play_count@Base 0.2.2
+ grl_media_set_publication_date@Base 0.2.2
+ grl_media_set_rating@Base 0.2.2
+ grl_media_set_region@Base 0.2.3
+ grl_media_set_region_data@Base 0.2.3
+ grl_media_set_site@Base 0.2.2
+ grl_media_set_size@Base 0.2.10
+ grl_media_set_source@Base 0.2.2
+ grl_media_set_studio@Base 0.2.2
+ grl_media_set_thumbnail@Base 0.2.2
+ grl_media_set_thumbnail_binary@Base 0.2.2
+ grl_media_set_title@Base 0.2.2
+ grl_media_set_url@Base 0.2.2
+ grl_media_set_url_data@Base 0.2.2
+ grl_media_type_get_type@Base 0.2.3
+ grl_media_unserialize@Base 0.2.2
+ grl_media_video_add_director@Base 0.2.3
+ grl_media_video_add_performer@Base 0.2.3
+ grl_media_video_add_producer@Base 0.2.3
+ grl_media_video_add_url_data@Base 0.2.2
+ grl_media_video_get_director@Base 0.2.3
+ grl_media_video_get_director_nth@Base 0.2.3
+ grl_media_video_get_episode@Base 0.2.2
+ grl_media_video_get_framerate@Base 0.2.2
+ grl_media_video_get_height@Base 0.2.2
+ grl_media_video_get_original_title@Base 0.2.3
+ grl_media_video_get_performer@Base 0.2.3
+ grl_media_video_get_performer_nth@Base 0.2.3
+ grl_media_video_get_producer@Base 0.2.3
+ grl_media_video_get_producer_nth@Base 0.2.3
+ grl_media_video_get_season@Base 0.2.2
+ grl_media_video_get_show@Base 0.2.2
+ grl_media_video_get_type@Base 0.2.2
+ grl_media_video_get_url_data@Base 0.2.2
+ grl_media_video_get_url_data_nth@Base 0.2.2
+ grl_media_video_get_width@Base 0.2.2
+ grl_media_video_new@Base 0.2.2
+ grl_media_video_set_director@Base 0.2.3
+ grl_media_video_set_episode@Base 0.2.2
+ grl_media_video_set_framerate@Base 0.2.2
+ grl_media_video_set_height@Base 0.2.2
+ grl_media_video_set_original_title@Base 0.2.3
+ grl_media_video_set_performer@Base 0.2.3
+ grl_media_video_set_producer@Base 0.2.3
+ grl_media_video_set_season@Base 0.2.2
+ grl_media_video_set_show@Base 0.2.2
+ grl_media_video_set_size@Base 0.2.2
+ grl_media_video_set_url_data@Base 0.2.2
+ grl_media_video_set_width@Base 0.2.2
+ grl_metadata_key_get_desc@Base 0.2.2
+ grl_metadata_key_get_name@Base 0.2.2
+ grl_metadata_key_get_type@Base 0.2.2
+ grl_metadata_key_list_new@Base 0.2.2
+ grl_metadata_key_setup_system_keys@Base 0.2.2
+ grl_multiple_get_media_from_uri@Base 0.2.2
+ grl_multiple_search@Base 0.2.2
+ grl_multiple_search_sync@Base 0.2.2
+ grl_operation_cancel@Base 0.2.2
+ grl_operation_generate_id@Base 0.2.2
+ grl_operation_get_data@Base 0.2.2
+ grl_operation_get_private_data@Base 0.2.2
+ grl_operation_init@Base 0.2.2
+ grl_operation_options_copy@Base 0.2.2
+ grl_operation_options_get_count@Base 0.2.2
+ grl_operation_options_get_flags@Base 0.2.2
+ grl_operation_options_get_key_filter@Base 0.2.2
+ grl_operation_options_get_key_filter_list@Base 0.2.2
+ grl_operation_options_get_key_range_filter@Base 0.2.2
+ grl_operation_options_get_key_range_filter_list@Base 0.2.2
+ grl_operation_options_get_skip@Base 0.2.2
+ grl_operation_options_get_type@Base 0.2.2
+ grl_operation_options_get_type_filter@Base 0.2.2
+ grl_operation_options_key_is_set@Base 0.2.2
+ grl_operation_options_new@Base 0.2.2
+ grl_operation_options_obey_caps@Base 0.2.2
+ grl_operation_options_set_count@Base 0.2.2
+ grl_operation_options_set_flags@Base 0.2.2
+ grl_operation_options_set_key_filter_dictionary@Base 0.2.2
+ grl_operation_options_set_key_filter_value@Base 0.2.2
+ grl_operation_options_set_key_filters@Base 0.2.2
+ grl_operation_options_set_key_range_filter@Base 0.2.2
+ grl_operation_options_set_key_range_filter_value@Base 0.2.2
+ grl_operation_options_set_skip@Base 0.2.2
+ grl_operation_options_set_type_filter@Base 0.2.2
+ grl_operation_remove@Base 0.2.2
+ grl_operation_set_data@Base 0.2.2
+ grl_operation_set_data_full@Base 0.2.7
+ grl_operation_set_private_data@Base 0.2.2
+ grl_paging_translate@Base 0.2.2
+ grl_plugin_get_author@Base 0.2.2
+ grl_plugin_get_description@Base 0.2.2
+ grl_plugin_get_filename@Base 0.2.2
+ grl_plugin_get_id@Base 0.2.2
+ grl_plugin_get_info@Base 0.2.2
+ grl_plugin_get_info_keys@Base 0.2.2
+ grl_plugin_get_license@Base 0.2.2
+ grl_plugin_get_module@Base 0.2.2
+ grl_plugin_get_name@Base 0.2.2
+ grl_plugin_get_site@Base 0.2.2
+ grl_plugin_get_sources@Base 0.2.2
+ grl_plugin_get_type@Base 0.2.2
+ grl_plugin_get_version@Base 0.2.2
+ grl_plugin_load@Base 0.2.2
+ grl_plugin_set_filename@Base 0.2.2
+ grl_plugin_set_id@Base 0.2.2
+ grl_plugin_set_info@Base 0.2.2
+ grl_plugin_set_load_func@Base 0.2.2
+ grl_plugin_set_module@Base 0.2.2
+ grl_plugin_set_optional_info@Base 0.2.2
+ grl_plugin_set_unload_func@Base 0.2.2
+ grl_plugin_unload@Base 0.2.2
+ grl_range_value_dup@Base 0.2.2
+ grl_range_value_free@Base 0.2.2
+ grl_range_value_get_type@Base 0.2.2
+ grl_range_value_hashtable_insert@Base 0.2.2
+ grl_range_value_hashtable_new@Base 0.2.2
+ grl_range_value_new@Base 0.2.2
+ grl_registry_add_config@Base 0.2.2
+ grl_registry_add_config_from_file@Base 0.2.2
+ grl_registry_add_config_from_resource@Base 0.2.8
+ grl_registry_add_directory@Base 0.2.2
+ grl_registry_get_default@Base 0.2.2
+ grl_registry_get_metadata_keys@Base 0.2.2
+ grl_registry_get_plugins@Base 0.2.2
+ grl_registry_get_sources@Base 0.2.2
+ grl_registry_get_sources_by_operations@Base 0.2.2
+ grl_registry_get_type@Base 0.2.2
+ grl_registry_load_all_plugins@Base 0.2.2
+ grl_registry_load_plugin@Base 0.2.2
+ grl_registry_load_plugin_by_id@Base 0.2.2
+ grl_registry_load_plugin_directory@Base 0.2.2
+ grl_registry_lookup_metadata_key@Base 0.2.2
+ grl_registry_lookup_metadata_key_desc@Base 0.2.2
+ grl_registry_lookup_metadata_key_name@Base 0.2.2
+ grl_registry_lookup_metadata_key_relation@Base 0.2.2
+ grl_registry_lookup_metadata_key_type@Base 0.2.2
+ grl_registry_lookup_plugin@Base 0.2.2
+ grl_registry_lookup_source@Base 0.2.2
+ grl_registry_metadata_key_validate@Base 0.2.2
+ grl_registry_register_metadata_key@Base 0.2.2
+ grl_registry_register_metadata_key_relation@Base 0.2.2
+ (optional)grl_registry_register_metadata_key_system@Base 0.2.10
+ grl_registry_register_source@Base 0.2.2
+ grl_registry_restrict_plugins@Base 0.2.2
+ grl_registry_shutdown@Base 0.2.10
+ grl_registry_unload_plugin@Base 0.2.2
+ grl_registry_unregister_source@Base 0.2.2
+ grl_related_keys_dup@Base 0.2.2
+ grl_related_keys_get@Base 0.2.2
+ grl_related_keys_get_binary@Base 0.2.2
+ grl_related_keys_get_boolean@Base 0.2.3
+ grl_related_keys_get_boxed@Base 0.2.2
+ grl_related_keys_get_float@Base 0.2.2
+ grl_related_keys_get_int@Base 0.2.2
+ grl_related_keys_get_keys@Base 0.2.2
+ grl_related_keys_get_string@Base 0.2.2
+ grl_related_keys_get_type@Base 0.2.2
+ grl_related_keys_has_key@Base 0.2.2
+ grl_related_keys_new@Base 0.2.2
+ grl_related_keys_new_valist@Base 0.2.2
+ grl_related_keys_new_with_keys@Base 0.2.2
+ grl_related_keys_remove@Base 0.2.3
+ grl_related_keys_set@Base 0.2.2
+ grl_related_keys_set_binary@Base 0.2.2
+ grl_related_keys_set_boolean@Base 0.2.3
+ grl_related_keys_set_boxed@Base 0.2.2
+ grl_related_keys_set_float@Base 0.2.2
+ grl_related_keys_set_int@Base 0.2.2
+ grl_related_keys_set_string@Base 0.2.2
+ grl_resolution_flags_get_type@Base 0.2.2
+ grl_source_browse@Base 0.2.2
+ grl_source_browse_sync@Base 0.2.2
+ grl_source_change_type_get_type@Base 0.2.2
+ grl_source_get_auto_split_threshold@Base 0.2.2
+ grl_source_get_caps@Base 0.2.2
+ grl_source_get_description@Base 0.2.2
+ grl_source_get_icon@Base 0.2.8
+ grl_source_get_id@Base 0.2.2
+ grl_source_get_media_from_uri@Base 0.2.2
+ grl_source_get_media_from_uri_sync@Base 0.2.2
+ grl_source_get_name@Base 0.2.2
+ grl_source_get_plugin@Base 0.2.2
+ grl_source_get_rank@Base 0.2.2
+ grl_source_get_supported_media@Base 0.2.3
+ grl_source_get_tags@Base 0.2.10
+ grl_source_get_type@Base 0.2.2
+ grl_source_may_resolve@Base 0.2.2
+ grl_source_notify_change@Base 0.2.2
+ grl_source_notify_change_list@Base 0.2.2
+ grl_source_notify_change_start@Base 0.2.2
+ grl_source_notify_change_stop@Base 0.2.2
+ grl_source_query@Base 0.2.2
+ grl_source_query_sync@Base 0.2.2
+ grl_source_remove@Base 0.2.2
+ grl_source_remove_sync@Base 0.2.2
+ grl_source_resolve@Base 0.2.2
+ grl_source_resolve_sync@Base 0.2.2
+ grl_source_search@Base 0.2.2
+ grl_source_search_sync@Base 0.2.2
+ grl_source_set_auto_split_threshold@Base 0.2.2
+ grl_source_slow_keys@Base 0.2.2
+ grl_source_store@Base 0.2.2
+ grl_source_store_metadata@Base 0.2.2
+ grl_source_store_metadata_sync@Base 0.2.2
+ grl_source_store_sync@Base 0.2.2
+ grl_source_supported_keys@Base 0.2.2
+ grl_source_supported_operations@Base 0.2.2
+ grl_source_test_media_from_uri@Base 0.2.2
+ grl_source_writable_keys@Base 0.2.2
+ grl_supported_ops_get_type@Base 0.2.2
+ grl_type_filter_get_type@Base 0.2.2
+ grl_wait_for_async_operation_complete@Base 0.2.2
+ grl_write_flags_get_type@Base 0.2.2
+ (optional)log_log_domain@Base 0.2.2
+ (optional)media_log_domain@Base 0.2.2
+ (optional)multiple_log_domain@Base 0.2.2
+ (optional)plugin_log_domain@Base 0.2.2
+ (optional)registry_log_domain@Base 0.2.2
+ (optional)source_log_domain@Base 0.2.2
+libgrlnet-0.2.so.0 libgrilo-0.2-1 #MINVER#
+ grl_net_wc_error_quark@Base 0.2.2
+ grl_net_wc_flush_delayed_requests@Base 0.2.2
+ grl_net_wc_get_type@Base 0.2.2
+ grl_net_wc_new@Base 0.2.2
+ grl_net_wc_request_async@Base 0.2.2
+ grl_net_wc_request_finish@Base 0.2.2
+ grl_net_wc_request_with_headers_async@Base 0.2.2
+ grl_net_wc_request_with_headers_hash_async@Base 0.2.2
+ grl_net_wc_set_cache@Base 0.2.2
+ grl_net_wc_set_cache_size@Base 0.2.2
+ grl_net_wc_set_log_level@Base 0.2.2
+ grl_net_wc_set_throttling@Base 0.2.2
+libgrlpls-0.2.so.0 libgrilo-0.2-1 #MINVER#
+ grl_pls_browse@Base 0.2.8
+ grl_pls_browse_by_spec@Base 0.2.8
+ grl_pls_browse_sync@Base 0.2.8
+ grl_pls_file_to_media@Base 0.2.8
+ grl_pls_get_file_attributes@Base 0.2.8
+ grl_pls_media_is_playlist@Base 0.2.8
diff -Nru grilo-0.2.9/debian/rules grilo-0.2.10/debian/rules
--- grilo-0.2.9/debian/rules	2014-02-17 21:58:07.000000000 +0000
+++ grilo-0.2.10/debian/rules	2014-03-20 10:06:43.000000000 +0000
@@ -6,16 +6,17 @@
 override_dh_auto_configure:
 	VAPIDIR=/usr/share/vala/vapi \
 	dh_auto_configure -- --enable-gtk-doc --enable-vala \
-		--enable-introspection --enable-grl-net --disable-debug
+		--enable-introspection --enable-grl-net --disable-debug \
+		--disable-silent-rules
 
 override_dh_install:
 	dh_install
 	( cd $(CURDIR)/debian/libgrilo-0.2-bin/usr/share/man/man1 && \
-	  mv grl-inspect.1 grl-inspect-0.2.0 )
+	  mv grl-inspect.1 grl-inspect-0.2.1 )
 
 override_dh_shlibdeps:
 	dh_shlibdeps
 	dh_girepository
 
 override_dh_strip:
-	dh_strip --dbg-package=libgrilo-0.2-0-dbg
+	dh_strip --dbg-package=libgrilo-0.2-1-dbg
diff -Nru grilo-0.2.9/doc/grilo/grilo-sections.txt grilo-0.2.10/doc/grilo/grilo-sections.txt
--- grilo-0.2.9/doc/grilo/grilo-sections.txt	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/grilo-sections.txt	2014-03-20 09:13:39.000000000 +0000
@@ -380,6 +380,7 @@
 grl_media_get_url
 grl_media_get_url_data
 grl_media_get_url_data_nth
+grl_media_get_size
 grl_media_serialize
 grl_media_serialize_extended
 grl_media_set_author
@@ -410,6 +411,7 @@
 grl_media_set_title
 grl_media_set_url
 grl_media_set_url_data
+grl_media_set_size
 grl_media_unserialize
 <SUBSECTION Standard>
 GRL_IS_MEDIA
diff -Nru grilo-0.2.9/doc/grilo/html/annotation-glossary.html grilo-0.2.10/doc/grilo/html/annotation-glossary.html
--- grilo-0.2.9/doc/grilo/html/annotation-glossary.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/annotation-glossary.html	2014-03-20 09:13:39.000000000 +0000
@@ -11,7 +11,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"><span id="nav_glossary"><a class="shortcut" href="#glsA">A</a>
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#glsE">E</a>
diff -Nru grilo-0.2.9/doc/grilo/html/api-index-full.html grilo-0.2.10/doc/grilo/html/api-index-full.html
--- grilo-0.2.9/doc/grilo/html/api-index-full.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/api-index-full.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxC">C</a>
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#idxD">D</a>
@@ -455,11 +455,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-log.html#GRL-LOG:CAPS" title="GRL_LOG()">GRL_LOG</a>, macro in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
+<a class="link" href="grilo-grl-log.html#grl-log" title="grl_log ()">grl_log</a>, function in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-log.html#grl-log" title="grl_log ()">grl_log</a>, function in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
+<a class="link" href="grilo-grl-log.html#GRL-LOG:CAPS" title="GRL_LOG()">GRL_LOG</a>, macro in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
 </dt>
 <dd></dd>
 <dt>
@@ -487,11 +487,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-FREE:CAPS" title="GRL_LOG_DOMAIN_FREE()">GRL_LOG_DOMAIN_FREE</a>, macro in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
+<a class="link" href="grilo-grl-log.html#grl-log-domain-free" title="grl_log_domain_free ()">grl_log_domain_free</a>, function in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-log.html#grl-log-domain-free" title="grl_log_domain_free ()">grl_log_domain_free</a>, function in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
+<a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-FREE:CAPS" title="GRL_LOG_DOMAIN_FREE()">GRL_LOG_DOMAIN_FREE</a>, macro in <a class="link" href="grilo-grl-log.html" title="grl-log">grl-log</a>
 </dt>
 <dd></dd>
 <dt>
@@ -796,6 +796,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GrlMedia.html#grl-media-get-size" title="grl_media_get_size ()">grl_media_get_size</a>, function in <a class="link" href="GrlMedia.html" title="GrlMedia">GrlMedia</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GrlMedia.html#grl-media-get-source" title="grl_media_get_source ()">grl_media_get_source</a>, function in <a class="link" href="GrlMedia.html" title="GrlMedia">GrlMedia</a>
 </dt>
 <dd></dd>
@@ -1016,6 +1020,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GrlMedia.html#grl-media-set-size" title="grl_media_set_size ()">grl_media_set_size</a>, function in <a class="link" href="GrlMedia.html" title="GrlMedia">GrlMedia</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GrlMedia.html#grl-media-set-source" title="grl_media_set_source ()">grl_media_set_source</a>, function in <a class="link" href="GrlMedia.html" title="GrlMedia">GrlMedia</a>
 </dt>
 <dd></dd>
@@ -1260,11 +1268,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-DESC:CAPS" title="GRL_METADATA_KEY_GET_DESC()">GRL_METADATA_KEY_GET_DESC</a>, macro in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
+<a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-get-desc" title="grl_metadata_key_get_desc ()">grl_metadata_key_get_desc</a>, function in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-get-desc" title="grl_metadata_key_get_desc ()">grl_metadata_key_get_desc</a>, function in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
+<a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-DESC:CAPS" title="GRL_METADATA_KEY_GET_DESC()">GRL_METADATA_KEY_GET_DESC</a>, macro in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1280,11 +1288,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-TYPE:CAPS" title="GRL_METADATA_KEY_GET_TYPE()">GRL_METADATA_KEY_GET_TYPE</a>, macro in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
+<a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-get-type" title="grl_metadata_key_get_type ()">grl_metadata_key_get_type</a>, function in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-get-type" title="grl_metadata_key_get_type ()">grl_metadata_key_get_type</a>, function in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
+<a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-TYPE:CAPS" title="GRL_METADATA_KEY_GET_TYPE()">GRL_METADATA_KEY_GET_TYPE</a>, macro in <a class="link" href="grilo-grl-metadata-key.html" title="grl-metadata-key">grl-metadata-key</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1724,6 +1732,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GrlRegistry.html#GrlRegistry-metadata-key-added" title="The “metadata-key-added” signal">GrlRegistry::metadata-key-added</a>, object signal in <a class="link" href="GrlRegistry.html" title="GrlRegistry">GrlRegistry</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GrlRegistry.html#GrlRegistry-source-added" title="The “source-added” signal">GrlRegistry::source-added</a>, object signal in <a class="link" href="GrlRegistry.html" title="GrlRegistry">GrlRegistry</a>
 </dt>
 <dd></dd>
@@ -1973,6 +1985,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="GrlSource.html#GrlSource--source-tags" title="The “source-tags” property">GrlSource:source-tags</a>, object property in <a class="link" href="GrlSource.html" title="GrlSource">GrlSource</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="GrlSource.html#GrlSource--supported-media" title="The “supported-media” property">GrlSource:supported-media</a>, object property in <a class="link" href="GrlSource.html" title="GrlSource">GrlSource</a>
 </dt>
 <dd></dd>
diff -Nru grilo-0.2.9/doc/grilo/html/caps-options.html grilo-0.2.10/doc/grilo/html/caps-options.html
--- grilo-0.2.9/doc/grilo/html/caps-options.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/caps-options.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/ch01.html grilo-0.2.10/doc/grilo/html/ch01.html
--- grilo-0.2.9/doc/grilo/html/ch01.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/ch01.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/ch02.html grilo-0.2.10/doc/grilo/html/ch02.html
--- grilo-0.2.9/doc/grilo/html/ch02.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/ch02.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/ch03.html grilo-0.2.10/doc/grilo/html/ch03.html
--- grilo-0.2.9/doc/grilo/html/ch03.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/ch03.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/ch04.html grilo-0.2.10/doc/grilo/html/ch04.html
--- grilo-0.2.9/doc/grilo/html/ch04.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/ch04.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/configure.html grilo-0.2.10/doc/grilo/html/configure.html
--- grilo-0.2.9/doc/grilo/html/configure.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/configure.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/data.html grilo-0.2.10/doc/grilo/html/data.html
--- grilo-0.2.9/doc/grilo/html/data.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/data.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/deprecated-api-index.html grilo-0.2.10/doc/grilo/html/deprecated-api-index.html
--- grilo-0.2.9/doc/grilo/html/deprecated-api-index.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/deprecated-api-index.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo.devhelp2 grilo-0.2.10/doc/grilo/html/grilo.devhelp2
--- grilo-0.2.9/doc/grilo/html/grilo.devhelp2	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo.devhelp2	2014-03-20 09:13:39.000000000 +0000
@@ -164,6 +164,7 @@
     <keyword type="macro" name="GRL_PLUGIN_LIST_VAR" link="GrlRegistry.html#GRL-PLUGIN-LIST-VAR:CAPS"/>
     <keyword type="macro" name="GRL_PLUGIN_PATH_VAR" link="GrlRegistry.html#GRL-PLUGIN-PATH-VAR:CAPS"/>
     <keyword type="macro" name="GRL_PLUGIN_RANKS_VAR" link="GrlRegistry.html#GRL-PLUGIN-RANKS-VAR:CAPS"/>
+    <keyword type="signal" name="The “metadata-key-added” signal" link="GrlRegistry.html#GrlRegistry-metadata-key-added"/>
     <keyword type="signal" name="The “source-added” signal" link="GrlRegistry.html#GrlRegistry-source-added"/>
     <keyword type="signal" name="The “source-removed” signal" link="GrlRegistry.html#GrlRegistry-source-removed"/>
     <keyword type="function" name="grl_plugin_get_author ()" link="GrlPlugin.html#grl-plugin-get-author" since="0.2.0"/>
@@ -248,6 +249,7 @@
     <keyword type="property" name="The “source-icon” property" link="GrlSource.html#GrlSource--source-icon"/>
     <keyword type="property" name="The “source-id” property" link="GrlSource.html#GrlSource--source-id"/>
     <keyword type="property" name="The “source-name” property" link="GrlSource.html#GrlSource--source-name"/>
+    <keyword type="property" name="The “source-tags” property" link="GrlSource.html#GrlSource--source-tags"/>
     <keyword type="property" name="The “supported-media” property" link="GrlSource.html#GrlSource--supported-media"/>
     <keyword type="signal" name="The “content-changed” signal" link="GrlSource.html#GrlSource-content-changed"/>
     <keyword type="function" name="grl_caps_new ()" link="GrlCaps.html#grl-caps-new" since="0.2.0"/>
@@ -432,6 +434,7 @@
     <keyword type="function" name="grl_media_get_url ()" link="GrlMedia.html#grl-media-get-url" since="0.1.4"/>
     <keyword type="function" name="grl_media_get_url_data ()" link="GrlMedia.html#grl-media-get-url-data" since="0.1.10"/>
     <keyword type="function" name="grl_media_get_url_data_nth ()" link="GrlMedia.html#grl-media-get-url-data-nth" since="0.1.10"/>
+    <keyword type="function" name="grl_media_get_size ()" link="GrlMedia.html#grl-media-get-size" since="0.2.10"/>
     <keyword type="function" name="grl_media_serialize ()" link="GrlMedia.html#grl-media-serialize" since="0.1.6"/>
     <keyword type="function" name="grl_media_serialize_extended ()" link="GrlMedia.html#grl-media-serialize-extended" since="0.1.6"/>
     <keyword type="function" name="grl_media_set_author ()" link="GrlMedia.html#grl-media-set-author" since="0.1.4"/>
@@ -462,6 +465,7 @@
     <keyword type="function" name="grl_media_set_title ()" link="GrlMedia.html#grl-media-set-title" since="0.1.4"/>
     <keyword type="function" name="grl_media_set_url ()" link="GrlMedia.html#grl-media-set-url" since="0.1.4"/>
     <keyword type="function" name="grl_media_set_url_data ()" link="GrlMedia.html#grl-media-set-url-data" since="0.1.10"/>
+    <keyword type="function" name="grl_media_set_size ()" link="GrlMedia.html#grl-media-set-size" since="0.2.10"/>
     <keyword type="function" name="grl_media_unserialize ()" link="GrlMedia.html#grl-media-unserialize" since="0.1.6"/>
     <keyword type="struct" name="struct GrlMedia" link="GrlMedia.html#GrlMedia-struct"/>
     <keyword type="struct" name="struct GrlMediaClass" link="GrlMedia.html#GrlMediaClass"/>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grilo.html grilo-0.2.10/doc/grilo/html/grilo-grilo.html
--- grilo-0.2.9/doc/grilo/html/grilo-grilo.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grilo.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grilo.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grilo.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grilo.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -68,11 +67,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grilo.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grilo.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -97,7 +91,7 @@
           <em class="parameter"><code><span class="type">gchar</span> **argv[]</code></em>);</pre>
 <p>Initializes the Grilo library</p>
 <div class="refsect3">
-<a name="id-1.5.2.7.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -131,7 +125,7 @@
 libraries that use the GOption commandline parser
 (see <code class="function">g_option_context_add_group()</code> ).</p>
 <div class="refsect3">
-<a name="id-1.5.2.7.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.6.3.6"></a><h4>Returns</h4>
 <p> a pointer to Grilo's option group. Should be dereferenced
 after use.</p>
 <p></p>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-definitions.html grilo-0.2.10/doc/grilo/html/grilo-grl-definitions.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-definitions.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-definitions.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-definitions.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-definitions.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-definitions.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -52,11 +51,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-definitions.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-definitions.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-error.html grilo-0.2.10/doc/grilo/html/grilo-grl-error.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-error.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-error.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-error.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-error.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-error.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -52,11 +51,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-error.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-error.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -73,7 +67,7 @@
 <a name="GrlCoreError"></a><h3>enum GrlCoreError</h3>
 <p>These constants identify all the available core errors</p>
 <div class="refsect3">
-<a name="id-1.5.9.4.8.2.4"></a><h4>Members</h4>
+<a name="id-1.5.9.4.7.2.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-log.html grilo-0.2.10/doc/grilo/html/grilo-grl-log.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-log.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-log.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-log.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-log.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-log.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -165,11 +164,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-log.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-log.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -187,7 +181,7 @@
 debugging messages. You will probably want to use one of the ones described
 below.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -221,7 +215,7 @@
 </pre>
 <p>Defines a GrlLogDomain variable.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -243,7 +237,7 @@
 </pre>
 <p>Declares a GrlLogDomain variable as extern. Use in header files.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -264,7 +258,7 @@
 <pre class="programlisting">#define             GRL_LOG_DOMAIN_FREE(domain)</pre>
 <p>Free a previously allocated <a class="link" href="grilo-grl-log.html#GrlLogDomain" title="GrlLogDomain"><span class="type">GrlLogDomain</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -285,7 +279,7 @@
 <pre class="programlisting">#define             GRL_LOG_DOMAIN_INIT(domain, name)</pre>
 <p>Creates a new <a class="link" href="grilo-grl-log.html#GrlLogDomain" title="GrlLogDomain"><span class="type">GrlLogDomain</span></a> with the given name.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -314,7 +308,7 @@
 </pre>
 <p>Defines a static GrlLogDomain variable.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -335,7 +329,7 @@
 <pre class="programlisting">#define             GRL_DEBUG(...)</pre>
 <p>Output a debugging message in the default log domain.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -356,7 +350,7 @@
 <pre class="programlisting">#define             GRL_ERROR(...)</pre>
 <p>Output an error message in the default log domain.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -377,7 +371,7 @@
 <pre class="programlisting">#define             GRL_INFO(...)</pre>
 <p>Output an informational message in the default log domain.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -398,7 +392,7 @@
 <pre class="programlisting">#define             GRL_MESSAGE(...)</pre>
 <p>Output a logging message in the default log domain.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -419,7 +413,7 @@
 <pre class="programlisting">#define             GRL_WARNING(...)</pre>
 <p>Output a warning message in the default log domain.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.12.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -445,7 +439,7 @@
          <em class="parameter"><code>...</code></em>);</pre>
 <p>Send a log message.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -525,7 +519,7 @@
 defining the GRL_DEBUG environment variable to a configuration string
 as described above</div>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.14.11"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.14.11"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -549,7 +543,7 @@
 <p>Releases <em class="parameter"><code>domain</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.15.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -571,7 +565,7 @@
 <pre class="programlisting"><a class="link" href="grilo-grl-log.html#GrlLogDomain" title="GrlLogDomain"><span class="returnvalue">GrlLogDomain</span></a> *
 grl_log_domain_new (<em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.16.4"></a><h4>Parameters</h4>
+<a name="id-1.5.9.3.7.16.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -586,7 +580,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.3.8.16.5"></a><h4>Returns</h4>
+<a name="id-1.5.9.3.7.16.5"></a><h4>Returns</h4>
 <p> The new log domain</p>
 <p></p>
 </div>
@@ -604,7 +598,7 @@
 <a name="GrlLogLevel"></a><h3>enum GrlLogLevel</h3>
 <p>Grilo log levels. Defines the level of verbosity selected in Grilo.</p>
 <div class="refsect3">
-<a name="id-1.5.9.3.9.3.4"></a><h4>Members</h4>
+<a name="id-1.5.9.3.8.3.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-metadata-key.html grilo-0.2.10/doc/grilo/html/grilo-grl-metadata-key.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-metadata-key.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-metadata-key.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-metadata-key.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-metadata-key.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-metadata-key.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -329,11 +328,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-metadata-key.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-metadata-key.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -386,7 +380,7 @@
 grl_metadata_key_get_desc (<em class="parameter"><code><a class="link" href="grilo-grl-metadata-key.html#GrlKeyID" title="GrlKeyID"><span class="type">GrlKeyID</span></a> key</code></em>);</pre>
 <p>Retrieves the description associated with the key</p>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.2.7.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -401,7 +395,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.2.7.8.6"></a><h4>Returns</h4>
 <p> the description of the key</p>
 <p></p>
 </div>
@@ -414,7 +408,7 @@
 grl_metadata_key_get_name (<em class="parameter"><code><a class="link" href="grilo-grl-metadata-key.html#GrlKeyID" title="GrlKeyID"><span class="type">GrlKeyID</span></a> key</code></em>);</pre>
 <p>Retrieves the name associated with the key</p>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.2.7.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -429,7 +423,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.2.7.9.6"></a><h4>Returns</h4>
 <p> The name of the key</p>
 <p></p>
 </div>
@@ -442,7 +436,7 @@
 grl_metadata_key_get_type (<em class="parameter"><code><a class="link" href="grilo-grl-metadata-key.html#GrlKeyID" title="GrlKeyID"><span class="type">GrlKeyID</span></a> key</code></em>);</pre>
 <p>Retrieves the expected type for values associated with this key</p>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.2.7.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -457,7 +451,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.2.7.10.6"></a><h4>Returns</h4>
 <p> the expected value type</p>
 <p></p>
 </div>
@@ -472,7 +466,7 @@
 <p>Returns a <span class="type">GList</span> containing the va_list keys. Use <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-INVALID:CAPS" title="GRL_METADATA_KEY_INVALID"><span class="type">GRL_METADATA_KEY_INVALID</span></a>
 to finalize them.</p>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.2.7.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -494,7 +488,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.2.8.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.2.7.11.6"></a><h4>Returns</h4>
 <p> a <span class="type">GList</span></p>
 <p></p>
 </div>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-GrlNetWc.html grilo-0.2.10/doc/grilo/html/grilo-GrlNetWc.html
--- grilo-0.2.9/doc/grilo/html/grilo-GrlNetWc.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-GrlNetWc.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-GrlNetWc.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-GrlNetWc.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-GrlNetWc.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="grilo-net.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -159,11 +158,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-GrlNetWc.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-GrlNetWc.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -182,7 +176,7 @@
 grl_net_wc_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="grilo-GrlNetWc.html#GrlNetWc" title="struct GrlNetWc"><span class="type">GrlNetWc</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.2.5"></a><h4>Returns</h4>
+<a name="id-1.6.4.2.7.2.5"></a><h4>Returns</h4>
 <p> a new allocated instance of <a class="link" href="grilo-GrlNetWc.html#GrlNetWc" title="struct GrlNetWc"><span class="type">GrlNetWc</span></a>. Do <code class="function">g_object_unref()</code> after
 use it.</p>
 <p></p>
@@ -201,7 +195,7 @@
 grl_net_wc_flush_delayed_requests (<em class="parameter"><code><a class="link" href="grilo-GrlNetWc.html#GrlNetWc" title="struct GrlNetWc"><span class="type">GrlNetWc</span></a> *self</code></em>);</pre>
 <p>This method will flush all the pending request in the queue.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -230,7 +224,7 @@
 asynchronous, thus the result will be returned within the <em class="parameter"><code>callback</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -283,7 +277,7 @@
 <p>The content address will be invalidated at the next request. So if you
 want to keep it, please copy it into another address.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.6.6"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -321,7 +315,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.6.7"></a><h4>Returns</h4>
+<a name="id-1.6.4.2.7.6.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successfull. If <code class="literal">FALSE</code> an error occurred.</p>
 <p></p>
 </div>
@@ -341,7 +335,7 @@
 asynchronous, thus the result will be returned within the <em class="parameter"><code>callback</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -402,7 +396,7 @@
 asynchronous, thus the result will be returned within the <em class="parameter"><code>callback</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -457,7 +451,7 @@
 supporting.  If sets <code class="literal">TRUE</code>, a new cache will be created. If sets to <code class="literal">FALSE</code>,
 current cache is clean and removed.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -489,7 +483,7 @@
 <p>Sets the new maximum size of cache, in Megabytes. Default value is 10. Using
 0 means no cache will be done.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -521,7 +515,7 @@
 <p>Setting the log level the logger feature is added into
 the libsoup session.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -552,7 +546,7 @@
 <p>Setting this property, the <a class="link" href="grilo-GrlNetWc.html#GrlNetWc" title="struct GrlNetWc"><span class="type">GrlNetWc</span></a> will queue all the requests and
 will dispatch them with a pause between them of this value.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.8.12.5"></a><h4>Parameters</h4>
+<a name="id-1.6.4.2.7.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -584,7 +578,7 @@
 };
 </pre>
 <div class="refsect3">
-<a name="id-1.6.4.2.9.2.4"></a><h4>Members</h4>
+<a name="id-1.6.4.2.8.2.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="struct_members_name">
@@ -610,7 +604,7 @@
 <p>It's a simple and thin web client to be used by the sources to download
 content from Internet.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.9.3.6"></a><h4>Members</h4>
+<a name="id-1.6.4.2.8.3.6"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="struct_members_name">
@@ -631,7 +625,7 @@
 <p>These constants identify all the available errors managed by
 the web client.</p>
 <div class="refsect3">
-<a name="id-1.6.4.2.9.4.4"></a><h4>Members</h4>
+<a name="id-1.6.4.2.8.4.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-operation.html grilo-0.2.10/doc/grilo/html/grilo-grl-operation.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-operation.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-operation.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-operation.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-operation.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-operation.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -76,11 +75,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-operation.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-operation.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -96,7 +90,7 @@
 grl_operation_cancel (<em class="parameter"><code><span class="type">guint</span> operation_id</code></em>);</pre>
 <p>Cancel an operation.</p>
 <div class="refsect3">
-<a name="id-1.5.9.6.7.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.6.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -118,7 +112,7 @@
 grl_operation_get_data (<em class="parameter"><code><span class="type">guint</span> operation_id</code></em>);</pre>
 <p>Obtains the previously attached data</p>
 <div class="refsect3">
-<a name="id-1.5.9.6.7.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.6.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -133,7 +127,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.6.7.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.6.6.3.6"></a><h4>Returns</h4>
 <p> The previously attached data. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -146,7 +140,7 @@
                         <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Attach a pointer to the specific operation.</p>
 <div class="refsect3">
-<a name="id-1.5.9.6.7.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.6.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -180,7 +174,7 @@
  callback is not called if <em class="parameter"><code>user_data</code></em>
  is <code class="literal">NULL</code>.</p>
 <div class="refsect3">
-<a name="id-1.5.9.6.7.5.6"></a><h4>Parameters</h4>
+<a name="id-1.5.9.6.6.5.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-GrlPls.html grilo-0.2.10/doc/grilo/html/grilo-GrlPls.html
--- grilo-0.2.9/doc/grilo/html/grilo-GrlPls.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-GrlPls.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-GrlPls.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-GrlPls.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-GrlPls.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="grilo-pls.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -68,11 +67,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-GrlPls.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-GrlPls.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -92,7 +86,7 @@
 <p>Check if a file identified by GrlMedia object is a playlist or not.
 This function does blocking I/O.</p>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.2.5"></a><h4>Parameters</h4>
+<a name="id-1.6.5.2.6.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -107,7 +101,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.2.6"></a><h4>Returns</h4>
+<a name="id-1.6.5.2.6.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a GrlMedia is recognized as a playlist.</p>
 <p></p>
 </div>
@@ -136,7 +130,7 @@
 <p>See <a class="link" href="GrlSource.html#grl-source-browse" title="grl_source_browse ()"><code class="function">grl_source_browse()</code></a> function for additional information
 and sample code.</p>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.3.8"></a><h4>Parameters</h4>
+<a name="id-1.6.5.2.6.3.8"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -184,7 +178,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.3.9"></a><h4>Returns</h4>
+<a name="id-1.6.5.2.6.3.9"></a><h4>Returns</h4>
 <p> the operation identifier</p>
 <p></p>
 </div>
@@ -215,7 +209,7 @@
 <p>See <a class="link" href="GrlSource.html#grl-source-browse-sync" title="grl_source_browse_sync ()"><code class="function">grl_source_browse_sync()</code></a> function for additional information
 and sample code.</p>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.4.9"></a><h4>Parameters</h4>
+<a name="id-1.6.5.2.6.4.9"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -259,7 +253,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.5.2.7.4.10"></a><h4>Returns</h4>
+<a name="id-1.6.5.2.6.4.10"></a><h4>Returns</h4>
 <p> a <span class="type">GList</span> with <a class="link" href="GrlMedia.html" title="GrlMedia"><span class="type">GrlMedia</span></a>
 elements. After use <code class="function">g_object_unref()</code> every element and <code class="function">g_list_free()</code> the
 list. </p>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-grl-util.html grilo-0.2.10/doc/grilo/html/grilo-grl-util.html
--- grilo-0.2.9/doc/grilo/html/grilo-grl-util.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-grl-util.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-util.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-grl-util.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-grl-util.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="misc.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -68,11 +67,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-grl-util.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-grl-util.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -87,7 +81,7 @@
 <pre class="programlisting"><span class="returnvalue">GDateTime</span> *
 grl_date_time_from_iso8601 (<em class="parameter"><code>const <span class="type">gchar</span> *date</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.9.7.7.2.4"></a><h4>Parameters</h4>
+<a name="id-1.5.9.7.6.2.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -102,7 +96,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.7.7.2.5"></a><h4>Returns</h4>
+<a name="id-1.5.9.7.6.2.5"></a><h4>Returns</h4>
 <p> a newly-allocated <span class="type">GDateTime</span> set to the time corresponding to
 <em class="parameter"><code>date</code></em>
 , or <code class="literal">NULL</code> if <em class="parameter"><code>date</code></em>
@@ -120,7 +114,7 @@
 <p>Returns a <span class="type">GList</span> containing the va_list pointers. Use <em class="parameter"><code>NULL</code></em>
  to finalize them,</p>
 <div class="refsect3">
-<a name="id-1.5.9.7.7.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.7.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -142,7 +136,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.7.7.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.7.6.3.6"></a><h4>Returns</h4>
 <p> a <span class="type">GList</span>.</p>
 <p></p>
 </div>
@@ -180,7 +174,7 @@
 . If the later
 is also 0, then page size will be <span class="type">G_MAXUINT</span>.</p>
 <div class="refsect3">
-<a name="id-1.5.9.7.7.4.9"></a><h4>Parameters</h4>
+<a name="id-1.5.9.7.6.4.9"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-Multiple.html grilo-0.2.10/doc/grilo/html/grilo-Multiple.html
--- grilo-0.2.9/doc/grilo/html/grilo-Multiple.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-Multiple.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#grilo-Multiple.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#grilo-Multiple.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#grilo-Multiple.description" class="shortcut">Description</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="multiple.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -68,11 +67,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="grilo-Multiple.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">
-</pre>
-</div>
-<div class="refsect1">
 <a name="grilo-Multiple.includes"></a><h2>Includes</h2>
 <pre class="synopsis">#include &lt;grilo.h&gt;
 </pre>
@@ -101,7 +95,7 @@
 .</p>
 <p>This method is asynchronous.</p>
 <div class="refsect3">
-<a name="id-1.5.6.2.7.2.6"></a><h4>Parameters</h4>
+<a name="id-1.5.6.2.6.2.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -158,7 +152,7 @@
 plugin (see <a class="link" href="GrlSource.html#grl-source-search" title="grl_source_search ()"><span class="type">grl_source_search</span></a> for more details).</p>
 <p>This method is asynchronous.</p>
 <div class="refsect3">
-<a name="id-1.5.6.2.7.3.7"></a><h4>Parameters</h4>
+<a name="id-1.5.6.2.6.3.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -202,7 +196,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.6.2.7.3.8"></a><h4>Returns</h4>
+<a name="id-1.5.6.2.6.3.8"></a><h4>Returns</h4>
 <p> the operation identifier</p>
 <p></p>
 </div>
@@ -222,7 +216,7 @@
 .</p>
 <p>This method is synchronous.</p>
 <div class="refsect3">
-<a name="id-1.5.6.2.7.4.6"></a><h4>Parameters</h4>
+<a name="id-1.5.6.2.6.4.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -262,7 +256,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.6.2.7.4.7"></a><h4>Returns</h4>
+<a name="id-1.5.6.2.6.4.7"></a><h4>Returns</h4>
 <p> a list with <a class="link" href="GrlMedia.html" title="GrlMedia"><span class="type">GrlMedia</span></a> elements. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GrlMedia][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-net.html grilo-0.2.10/doc/grilo/html/grilo-net.html
--- grilo-0.2.9/doc/grilo/html/grilo-net.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-net.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/grilo-pls.html grilo-0.2.10/doc/grilo/html/grilo-pls.html
--- grilo-0.2.9/doc/grilo/html/grilo-pls.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/grilo-pls.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlCaps.html grilo-0.2.10/doc/grilo/html/GrlCaps.html
--- grilo-0.2.9/doc/grilo/html/GrlCaps.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlCaps.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlCaps.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlCaps.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlCaps.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlConfig.html grilo-0.2.10/doc/grilo/html/GrlConfig.html
--- grilo-0.2.9/doc/grilo/html/GrlConfig.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlConfig.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlConfig.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlConfig.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlConfig.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlData.html grilo-0.2.10/doc/grilo/html/GrlData.html
--- grilo-0.2.9/doc/grilo/html/GrlData.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlData.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlData.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlData.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlData.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -713,13 +713,18 @@
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="parameter_name"><p>data</p></td>
-<td class="parameter_description"><p>data to inspect
-<em class="parameter"><code>key</code></em>
-(type GrlKeyID): key to use</p></td>
+<td class="parameter_description"><p>data to inspect</p></td>
 <td class="parameter_annotations"> </td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="parameter_name"><p>key</p></td>
+<td class="parameter_description"><p> key to use. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GrlKeyID]</span></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect3">
diff -Nru grilo-0.2.9/doc/grilo/html/GrlMediaAudio.html grilo-0.2.10/doc/grilo/html/GrlMediaAudio.html
--- grilo-0.2.9/doc/grilo/html/GrlMediaAudio.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlMediaAudio.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlMediaAudio.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlMediaAudio.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlMediaAudio.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlMediaBox.html grilo-0.2.10/doc/grilo/html/GrlMediaBox.html
--- grilo-0.2.9/doc/grilo/html/GrlMediaBox.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlMediaBox.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlMediaBox.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlMediaBox.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlMediaBox.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlMedia.html grilo-0.2.10/doc/grilo/html/GrlMedia.html
--- grilo-0.2.9/doc/grilo/html/GrlMedia.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlMedia.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlMedia.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlMedia.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlMedia.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -382,6 +382,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<span class="returnvalue">gint</span>
+</td>
+<td class="function_name">
+<a class="link" href="GrlMedia.html#grl-media-get-size" title="grl_media_get_size ()">grl_media_get_size</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
@@ -622,6 +630,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="GrlMedia.html#grl-media-set-size" title="grl_media_set_size ()">grl_media_set_size</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a class="link" href="GrlMedia.html" title="GrlMedia"><span class="returnvalue">GrlMedia</span></a> *
 </td>
 <td class="function_name">
@@ -2155,13 +2171,40 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="grl-media-get-size"></a><h3>grl_media_get_size ()</h3>
+<pre class="programlisting"><span class="returnvalue">gint</span>
+grl_media_get_size (<em class="parameter"><code><a class="link" href="GrlMedia.html" title="GrlMedia"><span class="type">GrlMedia</span></a> *media</code></em>);</pre>
+<div class="refsect3">
+<a name="id-1.5.8.4.8.48.4"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>media</p></td>
+<td class="parameter_description"><p>the media object</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.5.8.4.8.48.5"></a><h4>Returns</h4>
+<p> the media's size, in bytes or -1 if unknown.</p>
+<p></p>
+</div>
+<p class="since">Since 0.2.10</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="grl-media-serialize"></a><h3>grl_media_serialize ()</h3>
 <pre class="programlisting"><span class="returnvalue">gchar</span> *
 grl_media_serialize (<em class="parameter"><code><a class="link" href="GrlMedia.html" title="GrlMedia"><span class="type">GrlMedia</span></a> *media</code></em>);</pre>
 <p>Serializes a GrlMedia into a string. It does a basic serialization.</p>
 <p>See <a class="link" href="GrlMedia.html#grl-media-serialize-extended" title="grl_media_serialize_extended ()"><code class="function">grl_media_serialize_extended()</code></a> to get more serialization approaches.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.48.6"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.49.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2176,7 +2219,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.48.7"></a><h4>Returns</h4>
+<a name="id-1.5.8.4.8.49.7"></a><h4>Returns</h4>
 <p> serialized media</p>
 <p></p>
 </div>
@@ -2197,7 +2240,7 @@
  with the properties to consider in serialization (id and source are
 always considered).</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.49.7"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.50.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2224,7 +2267,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.49.8"></a><h4>Returns</h4>
+<a name="id-1.5.8.4.8.50.8"></a><h4>Returns</h4>
 <p> serialized media</p>
 <p></p>
 </div>
@@ -2238,7 +2281,7 @@
                       <em class="parameter"><code>const <span class="type">gchar</span> *author</code></em>);</pre>
 <p>Set the media's author</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.50.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.51.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2272,7 +2315,7 @@
 age certificate. Use <a class="link" href="GrlMedia.html#grl-media-set-region-data" title="grl_media_set_region_data ()"><code class="function">grl_media_set_region_data()</code></a> to
 set other age certificates.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.51.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.52.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2303,7 +2346,7 @@
                              <em class="parameter"><code>const <span class="type">GDateTime</span> *creation_date</code></em>);</pre>
 <p>Set the creation_date of the media</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.52.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.53.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2334,7 +2377,7 @@
                            <em class="parameter"><code>const <span class="type">gchar</span> *description</code></em>);</pre>
 <p>Set the media's description</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.53.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.54.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2365,7 +2408,7 @@
                         <em class="parameter"><code><span class="type">gint</span> duration</code></em>);</pre>
 <p>Set the media's duration</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.54.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.55.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2396,7 +2439,7 @@
                                <em class="parameter"><code>const <span class="type">gchar</span> *player</code></em>);</pre>
 <p>Set the location of a player for the media (usually a flash player)</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.55.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.56.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2427,7 +2470,7 @@
                             <em class="parameter"><code>const <span class="type">gchar</span> *url</code></em>);</pre>
 <p>Set an external location where users can play the media</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.56.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.57.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2458,7 +2501,7 @@
                          <em class="parameter"><code><span class="type">gboolean</span> favourite</code></em>);</pre>
 <p>Set if the media is favourite or not</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.57.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.58.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2489,7 +2532,7 @@
                   <em class="parameter"><code>const <span class="type">gchar</span> *id</code></em>);</pre>
 <p>Set the media identifier</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.58.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.59.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2521,7 +2564,7 @@
 <p>Sets the keyword describing the <em class="parameter"><code>media</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.59.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.60.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2552,7 +2595,7 @@
                            <em class="parameter"><code>const <span class="type">gchar</span> *last_played</code></em>);</pre>
 <p>Set the media last played date</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.60.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.61.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2583,7 +2626,7 @@
                              <em class="parameter"><code><span class="type">gint</span> last_position</code></em>);</pre>
 <p>Set the media last played position</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.61.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.62.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2614,7 +2657,7 @@
                        <em class="parameter"><code>const <span class="type">gchar</span> *license</code></em>);</pre>
 <p>Set the media license</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.62.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.63.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2645,7 +2688,7 @@
                     <em class="parameter"><code>const <span class="type">gchar</span> *mime</code></em>);</pre>
 <p>Set the media's mime-type</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.63.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.64.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2676,7 +2719,7 @@
                                  <em class="parameter"><code>const <span class="type">GDateTime</span> *modification_date</code></em>);</pre>
 <p>Set the modification date of the media</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.64.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.65.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2707,7 +2750,7 @@
                           <em class="parameter"><code><span class="type">gint</span> play_count</code></em>);</pre>
 <p>Set the media play count</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.65.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.66.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2739,7 +2782,7 @@
 <p>Set the publication date of <em class="parameter"><code>media</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.66.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.67.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2772,7 +2815,7 @@
 <p>This method receives a rating and its scale and normalizes it on a scale
 from 0...5 to match the usual five-star rating.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.67.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.68.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2810,7 +2853,7 @@
  where <em class="parameter"><code>media</code></em>
  was published.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.68.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.69.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2844,7 +2887,7 @@
 <p>Sets regional publication and certification information for <em class="parameter"><code>region</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.69.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.70.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2886,7 +2929,7 @@
 <p>Set the media's site. A site is a website about the media such as a
 studio's promotional website for a movie.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.70.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.71.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2917,7 +2960,7 @@
                       <em class="parameter"><code>const <span class="type">gchar</span> *source</code></em>);</pre>
 <p>Set the media's source</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.71.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.72.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2948,7 +2991,7 @@
                       <em class="parameter"><code>const <span class="type">gchar</span> *studio</code></em>);</pre>
 <p>Set the media studio</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.72.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.73.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2979,7 +3022,7 @@
                          <em class="parameter"><code>const <span class="type">gchar</span> *thumbnail</code></em>);</pre>
 <p>Set the media's thumbnail URL</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.73.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.74.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3011,7 +3054,7 @@
                                 <em class="parameter"><code><span class="type">gsize</span> size</code></em>);</pre>
 <p>Set the media's binary thumbnail</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.74.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.75.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3047,7 +3090,7 @@
                      <em class="parameter"><code>const <span class="type">gchar</span> *title</code></em>);</pre>
 <p>Set the media's title</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.75.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.76.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3078,7 +3121,7 @@
                    <em class="parameter"><code>const <span class="type">gchar</span> *url</code></em>);</pre>
 <p>Set the media's URL</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.76.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.77.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3110,7 +3153,7 @@
                         <em class="parameter"><code>const <span class="type">gchar</span> *mime</code></em>);</pre>
 <p>Set the media's URL and its mime-type.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.77.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.78.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3141,12 +3184,43 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="grl-media-set-size"></a><h3>grl_media_set_size ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+grl_media_set_size (<em class="parameter"><code><a class="link" href="GrlMedia.html" title="GrlMedia"><span class="type">GrlMedia</span></a> *media</code></em>,
+                    <em class="parameter"><code><span class="type">gint</span> size</code></em>);</pre>
+<p>Set the size of the media</p>
+<div class="refsect3">
+<a name="id-1.5.8.4.8.79.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>media</p></td>
+<td class="parameter_description"><p>the media</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>size</p></td>
+<td class="parameter_description"><p>the size in bytes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since 0.2.10</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="grl-media-unserialize"></a><h3>grl_media_unserialize ()</h3>
 <pre class="programlisting"><a class="link" href="GrlMedia.html" title="GrlMedia"><span class="returnvalue">GrlMedia</span></a> *
 grl_media_unserialize (<em class="parameter"><code>const <span class="type">gchar</span> *serial</code></em>);</pre>
 <p>Unserializes a GrlMedia.</p>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.78.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.4.8.80.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3161,7 +3235,7 @@
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.8.4.8.78.6"></a><h4>Returns</h4>
+<a name="id-1.5.8.4.8.80.6"></a><h4>Returns</h4>
 <p> the GrlMedia from the serial. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlMediaImage.html grilo-0.2.10/doc/grilo/html/GrlMediaImage.html
--- grilo-0.2.9/doc/grilo/html/GrlMediaImage.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlMediaImage.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlMediaImage.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlMediaImage.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlMediaImage.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlMediaVideo.html grilo-0.2.10/doc/grilo/html/GrlMediaVideo.html
--- grilo-0.2.9/doc/grilo/html/GrlMediaVideo.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlMediaVideo.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlMediaVideo.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlMediaVideo.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlMediaVideo.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlOperationOptions.html grilo-0.2.10/doc/grilo/html/GrlOperationOptions.html
--- grilo-0.2.9/doc/grilo/html/GrlOperationOptions.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlOperationOptions.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlOperationOptions.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlOperationOptions.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlOperationOptions.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlPlugin.html grilo-0.2.10/doc/grilo/html/GrlPlugin.html
--- grilo-0.2.9/doc/grilo/html/GrlPlugin.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlPlugin.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,11 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlPlugin.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#GrlPlugin.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlPlugin.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#GrlPlugin.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#GrlPlugin.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlRegistry.html grilo-0.2.10/doc/grilo/html/GrlRegistry.html
--- grilo-0.2.9/doc/grilo/html/GrlRegistry.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlRegistry.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,11 +12,11 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlRegistry.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#GrlRegistry.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_signals"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlRegistry.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#GrlRegistry.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#GrlRegistry.signals" class="shortcut">Signals</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -266,6 +266,11 @@
 <tbody>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
+<td class="signal_name"><a class="link" href="GrlRegistry.html#GrlRegistry-metadata-key-added" title="The “metadata-key-added” signal">metadata-key-added</a></td>
+<td class="signal_flags">Action</td>
+</tr>
+<tr>
+<td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GrlRegistry.html#GrlRegistry-source-added" title="The “source-added” signal">source-added</a></td>
 <td class="signal_flags">Action</td>
 </tr>
@@ -1529,6 +1534,44 @@
 <div class="refsect1">
 <a name="GrlRegistry.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2">
+<a name="GrlRegistry-metadata-key-added"></a><h3>The <code class="literal">“metadata-key-added”</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+user_function (<a class="link" href="GrlRegistry.html" title="GrlRegistry"><span class="type">GrlRegistry</span></a> *registry,
+               <span class="type">gchar</span>       *key,
+               <span class="type">gpointer</span>     user_data)</pre>
+<p>Signals that a new metadata key has been registered.</p>
+<div class="refsect3">
+<a name="id-1.5.3.2.11.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>registry</p></td>
+<td class="parameter_description"><p>the registry</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>key</p></td>
+<td class="parameter_description"><p>the name of the new key added</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p>Flags: Action</p>
+<p class="since">Since 0.2.10</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GrlRegistry-source-added"></a><h3>The <code class="literal">“source-added”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="GrlRegistry.html" title="GrlRegistry"><span class="type">GrlRegistry</span></a> *registry,
@@ -1536,7 +1579,7 @@
                <span class="type">gpointer</span>     user_data)</pre>
 <p>Signals that a source has been added to the registry.</p>
 <div class="refsect3">
-<a name="id-1.5.3.2.11.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.3.2.11.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1574,7 +1617,7 @@
                <span class="type">gpointer</span>     user_data)</pre>
 <p>Signals that a source has been removed from the registry.</p>
 <div class="refsect3">
-<a name="id-1.5.3.2.11.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.3.2.11.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff -Nru grilo-0.2.9/doc/grilo/html/GrlRelatedKeys.html grilo-0.2.10/doc/grilo/html/GrlRelatedKeys.html
--- grilo-0.2.9/doc/grilo/html/GrlRelatedKeys.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlRelatedKeys.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,10 +12,10 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlRelatedKeys.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlRelatedKeys.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
                   <a href="#GrlRelatedKeys.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/GrlSource.html grilo-0.2.10/doc/grilo/html/GrlSource.html
--- grilo-0.2.9/doc/grilo/html/GrlSource.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/GrlSource.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,12 +12,12 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
-                  <a href="#GrlSource.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
-                  <a href="#GrlSource.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties"> <span class="dim">|</span> 
-                  <a href="#GrlSource.properties" class="shortcut">Properties</a></span><span id="nav_signals"> <span class="dim">|</span> 
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#GrlSource.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#GrlSource.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#GrlSource.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#GrlSource.signals" class="shortcut">Signals</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -409,6 +409,11 @@
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
 <tr>
+<td class="property_type"><span class="type">GStrv</span></td>
+<td class="property_name"><a class="link" href="GrlSource.html#GrlSource--source-tags" title="The “source-tags” property">source-tags</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
 <td class="property_type"><a class="link" href="GrlMedia.html#GrlMediaType" title="enum GrlMediaType"><span class="type">GrlMediaType</span></a></td>
 <td class="property_name"><a class="link" href="GrlSource.html#GrlSource--supported-media" title="The “supported-media” property">supported-media</a></td>
 <td class="property_flags">Read / Write / Construct</td>
@@ -3318,6 +3323,49 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="GrlSource--source-tags"></a><h3>The <code class="literal">“source-tags”</code> property</h3>
+<pre class="programlisting">  “source-tags”              <span class="type">GStrv</span></pre>
+<p>A string array of tags relevant this source.</p>
+<p>The tags are arbitrary, and applications should just pass over the tags
+it does not understand. Applications would usually use this to either
+group sources together, or hide certain sources: a radio application
+would filter for <a class="link" href="GrlMedia.html#GRL-MEDIA-TYPE-AUDIO:CAPS"><code class="literal">GRL_MEDIA_TYPE_AUDIO</code></a> in GrlSource::supported-media as
+well as "radio" being listed in the tags.</p>
+<p>To avoid irrelevant content being listed in applications, sources
+such as generic video sites should not be tagged as "cinema" or
+"tv" as they contain a lot of content that's not either of those.</p>
+<p>This is a list of commonly used values:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>"cinema", or "tv"
+The content served is from cinema or TV sources. For example, a
+source for movie trailers would select the former, a source for
+streaming live TV would select the latter.</p></li>
+<li class="listitem"><p>"radio"
+The content served is from streaming radios.</p></li>
+<li class="listitem"><p>"music"
+The content served is music, for example, music stores such as
+Jamendo or Magnatune.</p></li>
+<li class="listitem"><p>"country:country-code"
+The content is mostly relevant to users from a particular country,
+such as a national broadcaster. For example, BBC content would be
+tagged as "country:uk". Country codes should be an ISO-639-1 or
+ISO-639-2 code.</p></li>
+<li class="listitem"><p>"protocol:protocol-name"
+The content browsing or searching uses a particular protocol, such
+as DLNA/UPnP or DMAP/DAAP. This makes it easier to whitelist or
+blacklist sources rather than matching the implementation specific
+source ID. Examples are "protocol:dlna" and "protocol:dmap".</p></li>
+<li class="listitem"><p>"localhost", or "localuser"
+The content is served from the machine the application is running on,
+or by an application the user is running. Applications might choose to
+avoid showing the user's own data in their interfaces, or integrate it
+in the user's local collection.</p></li>
+</ul></div>
+<p>Flags: Read / Write / Construct</p>
+<p class="since">Since 0.2.10</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GrlSource--supported-media"></a><h3>The <code class="literal">“supported-media”</code> property</h3>
 <pre class="programlisting">  “supported-media”          <a class="link" href="GrlMedia.html#GrlMediaType" title="enum GrlMediaType"><span class="type">GrlMediaType</span></a></pre>
 <p>List of supported media types by this source.</p>
diff -Nru grilo-0.2.9/doc/grilo/html/index.sgml grilo-0.2.10/doc/grilo/html/index.sgml
--- grilo-0.2.9/doc/grilo/html/index.sgml	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/index.sgml	2014-03-20 09:13:39.000000000 +0000
@@ -2,7 +2,6 @@
 <ONLINE href="http://git.gnome.org/browse/grilo-plugins">
 <ANCHOR id="grilo-grilo" href="grilo/grilo-grilo.html">
 <ANCHOR id="grilo-grilo.functions" href="grilo/grilo-grilo.html#grilo-grilo.functions">
-<ANCHOR id="grilo-grilo.object-hierarchy" href="grilo/grilo-grilo.html#grilo-grilo.object-hierarchy">
 <ANCHOR id="grilo-grilo.includes" href="grilo/grilo-grilo.html#grilo-grilo.includes">
 <ANCHOR id="grilo-grilo.description" href="grilo/grilo-grilo.html#grilo-grilo.description">
 <ANCHOR id="grilo-grilo.functions_details" href="grilo/grilo-grilo.html#grilo-grilo.functions_details">
@@ -53,6 +52,7 @@
 <ANCHOR id="GRL-PLUGIN-PATH-VAR:CAPS" href="grilo/GrlRegistry.html#GRL-PLUGIN-PATH-VAR:CAPS">
 <ANCHOR id="GRL-PLUGIN-RANKS-VAR:CAPS" href="grilo/GrlRegistry.html#GRL-PLUGIN-RANKS-VAR:CAPS">
 <ANCHOR id="GrlRegistry.signal-details" href="grilo/GrlRegistry.html#GrlRegistry.signal-details">
+<ANCHOR id="GrlRegistry-metadata-key-added" href="grilo/GrlRegistry.html#GrlRegistry-metadata-key-added">
 <ANCHOR id="GrlRegistry-source-added" href="grilo/GrlRegistry.html#GrlRegistry-source-added">
 <ANCHOR id="GrlRegistry-source-removed" href="grilo/GrlRegistry.html#GrlRegistry-source-removed">
 <ANCHOR id="GrlRegistry.see-also" href="grilo/GrlRegistry.html#GrlRegistry.see-also">
@@ -160,6 +160,7 @@
 <ANCHOR id="GrlSource--source-icon" href="grilo/GrlSource.html#GrlSource--source-icon">
 <ANCHOR id="GrlSource--source-id" href="grilo/GrlSource.html#GrlSource--source-id">
 <ANCHOR id="GrlSource--source-name" href="grilo/GrlSource.html#GrlSource--source-name">
+<ANCHOR id="GrlSource--source-tags" href="grilo/GrlSource.html#GrlSource--source-tags">
 <ANCHOR id="GrlSource--supported-media" href="grilo/GrlSource.html#GrlSource--supported-media">
 <ANCHOR id="GrlSource.signal-details" href="grilo/GrlSource.html#GrlSource.signal-details">
 <ANCHOR id="GrlSource-content-changed" href="grilo/GrlSource.html#GrlSource-content-changed">
@@ -219,7 +220,6 @@
 <ANCHOR id="GrlOperationOptions.see-also" href="grilo/GrlOperationOptions.html#GrlOperationOptions.see-also">
 <ANCHOR id="grilo-Multiple" href="grilo/grilo-Multiple.html">
 <ANCHOR id="grilo-Multiple.functions" href="grilo/grilo-Multiple.html#grilo-Multiple.functions">
-<ANCHOR id="grilo-Multiple.object-hierarchy" href="grilo/grilo-Multiple.html#grilo-Multiple.object-hierarchy">
 <ANCHOR id="grilo-Multiple.includes" href="grilo/grilo-Multiple.html#grilo-Multiple.includes">
 <ANCHOR id="grilo-Multiple.description" href="grilo/grilo-Multiple.html#grilo-Multiple.description">
 <ANCHOR id="grilo-Multiple.functions_details" href="grilo/grilo-Multiple.html#grilo-Multiple.functions_details">
@@ -405,6 +405,7 @@
 <ANCHOR id="grl-media-get-url" href="grilo/GrlMedia.html#grl-media-get-url">
 <ANCHOR id="grl-media-get-url-data" href="grilo/GrlMedia.html#grl-media-get-url-data">
 <ANCHOR id="grl-media-get-url-data-nth" href="grilo/GrlMedia.html#grl-media-get-url-data-nth">
+<ANCHOR id="grl-media-get-size" href="grilo/GrlMedia.html#grl-media-get-size">
 <ANCHOR id="grl-media-serialize" href="grilo/GrlMedia.html#grl-media-serialize">
 <ANCHOR id="grl-media-serialize-extended" href="grilo/GrlMedia.html#grl-media-serialize-extended">
 <ANCHOR id="grl-media-set-author" href="grilo/GrlMedia.html#grl-media-set-author">
@@ -435,6 +436,7 @@
 <ANCHOR id="grl-media-set-title" href="grilo/GrlMedia.html#grl-media-set-title">
 <ANCHOR id="grl-media-set-url" href="grilo/GrlMedia.html#grl-media-set-url">
 <ANCHOR id="grl-media-set-url-data" href="grilo/GrlMedia.html#grl-media-set-url-data">
+<ANCHOR id="grl-media-set-size" href="grilo/GrlMedia.html#grl-media-set-size">
 <ANCHOR id="grl-media-unserialize" href="grilo/GrlMedia.html#grl-media-unserialize">
 <ANCHOR id="GrlMedia.other_details" href="grilo/GrlMedia.html#GrlMedia.other_details">
 <ANCHOR id="GrlMedia-struct" href="grilo/GrlMedia.html#GrlMedia-struct">
@@ -567,7 +569,6 @@
 <ANCHOR id="grilo-grl-metadata-key" href="grilo/grilo-grl-metadata-key.html">
 <ANCHOR id="grilo-grl-metadata-key.functions" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.functions">
 <ANCHOR id="grilo-grl-metadata-key.other" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.other">
-<ANCHOR id="grilo-grl-metadata-key.object-hierarchy" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.object-hierarchy">
 <ANCHOR id="grilo-grl-metadata-key.includes" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.includes">
 <ANCHOR id="grilo-grl-metadata-key.description" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.description">
 <ANCHOR id="grilo-grl-metadata-key.functions_details" href="grilo/grilo-grl-metadata-key.html#grilo-grl-metadata-key.functions_details">
@@ -637,7 +638,6 @@
 <ANCHOR id="grilo-grl-log" href="grilo/grilo-grl-log.html">
 <ANCHOR id="grilo-grl-log.functions" href="grilo/grilo-grl-log.html#grilo-grl-log.functions">
 <ANCHOR id="grilo-grl-log.other" href="grilo/grilo-grl-log.html#grilo-grl-log.other">
-<ANCHOR id="grilo-grl-log.object-hierarchy" href="grilo/grilo-grl-log.html#grilo-grl-log.object-hierarchy">
 <ANCHOR id="grilo-grl-log.includes" href="grilo/grilo-grl-log.html#grilo-grl-log.includes">
 <ANCHOR id="grilo-grl-log.description" href="grilo/grilo-grl-log.html#grilo-grl-log.description">
 <ANCHOR id="grilo-grl-log.functions_details" href="grilo/grilo-grl-log.html#grilo-grl-log.functions_details">
@@ -662,7 +662,6 @@
 <ANCHOR id="GRL-LOG-DOMAIN-DEFAULT:CAPS" href="grilo/grilo-grl-log.html#GRL-LOG-DOMAIN-DEFAULT:CAPS">
 <ANCHOR id="grilo-grl-error" href="grilo/grilo-grl-error.html">
 <ANCHOR id="grilo-grl-error.other" href="grilo/grilo-grl-error.html#grilo-grl-error.other">
-<ANCHOR id="grilo-grl-error.object-hierarchy" href="grilo/grilo-grl-error.html#grilo-grl-error.object-hierarchy">
 <ANCHOR id="grilo-grl-error.includes" href="grilo/grilo-grl-error.html#grilo-grl-error.includes">
 <ANCHOR id="grilo-grl-error.description" href="grilo/grilo-grl-error.html#grilo-grl-error.description">
 <ANCHOR id="grilo-grl-error.functions_details" href="grilo/grilo-grl-error.html#grilo-grl-error.functions_details">
@@ -671,7 +670,6 @@
 <ANCHOR id="GRL-CORE-ERROR:CAPS" href="grilo/grilo-grl-error.html#GRL-CORE-ERROR:CAPS">
 <ANCHOR id="grilo-grl-definitions" href="grilo/grilo-grl-definitions.html">
 <ANCHOR id="grilo-grl-definitions.other" href="grilo/grilo-grl-definitions.html#grilo-grl-definitions.other">
-<ANCHOR id="grilo-grl-definitions.object-hierarchy" href="grilo/grilo-grl-definitions.html#grilo-grl-definitions.object-hierarchy">
 <ANCHOR id="grilo-grl-definitions.includes" href="grilo/grilo-grl-definitions.html#grilo-grl-definitions.includes">
 <ANCHOR id="grilo-grl-definitions.description" href="grilo/grilo-grl-definitions.html#grilo-grl-definitions.description">
 <ANCHOR id="grilo-grl-definitions.functions_details" href="grilo/grilo-grl-definitions.html#grilo-grl-definitions.functions_details">
@@ -680,7 +678,6 @@
 <ANCHOR id="GRL-SOURCE-REMAINING-UNKNOWN:CAPS" href="grilo/grilo-grl-definitions.html#GRL-SOURCE-REMAINING-UNKNOWN:CAPS">
 <ANCHOR id="grilo-grl-operation" href="grilo/grilo-grl-operation.html">
 <ANCHOR id="grilo-grl-operation.functions" href="grilo/grilo-grl-operation.html#grilo-grl-operation.functions">
-<ANCHOR id="grilo-grl-operation.object-hierarchy" href="grilo/grilo-grl-operation.html#grilo-grl-operation.object-hierarchy">
 <ANCHOR id="grilo-grl-operation.includes" href="grilo/grilo-grl-operation.html#grilo-grl-operation.includes">
 <ANCHOR id="grilo-grl-operation.description" href="grilo/grilo-grl-operation.html#grilo-grl-operation.description">
 <ANCHOR id="grilo-grl-operation.functions_details" href="grilo/grilo-grl-operation.html#grilo-grl-operation.functions_details">
@@ -691,7 +688,6 @@
 <ANCHOR id="grilo-grl-operation.other_details" href="grilo/grilo-grl-operation.html#grilo-grl-operation.other_details">
 <ANCHOR id="grilo-grl-util" href="grilo/grilo-grl-util.html">
 <ANCHOR id="grilo-grl-util.functions" href="grilo/grilo-grl-util.html#grilo-grl-util.functions">
-<ANCHOR id="grilo-grl-util.object-hierarchy" href="grilo/grilo-grl-util.html#grilo-grl-util.object-hierarchy">
 <ANCHOR id="grilo-grl-util.includes" href="grilo/grilo-grl-util.html#grilo-grl-util.includes">
 <ANCHOR id="grilo-grl-util.description" href="grilo/grilo-grl-util.html#grilo-grl-util.description">
 <ANCHOR id="grilo-grl-util.functions_details" href="grilo/grilo-grl-util.html#grilo-grl-util.functions_details">
@@ -702,7 +698,6 @@
 <ANCHOR id="grilo-GrlNetWc" href="grilo/grilo-GrlNetWc.html">
 <ANCHOR id="grilo-GrlNetWc.functions" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.functions">
 <ANCHOR id="grilo-GrlNetWc.other" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.other">
-<ANCHOR id="grilo-GrlNetWc.object-hierarchy" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.object-hierarchy">
 <ANCHOR id="grilo-GrlNetWc.includes" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.includes">
 <ANCHOR id="grilo-GrlNetWc.description" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.description">
 <ANCHOR id="grilo-GrlNetWc.functions_details" href="grilo/grilo-GrlNetWc.html#grilo-GrlNetWc.functions_details">
@@ -724,7 +719,6 @@
 <ANCHOR id="GRL-NET-WC-ERROR:CAPS" href="grilo/grilo-GrlNetWc.html#GRL-NET-WC-ERROR:CAPS">
 <ANCHOR id="grilo-GrlPls" href="grilo/grilo-GrlPls.html">
 <ANCHOR id="grilo-GrlPls.functions" href="grilo/grilo-GrlPls.html#grilo-GrlPls.functions">
-<ANCHOR id="grilo-GrlPls.object-hierarchy" href="grilo/grilo-GrlPls.html#grilo-GrlPls.object-hierarchy">
 <ANCHOR id="grilo-GrlPls.includes" href="grilo/grilo-GrlPls.html#grilo-GrlPls.includes">
 <ANCHOR id="grilo-GrlPls.description" href="grilo/grilo-GrlPls.html#grilo-GrlPls.description">
 <ANCHOR id="grilo-GrlPls.functions_details" href="grilo/grilo-GrlPls.html#grilo-GrlPls.functions_details">
diff -Nru grilo-0.2.9/doc/grilo/html/misc.html grilo-0.2.10/doc/grilo/html/misc.html
--- grilo-0.2.9/doc/grilo/html/misc.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/misc.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/multiple.html grilo-0.2.10/doc/grilo/html/multiple.html
--- grilo-0.2.9/doc/grilo/html/multiple.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/multiple.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/plugin-management.html grilo-0.2.10/doc/grilo/html/plugin-management.html
--- grilo-0.2.9/doc/grilo/html/plugin-management.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/plugin-management.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/pr01.html grilo-0.2.10/doc/grilo/html/pr01.html
--- grilo-0.2.9/doc/grilo/html/pr01.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/pr01.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/rn01.html grilo-0.2.10/doc/grilo/html/rn01.html
--- grilo-0.2.9/doc/grilo/html/rn01.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/rn01.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/rn02.html grilo-0.2.10/doc/grilo/html/rn02.html
--- grilo-0.2.9/doc/grilo/html/rn02.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/rn02.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/rn03.html grilo-0.2.10/doc/grilo/html/rn03.html
--- grilo-0.2.9/doc/grilo/html/rn03.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/rn03.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/rn04.html grilo-0.2.10/doc/grilo/html/rn04.html
--- grilo-0.2.9/doc/grilo/html/rn04.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/rn04.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
diff -Nru grilo-0.2.9/doc/grilo/html/sources.html grilo-0.2.10/doc/grilo/html/sources.html
--- grilo-0.2.9/doc/grilo/html/sources.html	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/sources.html	2014-03-20 09:13:39.000000000 +0000
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="rn03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
diff -Nru grilo-0.2.9/doc/grilo/html/style.css grilo-0.2.10/doc/grilo/html/style.css
--- grilo-0.2.9/doc/grilo/html/style.css	2014-02-18 14:17:01.000000000 +0000
+++ grilo-0.2.10/doc/grilo/html/style.css	2014-03-20 09:13:39.000000000 +0000
@@ -30,127 +30,6 @@
   vertical-align: top;
 }
 
-@media screen {
-  sup a.footnote
-  {
-    position: relative;
-    top: 0em ! important;
-  }
-  /* this is needed so that the local anchors are displayed below the naviagtion */
-  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
-  {
-    display: inline-block;
-    position: relative;
-    top:-5em;
-  }
-  /* this seems to be a bug in the xsl style sheets when generating indexes */
-  div.index div.index
-  {
-    top: 0em;
-  }
-  /* make space for the fixed navigation bar and add space at the bottom so that
-   * link targets appear somewhat close to top
-   */
-  body
-  {
-    padding-top: 5em;
-    padding-bottom: 500px;
-    max-width: 60em;
-  }
-  p
-  {
-    max-width: 60em;
-  }
-  /* style and size the navigation bar */
-  table.navigation#top
-  {
-    position: fixed;
-    background: #e2e2e2;
-    border-bottom: solid 1px #babdb6;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-    z-index: 10;
-  }
-  .navigation a, .navigation a:visited
-  {
-    /* tango:sky blue 3 */
-    color: #204a87;
-  }
-  .navigation a:hover
-  {
-    /* tango:sky blue 2 */
-    color: #3465a4;
-  }
-  td.shortcuts
-  {
-    /* tango:sky blue 2 */
-    color: #3465a4;
-    font-size: 80%;
-    white-space: nowrap;
-  }
-  td.shortcuts .dim
-  {
-    color: #babdb6;
-  }
-}
-@media screen and (min-width: 60em) {
-  /* screen larger than 60em */
-  body { margin: auto; }
-}
-@media screen and (max-width: 60em) {
-  /* screen less than 60em */
-  #nav_hierarchy { display: none; }
-  #nav_interfaces { display: none; }
-  #nav_prerequisites { display: none; }
-  #nav_derived_interfaces { display: none; }
-  #nav_implementations { display: none; }
-  #nav_child_properties { display: none; }
-  #nav_style_properties { display: none; }
-  #nav_index { display: none; }
-  #nav_glossary { display: none; }
-  .gallery_image { display: none; }
-  .property_flags { display: none; }
-  .signal_flags { display: none; }
-  .parameter_annotations { display: none; }
-  .enum_member_annotations { display: none; }
-  .struct_member_annotations { display: none; }
-  .union_member_annotations { display: none; }
-  /* now that a column is hidden, optimize space */
-  col.parameters_name { width: auto; }
-  col.parameters_description { width: auto; }
-  col.struct_members_name { width: auto; }
-  col.struct_members_description { width: auto; }
-  col.enum_members_name { width: auto; }
-  col.enum_members_description { width: auto; }
-  col.union_members_name { width: auto; }
-  col.union_members_description { width: auto; }
-}
-@media print {
-  table.navigation {
-    visibility: collapse;
-    display: none;
-  }
-  div.titlepage table.navigation {
-    visibility: visible;
-    display: table;
-    background: #e2e2e2;
-    border: solid 1px #babdb6;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-  }
-}
-
-.navigation .title
-{
-  font-size: 120%;
-}
-
 div.gallery-float
 {
   float: left;
@@ -181,7 +60,7 @@
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 20px 3px;
+  border-spacing: 1em 0.5em;
   border: none;
 }
 
@@ -239,6 +118,11 @@
  color: #729fcf;
 }
 
+td p
+{
+  margin: 0.25em;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -411,19 +295,21 @@
 
 /* code listings */
 
-.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
-.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
-.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
-.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
-.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .normal,
+.listing_code .programlisting .normal a,
+.listing_code .programlisting .number,
+.listing_code .programlisting .cbracket,
+.listing_code .programlisting .symbol     { color: #555753; }
+.listing_code .programlisting .comment,
 .listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
-.listing_code .programlisting .normal     { color: #000000; }
-.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .function,
+.listing_code .programlisting .function a,
 .listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
-.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
-.listing_code .programlisting .type       { color: #000000; }
-.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
-.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+.listing_code .programlisting .string     { color: #ad7fa8; } /* tango: plum */
+.listing_code .programlisting .keyword,
+.listing_code .programlisting .usertype,
+.listing_code .programlisting .type,
+.listing_code .programlisting .type a     { color: #4e9a06; } /* tango: chameleon 3  */
 
 .listing_frame {
   /* tango:sky blue 1 */
@@ -438,11 +324,6 @@
   padding: 0.5em;
 }
 .listing_lines {
-  /* this just adds visual clutter and
-     takes precious room from small screens */
-  display: none;
-}
-.listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
   background: rgba(114, 159, 207, 0.2);
@@ -464,3 +345,132 @@
   margin: 0px;
 }
 
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    display: inline-block;
+    position: relative;
+    top:-5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 2.5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
+    border-spacing: 5px;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    z-index: 10;
+  }
+  table.navigation#top td
+  {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:sky blue 3 */
+    color: #204a87;
+  }
+  .navigation a:hover
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+  }
+  td.shortcuts
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+  .navigation .title
+  {
+    font-size: 80%;
+    max-width: none;
+    margin: 0px;
+    font-weight: normal;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
+  .listing_lines { display: none; }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
diff -Nru grilo-0.2.9/grl-inspect.1 grilo-0.2.10/grl-inspect.1
--- grilo-0.2.9/grl-inspect.1	2013-09-08 21:06:27.000000000 +0000
+++ grilo-0.2.10/grl-inspect.1	2014-03-20 09:13:39.000000000 +0000
@@ -16,20 +16,23 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-grl-inspect \- show information about a Grilo source or plugin
+grl-inspect \- show information about Grilo sources and keys
 .SH SYNOPSIS
 .B grl-inspect
 .RI [ options ]
-.RI [ source ]
+.RI [ source | key ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B grl-inspect
 command.
 .PP
 \fBgrl-inspect\fP is a tool that prints out information on available Grilo
-sources. When executed with no SOURCE argument, grl-inspect will print
-the list of all plugins and sources. When executed with a SOURCE,
+sources and metadata keys. When executed with no SOURCE argument, grl-inspect
+will print the list of all plugins and sources. When executed with a SOURCE,
 grl-inspect will print information about that source.
+.PP
+Alternatively, using \fB-k\fP prints out information about the available
+metadata keys.
 .SH OPTIONS
 .TP
 .B \-h, \-\-help
@@ -41,6 +44,9 @@
 .B \-\-help\-all
 Show summary of all options.
 .TP
+.B \-k
+Show information about metadata keys
+.TP
 .BI \-d,\ \-\-delay " seconds"
 Wait for some seconds before showing results. Useful when plugins may
 need some time for the source discovery process (example: UPnP).
diff -Nru grilo-0.2.9/libs/net/grl-net-mock.c grilo-0.2.10/libs/net/grl-net-mock.c
--- grilo-0.2.9/libs/net/grl-net-mock.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/libs/net/grl-net-mock.c	2014-03-20 09:13:39.000000000 +0000
@@ -119,16 +119,13 @@
     g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result));
     g_object_unref (result);
     g_free (new_url);
-    if (data_file)
-      g_free (data_file);
-    if (full_path)
-      g_free (full_path);
+    g_clear_pointer (&data_file, g_free);
+    g_clear_pointer (&full_path, g_free);
+
     return;
   }
-  if (data_file)
-    g_free (data_file);
-  if (full_path)
-    g_free (full_path);
+  g_clear_pointer (&data_file, g_free);
+  g_clear_pointer (&full_path, g_free);
 
   g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result),
                                              new_url,
@@ -156,11 +153,8 @@
   }
   g_file_get_contents (full_path, content, length, &error);
 
-  if (data_file)
-    g_free (data_file);
-
-  if (full_path)
-    g_free (full_path);
+  g_clear_pointer (&data_file, g_free);
+  g_clear_pointer (&full_path, g_free);
 }
 
 void init_mock_requester (GrlNetWc *self)
@@ -206,8 +200,7 @@
 
   if (!enable_mocking) {
     g_free (config_filename);
-    g_key_file_unref (config);
-    config = NULL;
+    g_clear_pointer (&config, g_key_file_unref);
     return;
   }
 
@@ -266,17 +259,9 @@
   }
 
   if (g_atomic_int_dec_and_test (&refcount)) {
-    if (config) {
-      g_key_file_unref (config);
-    }
-
-    if (base_path) {
-      g_free (base_path);
-    }
-
-    if (ignored_parameters) {
-      g_regex_unref (ignored_parameters);
-    }
+    g_clear_pointer (&config, g_key_file_unref);
+    g_clear_pointer (&base_path, g_free);
+    g_clear_pointer (&ignored_parameters, g_regex_unref);
   }
 }
 
diff -Nru grilo-0.2.9/libs/net/grl-net-wc.c grilo-0.2.10/libs/net/grl-net-wc.c
--- grilo-0.2.9/libs/net/grl-net-wc.c	2014-02-18 11:34:46.000000000 +0000
+++ grilo-0.2.10/libs/net/grl-net-wc.c	2014-03-20 09:13:39.000000000 +0000
@@ -443,9 +443,7 @@
   struct request_clos *c = (struct request_clos *) data;
 
   g_free (c->url);
-  if (c->headers) {
-    g_hash_table_unref (c->headers);
-  }
+  g_clear_pointer (&c->headers, g_hash_table_unref);
   g_free (c);
 }
 
@@ -790,6 +788,7 @@
                                      priv->last_request.tv_sec - now.tv_sec,
                                      get_url_cb, c, request_clos_destroy);
   }
+  g_source_set_name_by_id (id, "[grl-net] get_url_cb");
 
   c->source_id = id;
   g_queue_push_head (self->priv->pending, c);
@@ -804,8 +803,7 @@
   GrlNetWcPrivate *priv = self->priv;
   struct request_res *rr = op;
 
-  if (priv->previous_data)
-    g_free (priv->previous_data);
+  g_clear_pointer (&priv->previous_data, g_free);
 
   if (is_mocked ()) {
     get_content_mocked (self, op, &(priv->previous_data), length);
@@ -921,8 +919,7 @@
                                               callback,
                                               user_data);
 
-  if (headers)
-    g_hash_table_unref (headers);
+  g_clear_pointer (&headers, g_hash_table_unref);
 }
 
 
diff -Nru grilo-0.2.9/libs/pls/grl-pls.c grilo-0.2.10/libs/pls/grl-pls.c
--- grilo-0.2.9/libs/pls/grl-pls.c	2014-02-18 12:24:04.000000000 +0000
+++ grilo-0.2.10/libs/pls/grl-pls.c	2014-03-20 09:13:39.000000000 +0000
@@ -75,6 +75,7 @@
   G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","    \
   G_FILE_ATTRIBUTE_STANDARD_TYPE ","            \
   G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","       \
+  G_FILE_ATTRIBUTE_STANDARD_SIZE ","            \
   G_FILE_ATTRIBUTE_TIME_MODIFIED ","            \
   G_FILE_ATTRIBUTE_THUMBNAIL_PATH ","           \
   G_FILE_ATTRIBUTE_THUMBNAILING_FAILED ","      \
@@ -117,36 +118,22 @@
 {
   g_return_if_fail (priv);
 
-  if (priv->cancellable) {
-    g_object_unref (priv->cancellable);
-    priv->cancellable = NULL;
-  }
-
+  g_clear_object (&priv->cancellable);
   g_free (priv);
 }
 
 static void
 grl_source_browse_spec_free (GrlSourceBrowseSpec *spec)
 {
-  if (spec->source) {
-    g_object_unref (spec->source);
-    spec->source = NULL;
-  }
-
-  if (spec->container) {
-    g_object_unref (spec->container);
-    spec->container = NULL;
-  }
+  g_clear_object (&spec->source);
+  g_clear_object (&spec->container);
 
   if (spec->keys) {
     /* TODO */
     spec->keys = NULL;
   }
 
-  if (spec->options) {
-    g_object_unref (spec->options);
-    spec->options = NULL;
-  }
+  g_clear_object (&spec->options);
 
   if (spec->user_data) {
     struct _GrlPlsPrivate *priv = (struct _GrlPlsPrivate *) spec->user_data;
@@ -833,8 +820,11 @@
   /* check if we have the entries cached or not */
   valid_entries = g_object_get_data (G_OBJECT (bs->container), GRL_DATA_PRIV_PLS_VALID_ENTRIES);
   if (valid_entries) {
+    guint id;
+
     GRL_DEBUG ("%s : using cached data bs=%p", __FUNCTION__, bs);
-    g_idle_add ((GSourceFunc) grl_pls_browse_report_results, bs);
+    id = g_idle_add ((GSourceFunc) grl_pls_browse_report_results, bs);
+    g_source_set_name_by_id (id, "[grl-pls] grl_pls_browse_report_results");
     return;
   }
 
@@ -1121,12 +1111,10 @@
   }
 
  end:
-  if (file_date)
-    g_date_time_unref (file_date);
-  if (min_date)
-    g_date_time_unref (min_date);
-  if (max_date)
-    g_date_time_unref (max_date);
+  g_clear_pointer (&file_date, g_date_time_unref);
+  g_clear_pointer (&min_date, g_date_time_unref);
+  g_clear_pointer (&max_date, g_date_time_unref);
+
   return is_media;
 }
 
@@ -1310,6 +1298,9 @@
       grl_media_set_mime (media, mime);
     }
 
+    /* Size */
+    grl_media_set_size (media, g_file_info_get_size (info));
+
     /* Title */
     str = g_strdup (g_file_info_get_display_name (info));
 
diff -Nru grilo-0.2.9/libs/pls/Makefile.am grilo-0.2.10/libs/pls/Makefile.am
--- grilo-0.2.9/libs/pls/Makefile.am	2014-02-17 16:36:43.000000000 +0000
+++ grilo-0.2.10/libs/pls/Makefile.am	2014-03-20 09:13:39.000000000 +0000
@@ -46,7 +46,7 @@
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_srcdir)/src
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src --includedir=$(top_builddir)/src
 
 introspection_sources =	\
 	$(gir_headers)	\
@@ -61,7 +61,6 @@
 	$(top_builddir)/src/lib@GRL_NAME@.la
 GrlPls_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GrlPls-@GRL_MAJORMINOR@.gir
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/src
 
 girdir = @INTROSPECTION_GIRDIR@
 gir_DATA = $(INTROSPECTION_GIRS)
diff -Nru grilo-0.2.9/libs/pls/Makefile.in grilo-0.2.10/libs/pls/Makefile.in
--- grilo-0.2.9/libs/pls/Makefile.in	2014-02-18 14:15:50.000000000 +0000
+++ grilo-0.2.10/libs/pls/Makefile.in	2014-03-20 09:13:39.000000000 +0000
@@ -405,7 +405,7 @@
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS =  \
 @HAVE_INTROSPECTION_TRUE@	GrlPls-@GRL_MAJORMINOR@.gir
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_srcdir)/src
-@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/src
+@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src --includedir=$(top_builddir)/src
 @HAVE_INTROSPECTION_TRUE@introspection_sources = \
 @HAVE_INTROSPECTION_TRUE@	$(gir_headers)	\
 @HAVE_INTROSPECTION_TRUE@	$(gir_sources)
diff -Nru grilo-0.2.9/NEWS grilo-0.2.10/NEWS
--- grilo-0.2.9/NEWS	2014-02-18 14:14:54.000000000 +0000
+++ grilo-0.2.10/NEWS	2014-03-20 09:13:39.000000000 +0000
@@ -1,3 +1,32 @@
+NEW in 0.2.10
+=============
+
+  * Increase glib requirement to 2.34 or greater
+  * Added new property in GrlSource: "source-tags"
+  * Added new signal in GrlRegistry: "metadata-key-added"
+  * Added new functions: grl_media_{set,get}_size()
+  * Added new key: GRL_METADATA_KEY_SIZE
+  * Updated man page
+  * Several fixes, including:
+    * BGO#629002 - Add GRL_METADATA_KEY_SIZE
+    * BGO#724019 - core: Add "source-tags" property
+    * BGO#724648 - Vala dependency is not correctly detected
+    * BGO#724658 - test-ui: Fix crasher on exit
+    * BGO#724660 - Warnings on exit
+    * BGO#724871 - Warning fixes
+    * BGO#725419 - core: Add names to all the timeouts and idles
+    * BGO#726197 - grilo should not ignore ${libdir} and hardcode lib64
+    * BGO#726340 - core: Add guards for public API
+  * Added/Updated support for i18n
+    * Swedish (new)
+
+  * Contributors to this release:
+    Bastien Nocera <hadess@hadess.net>
+    Juan A. Suarez Romero <jasuarez@igalia.com>
+    Marcus Lundblad <ml@update.uu.se>
+    Ryan Lortie <desrt@desrt.ca>
+
+
 NEW in 0.2.9
 ============
 
diff -Nru grilo-0.2.9/po/LINGUAS grilo-0.2.10/po/LINGUAS
--- grilo-0.2.9/po/LINGUAS	2014-02-06 12:35:05.000000000 +0000
+++ grilo-0.2.10/po/LINGUAS	2014-03-20 09:13:39.000000000 +0000
@@ -28,6 +28,7 @@
 sl
 sr
 sr@latin
+sv
 tg
 uk
 zh_CN
diff -Nru grilo-0.2.9/po/sv.po grilo-0.2.10/po/sv.po
--- grilo-0.2.9/po/sv.po	1970-01-01 00:00:00.000000000 +0000
+++ grilo-0.2.10/po/sv.po	2014-03-20 09:13:39.000000000 +0000
@@ -0,0 +1,192 @@
+# Swedish translation for grilo.
+# Copyright (C) 2014 grilo's COPYRIGHT HOLDER
+# This file is distributed under the same license as the grilo package.
+# Marcus Lundblad <ml@update.uu.se>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grilo master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=grilo&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-08 09:42+0000\n"
+"PO-Revision-Date: 2014-02-25 22:45+0100\n"
+"Last-Translator: Marcus Lundblad <ml@update.uu.se>\n"
+"Language-Team: svenska <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: ../libs/net/grl-net-mock.c:86
+msgid "No mock definition found"
+msgstr "Ingen attrappdefinition hittades"
+
+#: ../libs/net/grl-net-mock.c:98
+#, c-format
+msgid "Could not find mock content %s"
+msgstr "Kunde inte hitta attrappinnehåll %s"
+
+#: ../libs/net/grl-net-mock.c:118
+msgid "Could not access mock content"
+msgstr "Kunde inte komma åt attrappinnehåll"
+
+#: ../libs/net/grl-net-wc.c:468
+msgid "Cannot connect to the server"
+msgstr "Kan inte ansluta till servern"
+
+#: ../libs/net/grl-net-wc.c:474
+msgid "Cannot connect to the proxy server"
+msgstr "Kan inte ansluta till proxyservern"
+
+#: ../libs/net/grl-net-wc.c:481
+#, c-format
+msgid "Invalid request URI or header: %s"
+msgstr "Ogiltig fråge-URI eller huvud: %s"
+
+#: ../libs/net/grl-net-wc.c:488
+#, c-format
+msgid "Authentication required: %s"
+msgstr "Autentisering krävs: %s"
+
+#: ../libs/net/grl-net-wc.c:493
+#, c-format
+msgid "The requested resource was not found: %s"
+msgstr "Den efterfrågade resursen hittades inte: %s"
+
+#: ../libs/net/grl-net-wc.c:500
+#, c-format
+msgid "The entry has been modified since it was downloaded: %s"
+msgstr "Innehållet har ändrats sedan det laddades ner: %s"
+
+#: ../libs/net/grl-net-wc.c:506 ../libs/net/grl-net-wc.c:615
+#: ../src/grl-source.c:1736 ../src/grl-source.c:1831 ../src/grl-source.c:1974
+#: ../src/grl-source.c:2210 ../src/grl-source.c:2330
+#, c-format
+msgid "Operation was cancelled"
+msgstr "Åtgärd avbröts"
+
+#: ../libs/net/grl-net-wc.c:509
+#, c-format
+msgid "Unhandled status: %s"
+msgstr "Ohanterad status: %s"
+
+#: ../libs/net/grl-net-wc.c:619 ../libs/net/grl-net-wc.c:660
+msgid "Data not available"
+msgstr "Data ej tillgängligt"
+
+#: ../libs/net/grl-net-wc.c:713
+#, c-format
+msgid "Invalid URL %s"
+msgstr "Ogiltig plats %s"
+
+#: ../src/grilo.c:181
+msgid "Semicolon-separated paths containing Grilo plugins"
+msgstr "Semikolonavgränsade sökvägar innehållandes Grilo-insticksmoduler"
+
+#: ../src/grilo.c:183
+msgid "Colon-separated paths containing Grilo plugins"
+msgstr "Kolonavgränsade sökvägar innehållandes Grilo-insticksmoduler"
+
+#: ../src/grilo.c:186
+msgid "Colon-separated list of Grilo plugins to use"
+msgstr "Kolonavgränsad lista med Grilo-insticksmodulera att använda"
+
+#: ../src/grilo.c:191
+msgid "Grilo Options"
+msgstr "Grilo-val"
+
+#: ../src/grilo.c:192
+msgid "Show Grilo Options"
+msgstr "Visa Grilo-val"
+
+#: ../src/grl-multiple.c:130
+#, c-format
+msgid "No searchable sources available"
+msgstr "Inga sökbara källor är tillgängliga"
+
+#: ../src/grl-multiple.c:485
+#, c-format
+msgid "Could not resolve media for URI '%s'"
+msgstr "Kunde inte slå upp media för platsen ”%s”"
+
+#: ../src/grl-registry.c:328 ../src/grl-registry.c:1002
+#, c-format
+msgid "Plugin '%s' is already loaded"
+msgstr "Insticksmodulen ”%s” är redan laddad"
+
+#: ../src/grl-registry.c:340
+#, c-format
+msgid "Failed to initialize plugin from %s"
+msgstr "Misslyckades med att intitialisera insticksmodul från %s"
+
+#: ../src/grl-registry.c:734
+#, c-format
+msgid "Source with id '%s' was not found"
+msgstr "Källa med id ”%s” hittades inte"
+
+#: ../src/grl-registry.c:797
+#, c-format
+msgid "Failed to load plugin from %s"
+msgstr "Misslyckades med att ladda insticksmodul från %s"
+
+#: ../src/grl-registry.c:806
+#, c-format
+msgid "Invalid plugin file %s"
+msgstr "Ogiltig insticksmodulsfil %s"
+
+#: ../src/grl-registry.c:817
+#, c-format
+msgid "'%s' is not a valid plugin file"
+msgstr "”%s” är inte en giltig insticksmodulsfil"
+
+#: ../src/grl-registry.c:836
+#, c-format
+msgid "Unable to load plugin '%s'"
+msgstr "Misslyckades med att ladda insticksmodul ”%s”"
+
+#: ../src/grl-registry.c:847
+#, c-format
+msgid "Plugin '%s' already exists"
+msgstr "Insticksmodulen ”%s” finns redan"
+
+#: ../src/grl-registry.c:944
+#, c-format
+msgid "All configured plugin paths are invalid"
+msgstr "Alla konfigurerade sökvägar till insticksmoduler är felaktiga"
+
+#: ../src/grl-registry.c:991
+#, c-format
+msgid "Plugin '%s' not available"
+msgstr "Insticksmodulen ”%s” är ej tillgänglig"
+
+#: ../src/grl-registry.c:1212
+#, c-format
+msgid "Plugin not found: '%s'"
+msgstr "Insticksmodul hittades inte: %s"
+
+#: ../src/grl-registry.c:1294
+#, c-format
+msgid "Metadata key '%s' cannot be registered"
+msgstr "Metadatanyckeln ”%s” kunde inte registreras"
+
+#: ../src/grl-registry.c:1587
+#, c-format
+msgid "Plugin configuration does not contain 'plugin-id' reference"
+msgstr "Konfiguration för insticksmodul innehåller ingen ”plugin-in”-referens"
+
+#: ../src/grl-source.c:2659
+#, c-format
+msgid "Some keys could not be written"
+msgstr "Några nycklar kunde inte skrivas"
+
+#: ../src/grl-source.c:2731
+#, c-format
+msgid "None of the specified keys are writable"
+msgstr "Ingen av de angivna nycklarna är skrivbara"
+
+#: ../src/grl-source.c:4037
+#, c-format
+msgid "Media has no 'id', cannot remove"
+msgstr "Mediet har inget ”id”, kan inte ta bort"
diff -Nru grilo-0.2.9/src/data/grl-data.c grilo-0.2.10/src/data/grl-data.c
--- grilo-0.2.9/src/data/grl-data.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/data/grl-data.c	2014-03-20 09:13:39.000000000 +0000
@@ -232,6 +232,9 @@
 {
   GValue value = { 0 };
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   if (strvalue) {
     g_value_init (&value, G_TYPE_STRING);
     g_value_set_string (&value, strvalue);
@@ -257,7 +260,12 @@
 const gchar *
 grl_data_get_string (GrlData *data, GrlKeyID key)
 {
-  const GValue *value = grl_data_get (data, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_DATA (data), NULL);
+  g_return_val_if_fail (key, NULL);
+
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_STRING (value)) {
     return NULL;
@@ -281,6 +289,10 @@
 grl_data_set_int (GrlData *data, GrlKeyID key, gint intvalue)
 {
   GValue value = { 0 };
+
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   g_value_init (&value, G_TYPE_INT);
   g_value_set_int (&value, intvalue);
   grl_data_set (data, key, &value);
@@ -302,7 +314,12 @@
 gint
 grl_data_get_int (GrlData *data, GrlKeyID key)
 {
-  const GValue *value = grl_data_get (data, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_DATA (data), 0);
+  g_return_val_if_fail (key, 0);
+
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_INT (value)) {
     return 0;
@@ -326,6 +343,10 @@
 grl_data_set_float (GrlData *data, GrlKeyID key, float floatvalue)
 {
   GValue value = { 0 };
+
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   g_value_init (&value, G_TYPE_FLOAT);
   g_value_set_float (&value, floatvalue);
   grl_data_set (data, key, &value);
@@ -347,7 +368,12 @@
 gfloat
 grl_data_get_float (GrlData *data, GrlKeyID key)
 {
-  const GValue *value = grl_data_get (data, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_DATA (data), 0.0);
+  g_return_val_if_fail (key, 0.0);
+
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_FLOAT (value)) {
     return 0;
@@ -371,6 +397,10 @@
 grl_data_set_boolean (GrlData *data, GrlKeyID key, gboolean boolvalue)
 {
   GValue value = { 0 };
+
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   g_value_init (&value, G_TYPE_BOOLEAN);
   g_value_set_boolean (&value, boolvalue);
   grl_data_set (data, key, &value);
@@ -379,7 +409,7 @@
 /**
  * grl_data_get_boolean:
  * @data: data to inspect
- * @key (type GrlKeyID): key to use
+ * @key: (type GrlKeyID): key to use
  *
  * Returns: the first boolean value associated with @key from @data. If @key has
  * no first value, or value is not a gboolean, or @key is not in the data, then
@@ -390,7 +420,12 @@
 gboolean
 grl_data_get_boolean (GrlData *data, GrlKeyID key)
 {
-  const GValue *value = grl_data_get (data, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_DATA (data), FALSE);
+  g_return_val_if_fail (key, FALSE);
+
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_BOOLEAN (value)) {
     return FALSE;
@@ -417,6 +452,9 @@
   GValue v = { 0 };
   GByteArray * array;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   if (!buf || !size) {
     return;
   }
@@ -449,9 +487,13 @@
 const guint8 *
 grl_data_get_binary(GrlData *data, GrlKeyID key, gsize *size)
 {
+  const GValue *value;
+
   g_return_val_if_fail (size, NULL);
+  g_return_val_if_fail (GRL_IS_DATA (data), NULL);
+  g_return_val_if_fail (key, NULL);
 
-  const GValue *value = grl_data_get (data, key);
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_BOXED (value)) {
     return NULL;
@@ -480,6 +522,8 @@
 {
   GValue value = { 0 };
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
   g_return_if_fail (boxed != NULL);
 
   g_value_init (&value, GRL_METADATA_KEY_GET_TYPE (key));
@@ -506,7 +550,12 @@
 gpointer
 grl_data_get_boxed (GrlData *data, GrlKeyID key)
 {
-  const GValue *value = grl_data_get (data, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_DATA (data), NULL);
+  g_return_val_if_fail (key, NULL);
+
+  value = grl_data_get (data, key);
 
   if (!value || !G_VALUE_HOLDS_BOXED (value)) {
     return NULL;
@@ -528,6 +577,9 @@
 void
 grl_data_remove (GrlData *data, GrlKeyID key)
 {
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   grl_data_remove_nth (data, key, 0);
 }
 
@@ -550,6 +602,7 @@
   gboolean found = FALSE;
 
   g_return_val_if_fail (GRL_IS_DATA (data), FALSE);
+  g_return_val_if_fail (key, FALSE);
 
   sample_key = get_sample_key (key);
   if (!sample_key) {
@@ -672,6 +725,9 @@
 {
   GrlRelatedKeys *relkeys;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   if (strvalue) {
     relkeys = grl_related_keys_new ();
     grl_related_keys_set_string (relkeys, key, strvalue);
@@ -696,6 +752,9 @@
 {
   GrlRelatedKeys *relkeys;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   relkeys = grl_related_keys_new ();
   grl_related_keys_set_int (relkeys, key, intvalue);
   grl_data_add_related_keys (data, relkeys);
@@ -718,6 +777,9 @@
 {
   GrlRelatedKeys *relkeys;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   relkeys = grl_related_keys_new ();
   grl_related_keys_set_float (relkeys, key, floatvalue);
   grl_data_add_related_keys (data, relkeys);
@@ -742,6 +804,9 @@
 {
   GrlRelatedKeys *relkeys;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
+
   if (!buf || !size) {
     return;
   }
@@ -768,6 +833,8 @@
 {
   GrlRelatedKeys *relkeys;
 
+  g_return_if_fail (GRL_IS_DATA (data));
+  g_return_if_fail (key);
   g_return_if_fail (boxed != NULL);
 
   relkeys = grl_related_keys_new ();
diff -Nru grilo-0.2.9/src/data/grl-media.c grilo-0.2.10/src/data/grl-media.c
--- grilo-0.2.9/src/data/grl-media.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/data/grl-media.c	2014-03-20 09:13:39.000000000 +0000
@@ -1120,6 +1120,23 @@
 }
 
 /**
+ * grl_media_set_size:
+ * @media: the media
+ * @size: the size in bytes
+ *
+ * Set the size of the media
+ *
+ * Since: 0.2.10
+ */
+void
+grl_media_set_size (GrlMedia *media, gint size)
+{
+  grl_data_set_int (GRL_DATA (media),
+                    GRL_METADATA_KEY_SIZE,
+                    size);
+}
+
+/**
  * grl_media_get_id:
  * @media: the media object
  *
@@ -1789,3 +1806,18 @@
   return grl_related_keys_get_string (relkeys,
                                       GRL_METADATA_KEY_KEYWORD);
 }
+
+/**
+ * grl_media_get_size:
+ * @media: the media object
+ *
+ * Returns: the media's size, in bytes or -1 if unknown.
+ *
+ * since: 0.2.10
+ */
+gint
+grl_media_get_size (GrlMedia *media)
+{
+  g_return_val_if_fail (GRL_IS_MEDIA (media), -1);
+  return grl_data_get_int (GRL_DATA (media), GRL_METADATA_KEY_SIZE);
+}
diff -Nru grilo-0.2.9/src/data/grl-media.h grilo-0.2.10/src/data/grl-media.h
--- grilo-0.2.9/src/data/grl-media.h	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/data/grl-media.h	2014-03-20 09:13:39.000000000 +0000
@@ -185,6 +185,8 @@
 
 void grl_media_set_keyword (GrlMedia *media, const gchar *keyword);
 
+void grl_media_set_size (GrlMedia *media, gint size);
+
 void grl_media_add_url_data (GrlMedia *media, const gchar *url, const gchar *mime);
 
 void grl_media_add_author (GrlMedia *media, const gchar *author);
@@ -278,6 +280,8 @@
 
 const gchar * grl_media_get_keyword_nth (GrlMedia *media, guint index);
 
+gint grl_media_get_size (GrlMedia *media);
+
 GType grl_media_get_type (void) G_GNUC_CONST;
 
 GrlMedia *grl_media_new (void);
diff -Nru grilo-0.2.9/src/grilo.c grilo-0.2.10/src/grilo.c
--- grilo-0.2.9/src/grilo.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grilo.c	2014-03-20 09:13:39.000000000 +0000
@@ -181,7 +181,7 @@
   }
 
   registry = grl_registry_get_default ();
-  g_object_unref (registry);
+  grl_registry_shutdown (registry);
 }
 
 /**
diff -Nru grilo-0.2.9/src/grl-caps.c grilo-0.2.10/src/grl-caps.c
--- grilo-0.2.9/src/grl-caps.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-caps.c	2014-03-20 09:13:39.000000000 +0000
@@ -228,9 +228,7 @@
 {
   g_return_if_fail (caps);
 
-  if (caps->priv->key_filter) {
-    g_list_free (caps->priv->key_filter);
-  }
+  g_clear_pointer (&caps->priv->key_filter, g_list_free);
 
   caps->priv->key_filter = g_list_copy (keys);
 }
@@ -287,9 +285,7 @@
 {
   g_return_if_fail (caps);
 
-  if (caps->priv->key_range_filter) {
-    g_list_free (caps->priv->key_range_filter);
-  }
+  g_clear_pointer (&caps->priv->key_range_filter, g_list_free);
 
   caps->priv->key_range_filter = g_list_copy (keys);
 }
diff -Nru grilo-0.2.9/src/grl-metadata-key.c grilo-0.2.10/src/grl-metadata-key.c
--- grilo-0.2.9/src/grl-metadata-key.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-metadata-key.c	2014-03-20 09:13:39.000000000 +0000
@@ -37,479 +37,489 @@
 void
 grl_metadata_key_setup_system_keys (GrlRegistry *registry)
 {
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("album",
-                                                                "Album",
-                                                                "Album the media belongs to",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ALBUM,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("artist",
-                                                                "Artist",
-                                                                "Main artist",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ARTIST,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("author",
-                                                                "Author",
-                                                                "Creator of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_AUTHOR,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boxed ("publishing-date",
-                                                               "Publishing date",
-                                                               "When the media was originally published",
-                                                               G_TYPE_DATE_TIME,
-                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_PUBLICATION_DATE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("description",
-                                                                "Description",
-                                                                "Description of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_DESCRIPTION,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("genre",
-                                                                "Genre",
-                                                                "Genre of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_GENRE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("id",
-                                                                "ID",
-                                                                "Identifier of media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ID,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("last-played-time",
-                                                                "LastPlayedTime",
-                                                                "Last time the media was played",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_LAST_PLAYED,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("lyrics",
-                                                                "Lyrics",
-                                                                "Song lyrics",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_LYRICS,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("mime-type",
-                                                                "MimeType",
-                                                                "Media mime type",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_MIME,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("site",
-                                                                "Site",
-                                                                "Site",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_SITE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("source",
-                                                                "Source",
-                                                                "Source ID providing the content",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_SOURCE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("thumbnail",
-                                                                "Thumbnail",
-                                                                "Thumbnail image",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_THUMBNAIL,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boxed ("thumbnail-binary",
-                                                               "Thumbnail Binary",
-                                                               "Thumbnail binary image",
-                                                               G_TYPE_BYTE_ARRAY,
-                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_THUMBNAIL_BINARY,
-
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("title",
-                                                                "Title",
-                                                                "Title of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_TITLE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("url",
-                                                                "URL",
-                                                                "Media URL",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_URL,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("external-url",
-                                                                "External URL",
-                                                                "External location where the media can be played back, usually a website",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_EXTERNAL_URL,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("external-player",
-                                                                "External Player URL",
-                                                                "URL of an external player that can be used to play the resource (usually a Flash player)",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_EXTERNAL_PLAYER,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("studio",
-                                                                "Studio",
-                                                                "Studio the media is from",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_STUDIO,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("certificate",
-                                                                "Certificate",
-                                                                "Age certificate of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_CERTIFICATE,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("license",
-                                                                "License",
-                                                                "The license of the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_LICENSE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("bitrate",
-                                                             "Bitrate",
-                                                             "Media bitrate in KBits/s",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_BITRATE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("childcount",
-                                                             "Childcount",
-                                                             "Number of items contained in a container",
-                                                             -1, G_MAXINT,
-                                                             GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_CHILDCOUNT,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("duration",
-                                                             "Duration",
-                                                             "Media duration in seconds",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_DURATION,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("height",
-                                                             "Height",
-                                                             "Height of media ('y' axis)",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_HEIGHT,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("playback-interrupted-time",
-                                                             "PlaybackInterruptedTime",
-                                                             "Time at which playback was interrupted",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_LAST_POSITION,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("play-count",
-                                                             "PlayCount",
-                                                             "How many times media was played",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_PLAY_COUNT,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("width",
-                                                             "Width",
-                                                             "Width of media ('x' axis)",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_WIDTH,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_float ("framerate",
-                                                               "Framerate",
-                                                               "Frames per second",
-                                                               0, G_MAXFLOAT,
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("album",
+                                                                  "Album",
+                                                                  "Album the media belongs to",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ALBUM,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("artist",
+                                                                  "Artist",
+                                                                  "Main artist",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ARTIST,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("author",
+                                                                  "Author",
+                                                                  "Creator of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_AUTHOR,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boxed ("publishing-date",
+                                                                 "Publishing date",
+                                                                 "When the media was originally published",
+                                                                 G_TYPE_DATE_TIME,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_PUBLICATION_DATE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("description",
+                                                                  "Description",
+                                                                  "Description of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_DESCRIPTION,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("genre",
+                                                                  "Genre",
+                                                                  "Genre of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_GENRE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("id",
+                                                                  "ID",
+                                                                  "Identifier of media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ID,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("last-played-time",
+                                                                  "LastPlayedTime",
+                                                                  "Last time the media was played",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_LAST_PLAYED,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("lyrics",
+                                                                  "Lyrics",
+                                                                  "Song lyrics",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_LYRICS,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("mime-type",
+                                                                  "MimeType",
+                                                                  "Media mime type",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_MIME,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("site",
+                                                                  "Site",
+                                                                  "Site",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_SITE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("source",
+                                                                  "Source",
+                                                                  "Source ID providing the content",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_SOURCE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("thumbnail",
+                                                                  "Thumbnail",
+                                                                  "Thumbnail image",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_THUMBNAIL,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boxed ("thumbnail-binary",
+                                                                 "Thumbnail Binary",
+                                                                 "Thumbnail binary image",
+                                                                 G_TYPE_BYTE_ARRAY,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_THUMBNAIL_BINARY,
+
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("title",
+                                                                  "Title",
+                                                                  "Title of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_TITLE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("url",
+                                                                  "URL",
+                                                                  "Media URL",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_URL,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("external-url",
+                                                                  "External URL",
+                                                                  "External location where the media can be played back, usually a website",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_EXTERNAL_URL,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("external-player",
+                                                                  "External Player URL",
+                                                                  "URL of an external player that can be used to play the resource (usually a Flash player)",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_EXTERNAL_PLAYER,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("studio",
+                                                                  "Studio",
+                                                                  "Studio the media is from",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_STUDIO,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("certificate",
+                                                                  "Certificate",
+                                                                  "Age certificate of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_CERTIFICATE,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("license",
+                                                                  "License",
+                                                                  "The license of the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_LICENSE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("bitrate",
+                                                               "Bitrate",
+                                                               "Media bitrate in KBits/s",
+                                                               0, G_MAXINT,
                                                                0,
                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_FRAMERATE,
-                                           NULL);
+                                             GRL_METADATA_KEY_BITRATE,
+                                             NULL);
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_float ("rating",
-                                                               "Rating",
-                                                               "Media rating",
-                                                               0, G_MAXFLOAT,
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("childcount",
+                                                               "Childcount",
+                                                               "Number of items contained in a container",
+                                                               -1, G_MAXINT,
+                                                               GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_CHILDCOUNT,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("duration",
+                                                               "Duration",
+                                                               "Media duration in seconds",
+                                                               0, G_MAXINT,
                                                                0,
                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_RATING,
-                                           NULL);
+                                             GRL_METADATA_KEY_DURATION,
+                                             NULL);
 
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("height",
+                                                               "Height",
+                                                               "Height of media ('y' axis)",
+                                                               0, G_MAXINT,
+                                                               0,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_HEIGHT,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("playback-interrupted-time",
+                                                               "PlaybackInterruptedTime",
+                                                               "Time at which playback was interrupted",
+                                                               0, G_MAXINT,
+                                                               0,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_LAST_POSITION,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("play-count",
+                                                               "PlayCount",
+                                                               "How many times media was played",
+                                                               0, G_MAXINT,
+                                                               0,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_PLAY_COUNT,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("width",
+                                                               "Width",
+                                                               "Width of media ('x' axis)",
+                                                               0, G_MAXINT,
+                                                               0,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_WIDTH,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_float ("framerate",
+                                                                 "Framerate",
+                                                                 "Frames per second",
+                                                                 0, G_MAXFLOAT,
+                                                                 0,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_FRAMERATE,
+                                             NULL);
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("season",
-                                                             "Season",
-                                                             "Season of a show",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_SEASON,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("episode",
-                                                             "Episode",
-                                                             "Episode of a show",
-                                                             0, G_MAXINT,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_EPISODE,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("show",
-                                                                "Show",
-                                                                "Name of a show",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_SHOW,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boxed ("creation-date",
-                                                               "Creation date",
-                                                               "Creation date",
-                                                               G_TYPE_DATE_TIME,
-                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_CREATION_DATE,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("camera-model",
-                                                                "Camera model",
-                                                                "Name of the camera model used to take the photo",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_CAMERA_MODEL,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("orientation",
-                                                             "Picture orientation",
-                                                             "Orientation of the photo in degree (clockwise)",
-                                                             0, 359,
-                                                             0,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ORIENTATION,
-                                           NULL);
-
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boolean ("flash-used",
-                                                                 "Flash used",
-                                                                 "Whether or not a flash was used to take that picture",
-                                                                 FALSE,
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_float ("rating",
+                                                                 "Rating",
+                                                                 "Media rating",
+                                                                 0, G_MAXFLOAT,
+                                                                 0,
                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_FLASH_USED,
-                                           NULL);
+                                             GRL_METADATA_KEY_RATING,
+                                             NULL);
 
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_float ("exposure-time",
-                                                               "Exposure time",
-                                                               "Exposure time of the photo in seconds",
-                                                               0, G_MAXFLOAT,
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("season",
+                                                               "Season",
+                                                               "Season of a show",
+                                                               0, G_MAXINT,
                                                                0,
                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_EXPOSURE_TIME,
-                                           NULL);
+                                             GRL_METADATA_KEY_SEASON,
+                                             NULL);
 
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_float ("iso-speed",
-                                                               "ISO speed",
-                                                               "Photographic film's sensitivity to light as ISO value",
-                                                               0, G_MAXFLOAT,
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("episode",
+                                                               "Episode",
+                                                               "Episode of a show",
+                                                               0, G_MAXINT,
                                                                0,
                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ISO_SPEED,
-                                           NULL);
+                                             GRL_METADATA_KEY_EPISODE,
+                                             NULL);
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_int ("track-number",
-                                                             "Track number",
-                                                             "Track number inside the album",
-                                                             1, G_MAXINT,
-                                                             1,
-                                                             G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_TRACK_NUMBER,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boxed ("modification-date",
-                                                               "Modification date",
-                                                               "When the media was last modified",
-                                                               G_TYPE_DATE_TIME,
-                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_MODIFICATION_DATE,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_float ("start-time",
-                                                               "Start Time",
-                                                               "Start offset in seconds relative to container",
-                                                               0.0, G_MAXFLOAT,
-                                                               0.0,
-                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_START_TIME,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_boolean ("favourite",
-                                                                 "Favourite",
-                                                                 "Whether or not the element was marked as favourite",
-                                                                 FALSE,
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("show",
+                                                                  "Show",
+                                                                  "Name of a show",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_SHOW,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boxed ("creation-date",
+                                                                 "Creation date",
+                                                                 "Creation date",
+                                                                 G_TYPE_DATE_TIME,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_CREATION_DATE,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("camera-model",
+                                                                  "Camera model",
+                                                                  "Name of the camera model used to take the photo",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_CAMERA_MODEL,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("orientation",
+                                                               "Picture orientation",
+                                                               "Orientation of the photo in degree (clockwise)",
+                                                               0, 359,
+                                                               0,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ORIENTATION,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boolean ("flash-used",
+                                                                   "Flash used",
+                                                                   "Whether or not a flash was used to take that picture",
+                                                                   FALSE,
+                                                                   G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_FLASH_USED,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_float ("exposure-time",
+                                                                 "Exposure time",
+                                                                 "Exposure time of the photo in seconds",
+                                                                 0, G_MAXFLOAT,
+                                                                 0,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_EXPOSURE_TIME,
+                                             NULL);
+
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_float ("iso-speed",
+                                                                 "ISO speed",
+                                                                 "Photographic film's sensitivity to light as ISO value",
+                                                                 0, G_MAXFLOAT,
+                                                                 0,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ISO_SPEED,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("track-number",
+                                                               "Track number",
+                                                               "Track number inside the album",
+                                                               1, G_MAXINT,
+                                                               1,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_TRACK_NUMBER,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boxed ("modification-date",
+                                                                 "Modification date",
+                                                                 "When the media was last modified",
+                                                                 G_TYPE_DATE_TIME,
                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_FAVOURITE,
-                                           NULL);
+                                             GRL_METADATA_KEY_MODIFICATION_DATE,
+                                             NULL);
 
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("region",
-                                                                "Region",
-                                                                "Region in which the media was published",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_REGION,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("keyword",
-                                                                "keyword",
-                                                                "A keyword describing the media",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_KEYWORD,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("performer",
-                                                                "performer",
-                                                                "An actor performing in the movie",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_PERFORMER,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("producer",
-                                                                "Producer",
-                                                                "Producer of the movie",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_PRODUCER,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("director",
-                                                                "Director",
-                                                                "Director of the movie",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_DIRECTOR,
-                                           NULL);
-
-  grl_registry_register_metadata_key_full (registry,
-                                           g_param_spec_string ("original-title",
-                                                                "Original Title",
-                                                                "Original, untranslated title of the movie",
-                                                                NULL,
-                                                                G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
-                                           GRL_METADATA_KEY_ORIGINAL_TITLE,
-                                           NULL);
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_float ("start-time",
+                                                                 "Start Time",
+                                                                 "Start offset in seconds relative to container",
+                                                                 0.0, G_MAXFLOAT,
+                                                                 0.0,
+                                                                 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_START_TIME,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_boolean ("favourite",
+                                                                   "Favourite",
+                                                                   "Whether or not the element was marked as favourite",
+                                                                   FALSE,
+                                                                   G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_FAVOURITE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("region",
+                                                                  "Region",
+                                                                  "Region in which the media was published",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_REGION,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("keyword",
+                                                                  "keyword",
+                                                                  "A keyword describing the media",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_KEYWORD,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("performer",
+                                                                  "performer",
+                                                                  "An actor performing in the movie",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_PERFORMER,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("producer",
+                                                                  "Producer",
+                                                                  "Producer of the movie",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_PRODUCER,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("director",
+                                                                  "Director",
+                                                                  "Director of the movie",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_DIRECTOR,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_string ("original-title",
+                                                                  "Original Title",
+                                                                  "Original, untranslated title of the movie",
+                                                                  NULL,
+                                                                  G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_ORIGINAL_TITLE,
+                                             NULL);
+
+  grl_registry_register_metadata_key_system (registry,
+                                             g_param_spec_int ("size",
+                                                               "Size",
+                                                               "Size in bytes",
+                                                               -1, G_MAXINT,
+                                                               -1,
+                                                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
+                                             GRL_METADATA_KEY_SIZE,
+                                             NULL);
 
   /* Create the relations */
   grl_registry_register_metadata_key_relation (registry,
@@ -531,6 +541,9 @@
                                                GRL_METADATA_KEY_URL,
                                                GRL_METADATA_KEY_START_TIME);
   grl_registry_register_metadata_key_relation (registry,
+                                               GRL_METADATA_KEY_URL,
+                                               GRL_METADATA_KEY_SIZE);
+  grl_registry_register_metadata_key_relation (registry,
                                                GRL_METADATA_KEY_REGION,
                                                GRL_METADATA_KEY_PUBLICATION_DATE);
   grl_registry_register_metadata_key_relation (registry,
diff -Nru grilo-0.2.9/src/grl-metadata-key.h grilo-0.2.10/src/grl-metadata-key.h
--- grilo-0.2.9/src/grl-metadata-key.h	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-metadata-key.h	2014-03-20 09:13:39.000000000 +0000
@@ -96,6 +96,7 @@
 #define GRL_METADATA_KEY_PRODUCER             47
 #define GRL_METADATA_KEY_DIRECTOR             48
 #define GRL_METADATA_KEY_ORIGINAL_TITLE       49
+#define GRL_METADATA_KEY_SIZE                 50
 
 G_BEGIN_DECLS
 
diff -Nru grilo-0.2.9/src/grl-multiple.c grilo-0.2.10/src/grl-multiple.c
--- grilo-0.2.9/src/grl-multiple.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-multiple.c	2014-03-20 09:13:39.000000000 +0000
@@ -140,9 +140,11 @@
 handle_no_searchable_sources (GrlSourceResultCb callback, gpointer user_data)
 {
   struct CallbackData *callback_data = g_new0 (struct CallbackData, 1);
+  guint id;
   callback_data->user_callback = callback;
   callback_data->user_data = user_data;
-  g_idle_add (handle_no_searchable_sources_idle, callback_data);
+  id = g_idle_add (handle_no_searchable_sources_idle, callback_data);
+  g_source_set_name_by_id (id, "[grilo] handle_no_searchable_sources_idle");
 }
 
 static struct MultipleSearchData *
@@ -577,6 +579,7 @@
 multiple_search_cancel_cb (struct MultipleSearchData *msd)
 {
   GList *sources, *ids;
+  guint id;
 
   /* Go through all the sources involved in that operation and issue
      cancel() operations for each one */
@@ -594,7 +597,8 @@
   msd->cancelled = TRUE;
 
   /* Send operation finished message now to client (remaining == 0) */
-  g_idle_add (confirm_cancel_idle, msd);
+  id = g_idle_add (confirm_cancel_idle, msd);
+  g_source_set_name_by_id (id, "[grilo] confirm_cancel_idle");
 }
 
 /**
diff -Nru grilo-0.2.9/src/grl-plugin.c grilo-0.2.10/src/grl-plugin.c
--- grilo-0.2.9/src/grl-plugin.c	2014-02-18 11:34:46.000000000 +0000
+++ grilo-0.2.10/src/grl-plugin.c	2014-03-20 09:13:39.000000000 +0000
@@ -264,9 +264,8 @@
 {
   g_return_if_fail (GRL_IS_PLUGIN (plugin));
 
-  if (plugin->priv->id) {
-    g_free (plugin->priv->id);
-  }
+  g_clear_pointer (&plugin->priv->id, g_free);
+
   plugin->priv->id = g_strdup (id);
 }
 
@@ -283,9 +282,7 @@
 {
   g_return_if_fail (GRL_IS_PLUGIN (plugin));
 
-  if (plugin->priv->filename) {
-    g_free (plugin->priv->filename);
-  }
+  g_clear_pointer (&plugin->priv->filename, g_free);
 
   plugin->priv->filename = g_strdup (filename);
 }
diff -Nru grilo-0.2.9/src/grl-range-value.c grilo-0.2.10/src/grl-range-value.c
--- grilo-0.2.9/src/grl-range-value.c	2014-02-18 11:34:46.000000000 +0000
+++ grilo-0.2.10/src/grl-range-value.c	2014-03-20 09:13:39.000000000 +0000
@@ -55,13 +55,8 @@
 void
 grl_range_value_free (GrlRangeValue *range)
 {
-  if (range->min) {
-    grl_g_value_free (range->min);
-  }
-
-  if (range->max) {
-    grl_g_value_free (range->max);
-  }
+  g_clear_pointer (&range->min, grl_g_value_free);
+  g_clear_pointer (&range->max, grl_g_value_free);
 
   g_slice_free (GrlRangeValue, range);
 }
diff -Nru grilo-0.2.9/src/grl-registry.c grilo-0.2.10/src/grl-registry.c
--- grilo-0.2.9/src/grl-registry.c	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-registry.c	2014-03-20 09:13:39.000000000 +0000
@@ -79,7 +79,7 @@
   GHashTable *plugins;
   GHashTable *sources;
   GHashTable *related_keys;
-  GParamSpecPool *system_keys;
+  GHashTable *system_keys;
   GHashTable *ranks;
   GSList *plugins_dir;
   GSList *allowed_plugins;
@@ -87,8 +87,6 @@
   struct KeyIDHandler key_id_handler;
 };
 
-static void grl_registry_finalize (GObject *object);
-
 static void grl_registry_setup_ranks (GrlRegistry *registry);
 
 static void grl_registry_preload_plugins (GrlRegistry *registry,
@@ -109,11 +107,14 @@
 
 static void shutdown_plugin (GrlPlugin *plugin);
 
+static void configs_free (GList *configs);
+
 /* ================ GrlRegistry GObject ================ */
 
 enum {
   SIG_SOURCE_ADDED,
   SIG_SOURCE_REMOVED,
+  SIG_METADATA_KEY_ADDED,
   SIG_LAST
 };
 static gint registry_signals[SIG_LAST];
@@ -123,14 +124,8 @@
 static void
 grl_registry_class_init (GrlRegistryClass *klass)
 {
-  GObjectClass *gobject_klass;
-
   g_type_class_add_private (klass, sizeof (GrlRegistryPrivate));
 
-  gobject_klass = G_OBJECT_CLASS (klass);
-
-  gobject_klass->finalize = grl_registry_finalize;
-
   /**
    * GrlRegistry::source-added:
    * @registry: the registry
@@ -168,6 +163,25 @@
 		 NULL,
 		 g_cclosure_marshal_VOID__OBJECT,
 		 G_TYPE_NONE, 1, GRL_TYPE_SOURCE);
+
+  /**
+   * GrlRegistry::metadata-key-added:
+   * @registry: the registry
+   * @key: the name of the new key added
+   *
+   * Signals that a new metadata key has been registered.
+   *
+   * Since: 0.2.10
+   */
+  registry_signals[SIG_METADATA_KEY_ADDED] =
+    g_signal_new("metadata-key-added",
+                 G_TYPE_FROM_CLASS(klass),
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                 0,
+                 NULL,
+                 NULL,
+                 g_cclosure_marshal_VOID__STRING,
+                 G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
 static void
@@ -176,7 +190,7 @@
   registry->priv = GRL_REGISTRY_GET_PRIVATE (registry);
 
   registry->priv->configs =
-    g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+    g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) configs_free);
   registry->priv->plugins =
     g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
   registry->priv->sources =
@@ -184,79 +198,21 @@
   registry->priv->related_keys =
     g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
   registry->priv->system_keys =
-    g_param_spec_pool_new (FALSE);
+    g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_param_spec_unref);
 
   key_id_handler_init (&registry->priv->key_id_handler);
 
   grl_registry_setup_ranks (registry);
 }
 
+/* ================ Utitilies ================ */
+
 static void
-grl_registry_finalize (GObject *object)
+configs_free (GList *configs)
 {
-  GHashTableIter iter;
-  GList *each_key;
-  GList *related_keys = NULL;
-  GrlPlugin *plugin = NULL;
-  GrlRegistry *registry = GRL_REGISTRY (object);
-  GrlSource *source = NULL;
-
-  if (registry->priv->sources) {
-    g_hash_table_iter_init (&iter, registry->priv->sources);
-    while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &source)) {
-      g_object_unref (source);
-    }
-    g_hash_table_unref (registry->priv->sources);
-    registry->priv->sources = NULL;
-  }
-
-  if (registry->priv->plugins) {
-    g_hash_table_iter_init (&iter, registry->priv->plugins);
-    while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &plugin)) {
-      shutdown_plugin (plugin);
-    }
-    g_hash_table_unref (registry->priv->plugins);
-    registry->priv->plugins = NULL;
-  }
-
-  if (registry->priv->ranks) {
-    g_hash_table_unref (registry->priv->ranks);
-    registry->priv->configs = NULL;
-  }
-
-  if (registry->priv->configs) {
-    g_hash_table_unref (registry->priv->configs);
-    registry->priv->configs = NULL;
-  }
-
-  /* We need to free this table with care. Several keys can be pointing to the
-     same value, so we need to ensure that we only free the value once */
-  if (registry->priv->related_keys) {
-    while (TRUE) {
-      g_hash_table_iter_init (&iter, registry->priv->related_keys);
-      if (!g_hash_table_iter_next (&iter, NULL, (gpointer *) &related_keys)) {
-        break;
-      }
-      /* This will invalidate the iterator */
-      for (each_key = related_keys; each_key; each_key = g_list_next (each_key)) {
-        g_hash_table_remove (registry->priv->related_keys, GRLKEYID_TO_POINTER (each_key->data));
-      }
-      g_list_free (related_keys);
-    }
-    g_hash_table_unref (registry->priv->related_keys);
-    registry->priv->related_keys = NULL;
-  }
-
-  g_slist_free_full (registry->priv->plugins_dir, (GDestroyNotify) g_free);
-  g_slist_free_full (registry->priv->allowed_plugins, (GDestroyNotify) g_free);
-
-  key_id_handler_free (&registry->priv->key_id_handler);
-
-  G_OBJECT_CLASS (grl_registry_parent_class)->finalize (object);
+  g_list_free_full (configs, g_object_unref);
 }
 
-/* ================ Utitilies ================ */
-
 static void
 config_source_rank (GrlRegistry *registry,
                     const gchar *source_id,
@@ -494,7 +450,7 @@
 
     g_hash_table_insert (registry->priv->plugins,
                          id,
-                         g_object_ref (plugin));
+                         plugin);
   }
   return plugin;
 }
@@ -574,6 +530,46 @@
   return loaded_one;
 }
 
+static GrlKeyID
+grl_registry_register_metadata_key_full (GrlRegistry *registry,
+                                         GParamSpec *param_spec,
+                                         GrlKeyID key,
+                                         GError **error)
+{
+  const gchar *key_name;
+
+  g_return_val_if_fail (GRL_IS_REGISTRY (registry), 0);
+  g_return_val_if_fail (G_IS_PARAM_SPEC (param_spec), 0);
+  GrlKeyID registered_key;
+
+  key_name = g_param_spec_get_name (param_spec);
+
+  registered_key = key_id_handler_add (&registry->priv->key_id_handler, key, key_name);
+
+  if (registered_key == GRL_METADATA_KEY_INVALID) {
+    GRL_WARNING ("metadata key '%s' cannot be registered", key_name);
+    g_set_error (error,
+                 GRL_CORE_ERROR,
+                 GRL_CORE_ERROR_REGISTER_METADATA_KEY_FAILED,
+                 _("Metadata key '%s' cannot be registered"),
+                 key_name);
+
+    return GRL_METADATA_KEY_INVALID;
+  }
+
+  g_hash_table_insert (registry->priv->system_keys,
+                       (gpointer) key_name,
+                       g_param_spec_ref (param_spec));
+
+  /* Each key is related to itself */
+  g_hash_table_insert (registry->priv->related_keys,
+                       GRLKEYID_TO_POINTER (registered_key),
+                       g_list_prepend (NULL,
+                                       GRLKEYID_TO_POINTER (registered_key)));
+
+  return registered_key;
+}
+
 static void
 key_id_handler_init (struct KeyIDHandler *handler)
 {
@@ -705,8 +701,7 @@
 
   /* Free previous list */
   if (registry->priv->allowed_plugins) {
-    g_slist_foreach (registry->priv->allowed_plugins, (GFunc) g_free, NULL);
-    g_slist_free (registry->priv->allowed_plugins);
+    g_slist_free_full (registry->priv->allowed_plugins, g_free);
     registry->priv->allowed_plugins = NULL;
   }
 
@@ -717,6 +712,66 @@
   }
 }
 
+/*
+ * grl_registry_shutdown:
+ * @registry: the registry instance
+ *
+ * Frees all the resources in the registry and the registry itself.
+ **/
+void
+grl_registry_shutdown (GrlRegistry *registry)
+{
+  GHashTableIter iter;
+  GList *each_key;
+  GList *related_keys = NULL;
+  GrlPlugin *plugin = NULL;
+  GrlSource *source = NULL;
+
+  if (registry->priv->plugins) {
+    g_hash_table_iter_init (&iter, registry->priv->plugins);
+    while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &plugin)) {
+      shutdown_plugin (plugin);
+    }
+    g_clear_pointer (&registry->priv->plugins, g_hash_table_unref);
+  }
+
+  if (registry->priv->sources) {
+    g_hash_table_iter_init (&iter, registry->priv->sources);
+    while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &source)) {
+      g_object_unref (source);
+    }
+    g_clear_pointer (&registry->priv->sources, g_hash_table_unref);
+  }
+
+  g_clear_pointer (&registry->priv->ranks, g_hash_table_unref);
+  g_clear_pointer (&registry->priv->configs, g_hash_table_unref);
+
+  /* We need to free this table with care. Several keys can be pointing to the
+     same value, so we need to ensure that we only free the value once */
+  if (registry->priv->related_keys) {
+    while (TRUE) {
+      g_hash_table_iter_init (&iter, registry->priv->related_keys);
+      if (!g_hash_table_iter_next (&iter, NULL, (gpointer *) &related_keys)) {
+        break;
+      }
+      /* This will invalidate the iterator */
+      for (each_key = related_keys; each_key; each_key = g_list_next (each_key)) {
+        g_hash_table_remove (registry->priv->related_keys, GRLKEYID_TO_POINTER (each_key->data));
+      }
+      g_list_free (related_keys);
+    }
+    g_clear_pointer (&registry->priv->related_keys, g_hash_table_unref);
+  }
+
+  g_slist_free_full (registry->priv->plugins_dir, (GDestroyNotify) g_free);
+  g_slist_free_full (registry->priv->allowed_plugins, (GDestroyNotify) g_free);
+
+  key_id_handler_free (&registry->priv->key_id_handler);
+  g_clear_pointer (&registry->priv->system_keys, g_hash_table_unref);
+
+  g_object_unref (registry);
+}
+
 /* ================ PUBLIC API ================ */
 
 /**
@@ -1345,14 +1400,24 @@
                                     GParamSpec *param_spec,
                                     GError **error)
 {
-  return grl_registry_register_metadata_key_full (registry,
-                                                  param_spec,
-                                                  GRL_METADATA_KEY_INVALID,
-                                                  error);
+  GrlKeyID key;
+
+  key = grl_registry_register_metadata_key_full (registry,
+                                                 param_spec,
+                                                 GRL_METADATA_KEY_INVALID,
+                                                 error);
+
+  if (key != GRL_METADATA_KEY_INVALID) {
+    g_signal_emit (registry, registry_signals[SIG_METADATA_KEY_ADDED],
+                   0,
+                   grl_metadata_key_get_name (key));
+  }
+
+  return key;
 }
 
 /*
- * grl_registry_register_metadata_key_full:
+ * grl_registry_register_metadata_key_system:
  *
  * This is an internal method only meant to be used to register core
  * keys.
@@ -1361,45 +1426,22 @@
  * grl_registry_register_metadata_key().
  */
 GrlKeyID
-grl_registry_register_metadata_key_full (GrlRegistry *registry,
-                                         GParamSpec *param_spec,
-                                         GrlKeyID key,
-                                         GError **error)
+grl_registry_register_metadata_key_system (GrlRegistry *registry,
+                                           GParamSpec *param_spec,
+                                           GrlKeyID key,
+                                           GError **error)
 {
-  const gchar *key_name;
-
-  g_return_val_if_fail (GRL_IS_REGISTRY (registry), 0);
-  g_return_val_if_fail (G_IS_PARAM_SPEC (param_spec), 0);
   GrlKeyID registered_key;
 
-  key_name = g_param_spec_get_name (param_spec);
-
-  registered_key = key_id_handler_add (&registry->priv->key_id_handler, key, key_name);
-
-  if (registered_key == GRL_METADATA_KEY_INVALID) {
-    GRL_WARNING ("metadata key '%s' cannot be registered", key_name);
-    g_set_error (error,
-                 GRL_CORE_ERROR,
-                 GRL_CORE_ERROR_REGISTER_METADATA_KEY_FAILED,
-                 _("Metadata key '%s' cannot be registered"),
-                 key_name);
-
-    return GRL_METADATA_KEY_INVALID;
-  }
-
-  g_param_spec_pool_insert (registry->priv->system_keys,
-                            param_spec,
-                            GRL_TYPE_MEDIA);
-  /* Each key is related to itself */
-  g_hash_table_insert (registry->priv->related_keys,
-                       GRLKEYID_TO_POINTER (registered_key),
-                       g_list_prepend (NULL,
-                                       GRLKEYID_TO_POINTER (registered_key)));
+  registered_key = grl_registry_register_metadata_key_full (registry,
+                                                            param_spec,
+                                                            key,
+                                                            error);
+  g_param_spec_unref (param_spec);
 
   return registered_key;
 }
 
-
 /**
  * grl_registry_register_metadata_key_relation:
  * @registry: the plugin registry
@@ -1518,10 +1560,8 @@
   if (!key_name) {
     return NULL;
   }
-  key_pspec = g_param_spec_pool_lookup (registry->priv->system_keys,
-                                        key_name,
-                                        GRL_TYPE_MEDIA,
-                                        FALSE);
+  key_pspec = g_hash_table_lookup (registry->priv->system_keys, key_name);
+
   if (key_pspec) {
     return g_param_spec_get_blurb (key_pspec);
   } else {
@@ -1553,10 +1593,8 @@
   if (!key_name) {
     return G_TYPE_INVALID;
   }
-  key_pspec = g_param_spec_pool_lookup (registry->priv->system_keys,
-                                        key_name,
-                                        GRL_TYPE_MEDIA,
-                                        FALSE);
+  key_pspec = g_hash_table_lookup (registry->priv->system_keys, key_name);
+
   if (key_pspec) {
     return G_PARAM_SPEC_VALUE_TYPE (key_pspec);
   } else {
@@ -1593,10 +1631,8 @@
   if (!key_name) {
     return FALSE;
   }
-  key_pspec = g_param_spec_pool_lookup (registry->priv->system_keys,
-                                        key_name,
-                                        GRL_TYPE_MEDIA,
-                                        FALSE);
+  key_pspec = g_hash_table_lookup (registry->priv->system_keys, key_name);
+
   if (key_pspec) {
     return !g_param_value_validate (key_pspec, value);
   } else {
@@ -1817,12 +1853,8 @@
   }
 
 bail:
-  if (keyfile) {
-    g_key_file_free (keyfile);
-  }
-  if (bytes) {
-    g_bytes_unref (bytes);
-  }
+  g_clear_pointer (&keyfile, g_key_file_free);
+  g_clear_pointer (&bytes, g_bytes_unref);
 
   return ret;
 }
diff -Nru grilo-0.2.9/src/grl-registry-priv.h grilo-0.2.10/src/grl-registry-priv.h
--- grilo-0.2.9/src/grl-registry-priv.h	2014-02-17 17:43:14.000000000 +0000
+++ grilo-0.2.10/src/grl-registry-priv.h	2014-03-20 09:13:39.000000000 +0000
@@ -29,9 +29,11 @@
 grl_registry_restrict_plugins (GrlRegistry *registry,
                                gchar **plugins);
 
-GrlKeyID grl_registry_register_metadata_key_full (GrlRegistry *registry,
-                                                  GParamSpec *param_spec,
-                                                  GrlKeyID key,
-                                                  GError **error);
+GrlKeyID grl_registry_register_metadata_key_system (GrlRegistry *registry,
+                                                    GParamSpec *param_spec,
+                                                    GrlKeyID key,
+                                                    GError **error);
+
+void grl_registry_shutdown (GrlRegistry *registry);
 
 #endif /* _GRL_REGISTRY_PRIV_H_ */
diff -Nru grilo-0.2.9/src/grl-source.c grilo-0.2.10/src/grl-source.c
--- grilo-0.2.9/src/grl-source.c	2014-02-10 21:36:13.000000000 +0000
+++ grilo-0.2.10/src/grl-source.c	2014-03-20 09:13:39.000000000 +0000
@@ -68,7 +68,8 @@
   PROP_PLUGIN,
   PROP_RANK,
   PROP_AUTO_SPLIT_THRESHOLD,
-  PROP_SUPPORTED_MEDIA
+  PROP_SUPPORTED_MEDIA,
+  PROP_SOURCE_TAGS
 };
 
 enum {
@@ -76,7 +77,7 @@
   SIG_LAST
 };
 
-static gint registry_signals[SIG_LAST];
+static gint source_signals[SIG_LAST];
 
 typedef void (*MediaDecorateCb) (GrlMedia *media,
                                  gpointer user_data,
@@ -91,6 +92,7 @@
   guint auto_split_threshold;
   GrlPlugin *plugin;
   GIcon *icon;
+  GPtrArray *tags;
 };
 
 typedef struct {
@@ -407,6 +409,65 @@
                                                        G_PARAM_STATIC_STRINGS));
 
   /**
+   * GrlSource:source-tags:
+   *
+   * A string array of tags relevant this source.
+   *
+   * The tags are arbitrary, and applications should just pass over the tags
+   * it does not understand. Applications would usually use this to either
+   * group sources together, or hide certain sources: a radio application
+   * would filter for %GRL_MEDIA_TYPE_AUDIO in GrlSource::supported-media as
+   * well as "radio" being listed in the tags.
+   *
+   * To avoid irrelevant content being listed in applications, sources
+   * such as generic video sites should not be tagged as "cinema" or
+   * "tv" as they contain a lot of content that's not either of those.
+   *
+   * This is a list of commonly used values:
+   *
+   * - "cinema", or "tv"
+   *   The content served is from cinema or TV sources. For example, a
+   *   source for movie trailers would select the former, a source for
+   *   streaming live TV would select the latter.
+   *
+   * - "radio"
+   *   The content served is from streaming radios.
+   *
+   * - "music"
+   *   The content served is music, for example, music stores such as
+   *   Jamendo or Magnatune.
+   *
+   * - "country:country-code"
+   *   The content is mostly relevant to users from a particular country,
+   *   such as a national broadcaster. For example, BBC content would be
+   *   tagged as "country:uk". Country codes should be an ISO-639-1 or
+   *   ISO-639-2 code.
+   *
+   * - "protocol:protocol-name"
+   *   The content browsing or searching uses a particular protocol, such
+   *   as DLNA/UPnP or DMAP/DAAP. This makes it easier to whitelist or
+   *   blacklist sources rather than matching the implementation specific
+   *   source ID. Examples are "protocol:dlna" and "protocol:dmap".
+   *
+   * - "localhost", or "localuser"
+   *   The content is served from the machine the application is running on,
+   *   or by an application the user is running. Applications might choose to
+   *   avoid showing the user's own data in their interfaces, or integrate it
+   *   in the user's local collection.
+   *
+   * Since: 0.2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SOURCE_TAGS,
+                                   g_param_spec_boxed ("source-tags",
+                                                       "Tags",
+                                                       "String array of tags relevant this source",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT |
+                                                       G_PARAM_STATIC_STRINGS));
+
+  /**
    * GrlSource::content-changed:
    * @source: source that has changed
    * @changed_medias: (element-type GrlMedia): a #GPtrArray with the medias
@@ -432,7 +493,7 @@
    *
    * Since: 0.2.0
    */
-  registry_signals[SIG_CONTENT_CHANGED] =
+  source_signals[SIG_CONTENT_CHANGED] =
     g_signal_new("content-changed",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
@@ -454,6 +515,7 @@
 grl_source_init (GrlSource *source)
 {
   source->priv = GRL_SOURCE_GET_PRIVATE (source);
+  source->priv->tags = g_ptr_array_new_with_free_func (g_free);
 }
 
 static void
@@ -472,6 +534,7 @@
   GrlSource *source = GRL_SOURCE (object);
 
   g_clear_object (&source->priv->icon);
+  g_clear_pointer (&source->priv->tags, g_ptr_array_unref);
   g_free (source->priv->id);
   g_free (source->priv->name);
   g_free (source->priv->desc);
@@ -482,13 +545,26 @@
 static void
 set_string_property (gchar **property, const GValue *value)
 {
-  if (*property) {
-    g_free (*property);
-  }
+  g_clear_pointer (property, g_free);
   *property = g_value_dup_string (value);
 }
 
 static void
+grl_source_set_tags (GrlSource   *source,
+                     const char **strv)
+{
+  guint i;
+
+  g_ptr_array_set_size (source->priv->tags, 0);
+  if (strv == NULL)
+    return;
+
+  for (i = 0; strv[i] != NULL; i++)
+    g_ptr_array_add (source->priv->tags, g_strdup (strv[i]));
+  g_ptr_array_add (source->priv->tags, NULL);
+}
+
+static void
 grl_source_set_property (GObject *object,
                          guint prop_id,
                          const GValue *value,
@@ -523,6 +599,9 @@
   case PROP_SUPPORTED_MEDIA:
     source->priv->supported_media = g_value_get_flags (value);
     break;
+  case PROP_SOURCE_TAGS:
+    grl_source_set_tags (source, g_value_get_boxed (value));
+    break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (source, prop_id, pspec);
     break;
@@ -564,6 +643,9 @@
   case PROP_SUPPORTED_MEDIA:
     g_value_set_flags (value, source->priv->supported_media);
     break;
+  case PROP_SOURCE_TAGS:
+    g_value_set_boxed (value, source->priv->tags->pdata);
+    break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (source, prop_id, pspec);
     break;
@@ -1094,9 +1176,7 @@
     }
     g_hash_table_unref (rrc->map);
   }
-
-  if (rrc->resolve_specs)
-    g_hash_table_unref (rrc->resolve_specs);
+  g_clear_pointer (&rrc->resolve_specs, g_hash_table_unref);
 
   g_slice_free (struct ResolveRelayCb, rrc);
 }
@@ -1110,9 +1190,8 @@
   if (brc->auto_split) {
     g_slice_free (struct AutoSplitCtl, brc->auto_split);
   }
-  if (brc->queue) {
-    g_queue_free (brc->queue);
-  }
+  g_clear_pointer (&brc->queue, g_queue_free);
+
   g_slice_free (struct BrowseRelayCb, brc);
 }
 
@@ -1933,17 +2012,21 @@
 
     rrc->specs_to_invoke = g_hash_table_get_values (rrc->resolve_specs);
     if (rrc->specs_to_invoke) {
-      g_idle_add_full (grl_operation_options_get_flags (rrc->options) & GRL_RESOLVE_IDLE_RELAY?
-                       G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                       resolve_idle,
-                       rrc,
-                       NULL);
+      guint id;
+      id = g_idle_add_full (grl_operation_options_get_flags (rrc->options) & GRL_RESOLVE_IDLE_RELAY?
+                            G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                            resolve_idle,
+                            rrc,
+                            NULL);
+      g_source_set_name_by_id (id, "[grilo] resolve_idle");
     } else {
-      g_idle_add_full (grl_operation_options_get_flags (rrc->options) & GRL_RESOLVE_IDLE_RELAY?
-                       G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                       resolve_all_done,
-                       rrc,
-                       NULL);
+      guint id;
+      id = g_idle_add_full (grl_operation_options_get_flags (rrc->options) & GRL_RESOLVE_IDLE_RELAY?
+                            G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                            resolve_all_done,
+                            rrc,
+                            NULL);
+      g_source_set_name_by_id (id, "[grilo] resolve_all_done");
     }
   }
 }
@@ -2017,7 +2100,8 @@
   if (!brc->dispatcher_running) {
     qelement = g_queue_peek_head (brc->queue);
     if (qelement && qelement->is_ready) {
-      g_idle_add (queue_process,  brc);
+      guint id = g_idle_add (queue_process,  brc);
+      g_source_set_name_by_id (id, "[grilo] queue_process");
       brc->dispatcher_running = TRUE;
     }
   }
@@ -2120,6 +2204,7 @@
 static void
 auto_split_run_next_chunk (struct BrowseRelayCb *brc)
 {
+  guint id;
   brc->auto_split->chunk_remaining = MIN (brc->auto_split->threshold,
                                           brc->auto_split->total_remaining);
 
@@ -2133,11 +2218,12 @@
     GRL_DEBUG ("auto-split: requesting chunk (skip=%u, count=%u)",
                grl_operation_options_get_skip (brc->spec.browse->options),
                grl_operation_options_get_count (brc->spec.browse->options));
-    g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     browse_idle,
-                     brc->spec.browse,
-                     NULL);
+    id = g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          browse_idle,
+                          brc->spec.browse,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] browse_idle");
     break;
   case GRL_OP_SEARCH:
     grl_operation_options_set_skip (brc->spec.search->options,
@@ -2148,11 +2234,12 @@
     GRL_DEBUG ("auto-split: requesting chunk (skip=%u, count=%u)",
                grl_operation_options_get_skip (brc->spec.search->options),
                grl_operation_options_get_count (brc->spec.search->options));
-    g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     search_idle,
-                     brc->spec.search,
-                     NULL);
+    id = g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          search_idle,
+                          brc->spec.search,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] search_idle");
     break;
   case GRL_OP_QUERY:
     grl_operation_options_set_skip (brc->spec.query->options,
@@ -2163,11 +2250,12 @@
     GRL_DEBUG ("auto-split: requesting chunk (skip=%u, count=%u)",
                grl_operation_options_get_skip (brc->spec.query->options),
                grl_operation_options_get_count (brc->spec.query->options));
-    g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     query_idle,
-                     brc->spec.query,
-                     NULL);
+    id = g_idle_add_full (grl_operation_options_get_flags (brc->options) & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          query_idle,
+                          brc->spec.query,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] query_idle");
     break;
   default:
     g_assert_not_reached ();
@@ -2722,6 +2810,7 @@
   GList *failed_keys = NULL;
   GError *error;
   struct StoreMetadataRelayCb *smrc;
+  guint id;
 
   map = map_writable_keys (source, keys, flags, &failed_keys);
 
@@ -2750,7 +2839,8 @@
   smrc->user_callback = callback;
   smrc->user_data = user_data;
 
-  g_idle_add (store_metadata_idle, smrc);
+  id = g_idle_add (store_metadata_idle, smrc);
+  g_source_set_name_by_id (id, "[grilo] store_metadata_idle");
 }
 
 static gboolean
@@ -2913,6 +3003,22 @@
 }
 
 /**
+ * grl_source_get_tags:
+ * @source: a source
+ *
+ * Returns: (element-type utf8) (transfer none): a %NULL-terminated list of tags
+ *
+ * Since: 0.2.10
+ */
+const char **
+grl_source_get_tags (GrlSource *source)
+{
+  g_return_val_if_fail (GRL_IS_SOURCE (source), NULL);
+
+  return (const char **) source->priv->tags->pdata;
+}
+
+/**
  * grl_source_get_plugin:
  * @source: a source
  *
@@ -3172,12 +3278,14 @@
 
   /* If there are no sources able to solve just send the media */
   if (g_list_length (sources) == 0) {
+    guint id;
     g_list_free (_keys);
-    g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     resolve_all_done,
-                     rrc,
-                     NULL);
+    id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          resolve_all_done,
+                          rrc,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] resolve_all_done");
     return operation_id;
   }
 
@@ -3205,17 +3313,21 @@
 
   rrc->specs_to_invoke = g_hash_table_get_values (rrc->resolve_specs);
   if (rrc->specs_to_invoke) {
-    g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     resolve_idle,
-                     rrc,
-                     NULL);
+    guint id;
+    id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          resolve_idle,
+                          rrc,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] resolve_idle");
   } else {
-    g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
-                     G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                     resolve_all_done,
-                     rrc,
-                     NULL);
+    guint id;
+    id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
+                          G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                          resolve_all_done,
+                          rrc,
+                          NULL);
+    g_source_set_name_by_id (id, "[grilo] resolve_all_done");
   }
 
   return operation_id;
@@ -3408,6 +3520,7 @@
   struct ResolveRelayCb *rrc;
   guint operation_id;
   GrlResolutionFlags flags;
+  guint id;
 
   GRL_DEBUG (__FUNCTION__);
 
@@ -3465,11 +3578,12 @@
 
   operation_set_ongoing (source, operation_id);
 
-  g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
-                   G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                   media_from_uri_idle,
-                   mfus,
-                   NULL);
+  id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY?
+                        G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                        media_from_uri_idle,
+                        mfus,
+                        NULL);
+  g_source_set_name_by_id (id, "[grilo] media_from_uri_idle");
 
   return operation_id;
 }
@@ -3560,6 +3674,7 @@
   guint operation_id;
   struct BrowseRelayCb *brc;
   GrlResolutionFlags flags;
+  guint id;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
   g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
@@ -3628,10 +3743,11 @@
 
   operation_set_ongoing (source, operation_id);
 
-  g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                   browse_idle,
-                   bs,
-                   NULL);
+  id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                        browse_idle,
+                        bs,
+                        NULL);
+  g_source_set_name_by_id (id, "[grilo] browse_idle");
 
   return operation_id;
 }
@@ -3726,6 +3842,7 @@
   guint operation_id;
   struct BrowseRelayCb *brc;
   GrlResolutionFlags flags;
+  guint id;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
   g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
@@ -3785,10 +3902,11 @@
 
   operation_set_ongoing (source, operation_id);
 
-  g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                   search_idle,
-                   ss,
-                   NULL);
+  id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                        search_idle,
+                        ss,
+                        NULL);
+  g_source_set_name_by_id (id, "[grilo] search_idle");
 
   return operation_id;
 }
@@ -3886,6 +4004,7 @@
   guint operation_id;
   struct BrowseRelayCb *brc;
   GrlResolutionFlags flags;
+  guint id;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
   g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
@@ -3945,10 +4064,11 @@
 
   operation_set_ongoing (source, operation_id);
 
-  g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
-                   query_idle,
-                   qs,
-                   NULL);
+  id = g_idle_add_full (flags & GRL_RESOLVE_IDLE_RELAY? G_PRIORITY_DEFAULT_IDLE: G_PRIORITY_HIGH_IDLE,
+                        query_idle,
+                        qs,
+                        NULL);
+  g_source_set_name_by_id (id, "[grilo] query_idle");
 
   return operation_id;
 }
@@ -4016,6 +4136,7 @@
   const gchar *id;
   struct RemoveRelayCb *rrc;
   GrlSourceRemoveSpec *rs;
+  guint tag_id;
 
   GRL_DEBUG (__FUNCTION__);
 
@@ -4049,7 +4170,8 @@
     rrc->spec = rs;
   }
 
-  g_idle_add (remove_idle, rrc);
+  tag_id = g_idle_add (remove_idle, rrc);
+  g_source_set_name_by_id (tag_id, "[grilo] remove_idle");
 
   return TRUE;
 }
@@ -4124,6 +4246,7 @@
 {
   struct StoreRelayCb *src;
   GrlSourceStoreSpec *ss;
+  guint id;
 
   GRL_DEBUG (__FUNCTION__);
 
@@ -4151,7 +4274,8 @@
 
   src->spec = ss;
 
-  g_idle_add (store_idle, ss);
+  id = g_idle_add (store_idle, ss);
+  g_source_set_name_by_id (id, "[grilo] store_idle");
 
   return TRUE;
 }
@@ -4431,7 +4555,7 @@
   g_ptr_array_set_free_func (changed_medias, (GDestroyNotify) g_object_unref);
 
   g_signal_emit (source,
-                 registry_signals[SIG_CONTENT_CHANGED],
+                 source_signals[SIG_CONTENT_CHANGED],
                  0,
                  changed_medias,
                  change_type,
diff -Nru grilo-0.2.9/src/grl-source.h grilo-0.2.10/src/grl-source.h
--- grilo-0.2.9/src/grl-source.h	2014-01-16 20:13:06.000000000 +0000
+++ grilo-0.2.10/src/grl-source.h	2014-03-20 09:13:39.000000000 +0000
@@ -633,6 +633,8 @@
 
 GrlMediaType grl_source_get_supported_media (GrlSource *source);
 
+const char ** grl_source_get_tags (GrlSource *source);
+
 G_END_DECLS
 
 #endif /* _GRL_SOURCE_H_ */
diff -Nru grilo-0.2.9/tools/grilo-inspect/grl-core-keys.h grilo-0.2.10/tools/grilo-inspect/grl-core-keys.h
--- grilo-0.2.9/tools/grilo-inspect/grl-core-keys.h	2014-02-18 14:16:04.000000000 +0000
+++ grilo-0.2.10/tools/grilo-inspect/grl-core-keys.h	2014-03-20 09:13:39.000000000 +0000
@@ -49,4 +49,5 @@
 "GRL_METADATA_KEY_PRODUCER",
 "GRL_METADATA_KEY_DIRECTOR",
 "GRL_METADATA_KEY_ORIGINAL_TITLE",
+"GRL_METADATA_KEY_SIZE",
 };
diff -Nru grilo-0.2.9/tools/grilo-test-ui/main.c grilo-0.2.10/tools/grilo-test-ui/main.c
--- grilo-0.2.9/tools/grilo-test-ui/main.c	2014-02-09 19:00:27.000000000 +0000
+++ grilo-0.2.10/tools/grilo-test-ui/main.c	2014-03-20 09:13:39.000000000 +0000
@@ -413,10 +413,8 @@
 static void
 set_cur_browse (GrlSource *source, GrlMedia *media)
 {
-  if (ui_state->cur_source)
-    g_object_unref (ui_state->cur_source);
-  if (ui_state->cur_container)
-    g_object_unref (ui_state->cur_container);
+  g_clear_object (&ui_state->cur_source);
+  g_clear_object (&ui_state->cur_container);
 
   if (source)
     g_object_ref (source);
@@ -430,10 +428,8 @@
 static void
 set_cur_resolve (GrlSource *source, GrlMedia *media)
 {
-  if (ui_state->cur_md_source)
-    g_object_unref (ui_state->cur_md_source);
-  if (ui_state->cur_md_media)
-    g_object_unref (ui_state->cur_md_media);
+  g_clear_object (&ui_state->cur_md_source);
+  g_clear_object (&ui_state->cur_md_media);
 
   if (source)
     g_object_ref (source);
@@ -707,9 +703,7 @@
 			-1);
 
     g_object_unref (media);
-    if (icon) {
-      g_object_unref (icon);
-    }
+    g_clear_object (&icon);
   }
 
   if (remaining == 0) {
@@ -870,12 +864,8 @@
   browse_history_push (ui_state->cur_source, ui_state->cur_container);
   browse (source, container);
 
-  if (source) {
-    g_object_unref (source);
-  }
-  if (content) {
-    g_object_unref (content);
-  }
+  g_clear_object (&source);
+  g_clear_object (&content);
 }
 
 static void
@@ -917,6 +907,27 @@
   return g_string_free (s, FALSE);
 }
 
+static char *
+tags_to_str (char **tags)
+{
+  GString *s;
+  guint i;
+
+  if (tags == NULL)
+    return g_strdup ("");
+
+  s = g_string_new (NULL);
+
+  for (i = 0; tags[i] != NULL; i++) {
+    g_string_append (s, tags[i]);
+    g_string_append (s, ", ");
+  }
+
+  if (i > 0)
+    g_string_truncate (s, s->len - 2);
+  return g_string_free (s, FALSE);
+}
+
 static void
 populate_source_metadata (GrlSource *source)
 {
@@ -940,6 +951,7 @@
     int rank;
     GrlMediaType supported_media;
     GIcon *icon;
+    char **tags;
 
     for (i = 0; i < G_N_ELEMENTS (str_props); i++) {
       g_object_get (G_OBJECT (source), str_props[i], &str, NULL);
@@ -952,6 +964,7 @@
                   "rank", &rank,
                   "supported-media", &supported_media,
                   "source-icon", &icon,
+                  "source-tags", &tags,
                   NULL);
 
     str = g_strdup_printf ("%i", auto_split_threshold);
@@ -972,6 +985,11 @@
       g_free (str);
       g_object_unref (icon);
     }
+
+    str = tags_to_str (tags);
+    add_source_metadata (view->metadata_model, "source-tags", str);
+    g_free (str);
+    g_strfreev (tags);
   }
 
   gtk_widget_set_sensitive (view->show_btn, FALSE);
@@ -1042,8 +1060,7 @@
   }
 
   g_object_unref (source);
-  if (content)
-    g_object_unref (content);
+  g_clear_object (&content);
 }
 
 static void
@@ -1077,8 +1094,7 @@
       GRL_WARNING ("Cannot use '%s' to show '%s'; using default application",
                    g_app_info_get_name (app),
                    ui_state->last_url);
-      g_error_free (error);
-      error = NULL;
+      g_clear_error (&error);
       g_app_info_launch_default_for_uri (ui_state->last_url, NULL, &error);
       if (error) {
         GRL_WARNING ("Cannot use default application to show '%s'. "
@@ -1106,10 +1122,8 @@
   browse_history_pop (&prev_source, &prev_container);
   browse (prev_source, prev_container);
 
-  if (prev_source)
-    g_object_unref (prev_source);
-  if (prev_container)
-    g_object_unref (prev_container);
+  g_clear_object (&prev_source);
+  g_clear_object (&prev_container);
 }
 
 static void
@@ -1264,12 +1278,8 @@
 
   grl_source_remove (source, media, remove_cb, NULL);
 
-  if (source) {
-    g_object_unref (source);
-  }
-  if (media) {
-    g_object_unref (media);
-  }
+  g_clear_object (&source);
+  g_clear_object (&media);
 }
 
 static void
@@ -1340,9 +1350,7 @@
       search (source, text);
     }
 
-    if (source) {
-      g_object_unref (source);
-    }
+    g_clear_object (&source);
   }
 }
 
@@ -1383,9 +1391,7 @@
     text = gtk_entry_get_text (GTK_ENTRY (view->query_text));
     query (source, text);
 
-    if (source) {
-      g_object_unref (source);
-    }
+    g_clear_object (&source);
   }
 }
 
@@ -1821,6 +1827,16 @@
   grl_operation_options_set_flags (default_resolve_options, RESOLVE_FLAGS);
 }
 
+static gboolean
+delete_event_cb (GtkWidget *widget,
+		 GdkEvent  *event,
+		 gpointer   user_data)
+{
+  gtk_widget_hide (widget);
+  gtk_main_quit ();
+  return TRUE;
+}
+
 static void
 ui_setup (void)
 {
@@ -1831,8 +1847,8 @@
   view->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (view->window), WINDOW_TITLE);
   gtk_window_resize (GTK_WINDOW (view->window), 600, 400);
-  g_signal_connect (G_OBJECT (view->window), "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (view->window), "delete-event",
+                    G_CALLBACK (delete_event_cb), NULL);
 
   GtkActionGroup *actions = gtk_action_group_new ("actions");
   gtk_action_group_add_actions (actions, entries, G_N_ELEMENTS (entries), NULL);
@@ -2109,16 +2125,7 @@
 static void
 free_stack (GList **stack)
 {
-  GList *iter;
-  iter = *stack;
-  while (iter) {
-    if (iter->data) {
-      g_object_unref (iter->data);
-    }
-    iter = g_list_next (iter);
-  }
-  g_list_free (*stack);
-  *stack = NULL;
+  g_list_free_full (*stack, g_object_unref);
 }
 
 static void
@@ -2209,6 +2216,24 @@
 }
 
 static void
+metadata_key_added_cb (GrlRegistry *registry,
+                       const gchar *key,
+                       gpointer user_data)
+{
+  gchar *message;
+  guint id;
+
+  message = g_strdup_printf ("New metadata key '%s' has been added", key);
+  id = gtk_statusbar_push (GTK_STATUSBAR (view->statusbar),
+                           view->statusbar_context_id,
+                           message);
+  g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
+                         remove_notification,
+                         GUINT_TO_POINTER (id));
+  g_free (message);
+}
+
+static void
 source_added_cb (GrlRegistry *registry,
                  GrlSource *source,
                  gpointer user_data)
@@ -2271,6 +2296,8 @@
 		    G_CALLBACK (source_added_cb), NULL);
   g_signal_connect (registry, "source-removed",
 		    G_CALLBACK (source_removed_cb), NULL);
+  g_signal_connect (registry, "metadata-key-added",
+                    G_CALLBACK (metadata_key_added_cb), NULL);
   if (!grl_registry_load_all_plugins (registry, NULL)) {
     g_error ("Failed to load plugins.");
   }
diff -Nru grilo-0.2.9/tools/vala/grilo-test.c grilo-0.2.10/tools/vala/grilo-test.c
--- grilo-0.2.9/tools/vala/grilo-test.c	2014-02-18 14:16:05.000000000 +0000
+++ grilo-0.2.10/tools/vala/grilo-test.c	2014-03-20 09:13:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* grilo-test.c generated by valac 0.23.2.9-cb12, the Vala compiler
+/* grilo-test.c generated by valac 0.23.3.20-47868, the Vala compiler
  * generated from grilo-test.vala, do not modify */