diff -Nru grilo-0.1.17/AUTHORS grilo-0.1.18/AUTHORS
--- grilo-0.1.17/AUTHORS	2011-05-17 14:35:24.000000000 +0000
+++ grilo-0.1.18/AUTHORS	2011-12-09 13:28:03.000000000 +0000
@@ -4,6 +4,7 @@
 Joaquim Rocha <jrocha@igalia.com>
 Juan A. Suarez Romero <jasuarez@igalia.com>
 Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
+Sam Thursfield <sam.thursfield@codethink.co.uk>
 Simon Pena Placer <spenap@gmail.com>
 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 Xabier Rodriguez Calvar <xrcalvar@igalia.com>
diff -Nru grilo-0.1.17/bindings/Makefile.in grilo-0.1.18/bindings/Makefile.in
--- grilo-0.1.17/bindings/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/bindings/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -133,6 +133,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -163,8 +165,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/bindings/vala/grilo-0.1.metadata grilo-0.1.18/bindings/vala/grilo-0.1.metadata
--- grilo-0.1.17/bindings/vala/grilo-0.1.metadata	2011-09-05 10:59:20.000000000 +0000
+++ grilo-0.1.18/bindings/vala/grilo-0.1.metadata	2011-12-09 13:28:03.000000000 +0000
@@ -1,7 +1,11 @@
 # Grilo library
 Grl cprefix="Grl" lower_case_cprefix="grl_" cheader_filename="grilo.h"
 
+# GrlConfig
+grl_config_new.source nullable="1"
+
 # GrlPluginRegistry
+grl_plugin_registry_add_config.config transfer_ownership="1"
 grl_plugin_registry_get_metadata_keys type_arguments="unowned KeyID" transfer_ownership="1"
 grl_plugin_registry_get_sources type_arguments="unowned MediaPlugin" transfer_ownership="1"
 grl_plugin_registry_get_sources_by_operations type_arguments="unowned MediaPlugin" transfer_ownership="1"
@@ -30,6 +34,7 @@
 grl_metadata_source_filter_supported.keys type_arguments="unowned KeyID" is_ref="1"
 grl_metadata_source_filter_writable type_arguments="unowned KeyID" transfer_ownership="1"
 grl_metadata_source_filter_writable.keys type_arguments="unowned KeyID" is_ref="1"
+grl_metadata_source_may_resolve.missing_keys type_arguments="unowned KeyID" is_out="1" transfer_ownership="1"
 grl_metadata_source_resolve.keys type_arguments="KeyID"
 grl_metadata_source_resolve_sync.keys type_arguments="KeyID"
 grl_metadata_source_set_metadata.keys type_arguments="KeyID"
diff -Nru grilo-0.1.17/bindings/vala/grilo-0.1.vapi grilo-0.1.18/bindings/vala/grilo-0.1.vapi
--- grilo-0.1.17/bindings/vala/grilo-0.1.vapi	2011-09-05 14:15:04.000000000 +0000
+++ grilo-0.1.18/bindings/vala/grilo-0.1.vapi	2011-12-09 17:54:16.000000000 +0000
@@ -5,7 +5,7 @@
 	[CCode (cheader_filename = "grilo.h")]
 	public class Config : GLib.Object {
 		[CCode (has_construct_function = false)]
-		public Config (string plugin, string source);
+		public Config (string plugin, string? source);
 		public unowned string get_api_key ();
 		public uchar get_api_key_blob (size_t size);
 		public unowned string get_api_secret ();
@@ -359,63 +359,63 @@
 	[Compact]
 	public class MetadataKey {
 		[CCode (cname = "GRL_METADATA_KEY_ALBUM")]
-		public GLib.ParamSpec ALBUM;
+		public static GLib.ParamSpec ALBUM;
 		[CCode (cname = "GRL_METADATA_KEY_ARTIST")]
-		public GLib.ParamSpec ARTIST;
+		public static GLib.ParamSpec ARTIST;
 		[CCode (cname = "GRL_METADATA_KEY_AUTHOR")]
-		public GLib.ParamSpec AUTHOR;
+		public static GLib.ParamSpec AUTHOR;
 		[CCode (cname = "GRL_METADATA_KEY_BITRATE")]
-		public GLib.ParamSpec BITRATE;
+		public static GLib.ParamSpec BITRATE;
 		[CCode (cname = "GRL_METADATA_KEY_CERTIFICATE")]
-		public GLib.ParamSpec CERTIFICATE;
+		public static GLib.ParamSpec CERTIFICATE;
 		[CCode (cname = "GRL_METADATA_KEY_CHILDCOUNT")]
-		public GLib.ParamSpec CHILDCOUNT;
+		public static GLib.ParamSpec CHILDCOUNT;
 		[CCode (cname = "GRL_METADATA_KEY_DATE")]
-		public GLib.ParamSpec DATE;
+		public static GLib.ParamSpec DATE;
 		[CCode (cname = "GRL_METADATA_KEY_DESCRIPTION")]
-		public GLib.ParamSpec DESCRIPTION;
+		public static GLib.ParamSpec DESCRIPTION;
 		[CCode (cname = "GRL_METADATA_KEY_DURATION")]
-		public GLib.ParamSpec DURATION;
+		public static GLib.ParamSpec DURATION;
 		[CCode (cname = "GRL_METADATA_KEY_EXTERNAL_PLAYER")]
-		public GLib.ParamSpec EXTERNAL_PLAYER;
+		public static GLib.ParamSpec EXTERNAL_PLAYER;
 		[CCode (cname = "GRL_METADATA_KEY_EXTERNAL_URL")]
-		public GLib.ParamSpec EXTERNAL_URL;
+		public static GLib.ParamSpec EXTERNAL_URL;
 		[CCode (cname = "GRL_METADATA_KEY_FRAMERATE")]
-		public GLib.ParamSpec FRAMERATE;
+		public static GLib.ParamSpec FRAMERATE;
 		[CCode (cname = "GRL_METADATA_KEY_GENRE")]
-		public GLib.ParamSpec GENRE;
+		public static GLib.ParamSpec GENRE;
 		[CCode (cname = "GRL_METADATA_KEY_HEIGHT")]
-		public GLib.ParamSpec HEIGHT;
+		public static GLib.ParamSpec HEIGHT;
 		[CCode (cname = "GRL_METADATA_KEY_ID")]
 		public static GLib.ParamSpec ID;
 		[CCode (cname = "GRL_METADATA_KEY_LAST_PLAYED")]
-		public GLib.ParamSpec LAST_PLAYED;
+		public static GLib.ParamSpec LAST_PLAYED;
 		[CCode (cname = "GRL_METADATA_KEY_LAST_POSITION")]
-		public GLib.ParamSpec LAST_POSITION;
+		public static GLib.ParamSpec LAST_POSITION;
 		[CCode (cname = "GRL_METADATA_KEY_LICENSE")]
-		public GLib.ParamSpec LICENSE;
+		public static GLib.ParamSpec LICENSE;
 		[CCode (cname = "GRL_METADATA_KEY_LYRICS")]
-		public GLib.ParamSpec LYRICS;
+		public static GLib.ParamSpec LYRICS;
 		[CCode (cname = "GRL_METADATA_KEY_MIME")]
-		public GLib.ParamSpec MIME;
+		public static GLib.ParamSpec MIME;
 		[CCode (cname = "GRL_METADATA_KEY_PLAY_COUNT")]
-		public GLib.ParamSpec PLAY_COUNT;
+		public static GLib.ParamSpec PLAY_COUNT;
 		[CCode (cname = "GRL_METADATA_KEY_RATING")]
-		public GLib.ParamSpec RATING;
+		public static GLib.ParamSpec RATING;
 		[CCode (cname = "GRL_METADATA_KEY_SITE")]
-		public GLib.ParamSpec SITE;
+		public static GLib.ParamSpec SITE;
 		[CCode (cname = "GRL_METADATA_KEY_SOURCE")]
-		public GLib.ParamSpec SOURCE;
+		public static GLib.ParamSpec SOURCE;
 		[CCode (cname = "GRL_METADATA_KEY_STUDIO")]
-		public GLib.ParamSpec STUDIO;
+		public static GLib.ParamSpec STUDIO;
 		[CCode (cname = "GRL_METADATA_KEY_THUMBNAIL")]
-		public GLib.ParamSpec THUMBNAIL;
+		public static GLib.ParamSpec THUMBNAIL;
 		[CCode (cname = "GRL_METADATA_KEY_TITLE")]
 		public static GLib.ParamSpec TITLE;
 		[CCode (cname = "GRL_METADATA_KEY_URL")]
 		public static GLib.ParamSpec URL;
 		[CCode (cname = "GRL_METADATA_KEY_WIDTH")]
-		public GLib.ParamSpec WIDTH;
+		public static GLib.ParamSpec WIDTH;
 		public static unowned GLib.List list_new (GLib.ParamSpec p, ...);
 	}
 	[CCode (cheader_filename = "grilo.h")]
@@ -431,7 +431,7 @@
 		public unowned string get_name ();
 		public void* get_operation_data (uint operation_id);
 		public virtual unowned GLib.List<weak Grl.KeyID> key_depends (Grl.KeyID key_id);
-		public virtual bool may_resolve (Grl.Media media, Grl.KeyID key_id, GLib.List missing_keys);
+		public virtual bool may_resolve (Grl.Media media, Grl.KeyID key_id, out GLib.List<weak Grl.KeyID> missing_keys);
 		public virtual void resolve (GLib.List<Grl.KeyID> keys, Grl.Media media, Grl.MetadataResolutionFlags flags, Grl.MetadataSourceResolveCb callback);
 		public unowned Grl.Media resolve_sync (GLib.List<Grl.KeyID> keys, Grl.Media media, Grl.MetadataResolutionFlags flags) throws GLib.Error;
 		public virtual void set_metadata (Grl.Media media, GLib.List<Grl.KeyID> keys, Grl.MetadataWritingFlags flags, Grl.MetadataSourceSetMetadataCb callback);
@@ -490,7 +490,7 @@
 	public class PluginRegistry : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected PluginRegistry ();
-		public bool add_config (Grl.Config config) throws GLib.Error;
+		public bool add_config (owned Grl.Config config) throws GLib.Error;
 		public bool add_config_from_file (string config_file) throws GLib.Error;
 		public void add_directory (string path);
 		public static unowned Grl.PluginRegistry get_default ();
@@ -615,16 +615,16 @@
 		NOTIFY_CHANGED_FAILED,
 		OPERATION_CANCELLED
 	}
-	[CCode (cheader_filename = "grilo.h", instance_pos = 2.1)]
-	public delegate void MediaSourceMetadataCb (Grl.MediaSource source, Grl.Media? media, GLib.Error error);
+	[CCode (cheader_filename = "grilo.h", instance_pos = 3.1)]
+	public delegate void MediaSourceMetadataCb (Grl.MediaSource source, uint operation_id, Grl.Media? media, GLib.Error error);
 	[CCode (cheader_filename = "grilo.h", instance_pos = 2.1)]
 	public delegate void MediaSourceRemoveCb (Grl.MediaSource source, Grl.Media? media, GLib.Error error);
 	[CCode (cheader_filename = "grilo.h", instance_pos = 4.1)]
 	public delegate void MediaSourceResultCb (Grl.MediaSource source, uint operation_id, Grl.Media? media, uint remaining, GLib.Error? error);
 	[CCode (cheader_filename = "grilo.h", instance_pos = 3.1)]
 	public delegate void MediaSourceStoreCb (Grl.MediaSource source, Grl.MediaBox? parent, Grl.Media? media, GLib.Error? error);
-	[CCode (cheader_filename = "grilo.h", instance_pos = 2.1)]
-	public delegate void MetadataSourceResolveCb (Grl.MetadataSource source, Grl.Media? media, GLib.Error? error);
+	[CCode (cheader_filename = "grilo.h", instance_pos = 3.1)]
+	public delegate void MetadataSourceResolveCb (Grl.MetadataSource source, uint operation_id, Grl.Media? media, GLib.Error? error);
 	[CCode (cheader_filename = "grilo.h", instance_pos = 3.1)]
 	public delegate void MetadataSourceSetMetadataCb (Grl.MetadataSource source, Grl.Media? media, GLib.List failed_keys, GLib.Error? error);
 	[CCode (cheader_filename = "grilo.h")]
diff -Nru grilo-0.1.17/bindings/vala/Makefile.in grilo-0.1.18/bindings/vala/Makefile.in
--- grilo-0.1.17/bindings/vala/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/bindings/vala/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -158,6 +158,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -188,8 +190,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/ChangeLog grilo-0.1.18/ChangeLog
--- grilo-0.1.17/ChangeLog	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/ChangeLog	2011-12-09 17:54:41.000000000 +0000
@@ -1,3 +1,249 @@
+commit 7ea70a3073ea0c1c8f5b4db230d36e7f7f42e7aa
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Fri Dec 9 12:51:04 2011 +0000
+
+    Bump to 0.1.18
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ AUTHORS      |    1 +
+ NEWS         |   17 +++++++++++++++++
+ configure.ac |    2 +-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+commit df502ee82e66e0f730ec3b43e55c64fb30d8b7d7
+Author: Guillaume Emont <guijemont@igalia.com>
+Date:   Fri Nov 25 13:22:15 2011 +0100
+
+    Ensure grl_metadata_list_key_new() is called with a sentinel
+    
+    This change triggers a compilation warning (with gcc) if the sentinel is
+    forgotten.
+
+ src/grl-util.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a19c5e079ebc97fa22635aca9a77fd8da05411b0
+Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date:   Wed Nov 23 19:03:40 2011 +0100
+
+    configure: Honour VAPIDIR environment variable
+
+ configure.ac |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 47f6c595365a1a996e7f09c038d55ec98c3eb55c
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Wed Nov 23 17:14:54 2011 +0000
+
+    wc-test: Remove reference from Makefile.am
+    
+    This fixes previous commit dda5a72d37136588228bc1fe5e1276f2f32e1905.
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ libs/net/Makefile.am |   12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+commit dda5a72d37136588228bc1fe5e1276f2f32e1905
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Wed Nov 23 17:00:07 2011 +0000
+
+    wc-test: Remove it
+    
+    Actually, this application was used as a tool to develop GrlNet, but actually
+    it isn't real test. So let's remove it.
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ libs/net/wc-test.c |   90 ----------------------------------------------------
+ 1 files changed, 0 insertions(+), 90 deletions(-)
+
+commit 608b42d13113f6a2a5db7aac9a79a9ff9cbe0b1d
+Author: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+Date:   Tue Nov 22 16:57:16 2011 +0100
+
+    build: conditional creation of grl-net.pc files
+    
+    If libsoup is not available, then the grl-net library will not be built. Hence
+    we shall not create the grl-net.pc files. Otherwise we will compile plugins
+    that will not be able to be loaded.
+    
+    Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+ configure.ac |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 9ad096ae06be056b51461253c53ea34b7aadfe87
+Author: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+Date:   Tue Nov 22 16:57:15 2011 +0100
+
+    build: avoid the export of NETCACHE variable
+    
+    NETCACHE variables is not used for compiler tasks, so the PKG_CHECK_MODULES
+    can be replaced by a PKG_CHECK_EXISTS, which does not export an automake
+    variable, as we only need to know if cache operations are supported in libsoup
+    given the version number.
+    
+    Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+ configure.ac |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e7ddbb39f8552c8dc158b5ff39f707883e93277f
+Author: Jens Georg <mail@jensge.org>
+Date:   Sat Oct 8 09:09:24 2011 +0200
+
+    core: Use full path to load plugin information
+
+ src/grl-plugin-registry.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9ec0f0a46aa7cc237727f50353e4113c9a163785
+Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date:   Thu Nov 10 19:21:26 2011 +0000
+
+    bindings/vala: Fix various bugs in Vala bindings
+
+ bindings/vala/grilo-0.1-custom.vala |   60 +++++++++++++++++-----------------
+ bindings/vala/grilo-0.1.metadata    |    5 +++
+ 2 files changed, 35 insertions(+), 30 deletions(-)
+
+commit 6b8b5e14fcd683a2c758939c113707f5bf2102ef
+Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date:   Thu Nov 10 19:26:29 2011 +0000
+
+    core: Introspection fixes
+
+ src/grl-media-source.c    |    4 ++--
+ src/grl-metadata-source.c |    2 +-
+ src/grl-multiple.c        |    2 +-
+ src/grl-plugin-registry.c |    2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 251c0d8097349fc8b1adcf7864bfa1139417e2ac
+Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date:   Wed Oct 26 13:57:11 2011 +0100
+
+    grl-net: Correctly unref operation async result
+    
+    Correct behaviour is to unref the GSimpleAsyncResult object after the call to
+    g_simple_async_result_complete(). It cannot be done in the async result's callback.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=662763
+    
+    Signed-off-by: Simon Pena <spena@igalia.com>
+
+ libs/net/grl-net-wc.c |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit a3359054083ac190de2fa0510d676ae35bbe8060
+Author: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date:   Wed Oct 26 12:36:41 2011 +0100
+
+    grl-net: Fix crashes in SoupRequest error case
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=662762
+    
+    Signed-off-by: Simon Pena <spena@igalia.com>
+
+ libs/net/grl-net-wc.c |   24 ++++++++++++++++++++----
+ 1 files changed, 20 insertions(+), 4 deletions(-)
+
+commit 1e0c3aab01e56f901b1e37c88067ceb72caaa691
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Fri Sep 23 14:27:16 2011 +0000
+
+    core: Use G_SEARCHPATH_SEPARATOR_S to separate paths
+    
+    Currently, it means in Unix ":" will be used as the separator for the list of
+    paths to search for plugins, while in Windows it will be ";".
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ src/grilo.c |   23 +++++++----------------
+ 1 files changed, 7 insertions(+), 16 deletions(-)
+
+commit e5a0497fdf3a71ccb92233945b707e1c2fe6c242
+Author: Damien Lespiau <damien.lespiau@intel.com>
+Date:   Mon Sep 19 11:32:45 2011 +0100
+
+    windows: Fix the default directory to look for plugins
+    
+    On windows, you need to detect at runtime where you are and build the path to
+    the plugins directory based on where you are being run. GLib provides a
+    function to do just that.
+    
+    Then, you can't really use ':' to separate paths eg. C:\foo:D:\bar
+
+ src/grilo.c |   36 ++++++++++++++++++++++++++++++++++--
+ 1 files changed, 34 insertions(+), 2 deletions(-)
+
+commit fa479cbabefad3f0f9ea7ffb2213fd2ad9b9e058
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Wed Sep 7 11:15:47 2011 +0000
+
+    core: Mention explicitly Grilo in the command-line options
+    
+    Current command-line options affects the way Grilo uses the plugins.
+    
+    But when asking for help, it only mentions 'plugins', not 'Grilo plugins'.
+    
+    As these options can be added to other applications, possible with his own
+    pluggable system, this commit clearly specify that we meant Grilo plugins when
+    asking for help for these options.
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ src/grilo.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3384ce6ce330b3a1a23a15c7752c4f747fbac131
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date:   Wed Sep 7 09:57:38 2011 +0000
+
+    build: Include bugzilla and homepage information into autotools init
+    
+    Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+
+ configure.ac |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 7d898d2d6a3ca00796691c8ab8d73a316efa0203
+Author: Damien Lespiau <damien.lespiau@intel.com>
+Date:   Mon Sep 5 12:44:28 2011 +0100
+
+    tools: Don't link against -ldl and -lpthread
+    
+    The tools don't use any of the symbols defined by those library and depending
+    on them should come from glib.
+
+ tools/grilo-inspect/Makefile.am |    1 -
+ tools/grilo-test-ui/Makefile.am |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 721008ddc61ff73eaeee8fc140a2120e5adad17a
+Author: Damien Lespiau <damien.lespiau@intel.com>
+Date:   Mon Sep 5 12:44:27 2011 +0100
+
+    gitignore: Ignore .exe files
+
+ .gitignore |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 50431f08a7ce9a8087edcb0ffc747ef7e155e489
+Author: Damien Lespiau <damien.lespiau@intel.com>
+Date:   Mon Sep 5 12:44:26 2011 +0100
+
+    build: Generate DLLs when compiling for Windows
+    
+    When compiling for windows, libtool needs the -no-undefined flag. As it's a
+    good practice to have it anyway, add it unconditionally.
+
+ libs/net/Makefile.am |    3 +++
+ src/Makefile.am      |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
 commit c78e287c04950dc55be59bca8ab523625394e89d
 Author: Juan A. Suarez Romero <jasuarez@igalia.com>
 Date:   Mon Sep 5 09:42:55 2011 +0200
@@ -6372,9 +6618,9 @@
                                               keylist);
          g_list_free (keylist)
 
- src/data/grl-media.c |  129 +++++++++++++++++++++++++++++++-------------------
+ src/data/grl-media.c |  135 ++++++++++++++++++++++++++++++-------------------
  src/data/grl-media.h |    9 +++-
- 2 files changed, 88 insertions(+), 50 deletions(-)
+ 2 files changed, 91 insertions(+), 53 deletions(-)
 
 commit f4a89f9d61b865724d018fb9f218ead8c7f29545
 Author: Juan A. Suarez Romero <jasuarez@igalia.com>
@@ -6451,9 +6697,9 @@
     Thus, when unserializing it all properties can be recovered in the media, and
     not only "id" and "source".
 
- src/data/grl-media.c |   87 +++++++++++++++++++++++++++++++++++++++++++-------
+ src/data/grl-media.c |   83 ++++++++++++++++++++++++++++++++++++++++++++------
  src/data/grl-media.h |    3 +-
- 2 files changed, 76 insertions(+), 14 deletions(-)
+ 2 files changed, 74 insertions(+), 12 deletions(-)
 
 commit da61ca03905fd367c3b236bd8424cf24c2e5a2e8
 Author: Juan A. Suarez Romero <jasuarez@igalia.com>
@@ -7288,9 +7534,9 @@
     Following the documentation in
     http://live.gnome.org/GObjectIntrospection/AutotoolsIntegration
 
- configure.ac    |   14 ++--------
+ configure.ac    |   12 +-------
  src/Makefile.am |   74 +++++++++++++++++++++++++++++--------------------------
- 2 files changed, 42 insertions(+), 46 deletions(-)
+ 2 files changed, 41 insertions(+), 45 deletions(-)
 
 commit e299a64e9da323145a85253a19812eddf26d92f8
 Author: Iago Toral Quiroga <itoral@igalia.com>
diff -Nru grilo-0.1.17/configure grilo-0.1.18/configure
--- grilo-0.1.17/configure	2011-09-05 14:14:28.000000000 +0000
+++ grilo-0.1.18/configure	2011-12-09 17:53:59.000000000 +0000
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for grilo 0.1.17.
+# Generated by GNU Autoconf 2.68 for grilo 0.1.18.
+#
+# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -244,10 +246,12 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
   fi
   exit 1
 fi
@@ -567,10 +571,10 @@
 # Identity of this package.
 PACKAGE_NAME='grilo'
 PACKAGE_TARNAME='grilo'
-PACKAGE_VERSION='0.1.17'
-PACKAGE_STRING='grilo 0.1.17'
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
+PACKAGE_VERSION='0.1.18'
+PACKAGE_STRING='grilo 0.1.18'
+PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core'
+PACKAGE_URL='http://live.gnome.org/Grilo'
 
 ac_unique_file="src"
 # Factoring default headers for most tests.
@@ -635,6 +639,8 @@
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+GTKDOC_DEPS_LIBS
+GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
@@ -653,8 +659,6 @@
 BUILD_GRILO_NET_WITH_CACHE_TRUE
 BUILD_GRILO_NET_FALSE
 BUILD_GRILO_NET_TRUE
-NETCACHE_LIBS
-NETCACHE_CFLAGS
 NET_LIBS
 NET_CFLAGS
 BUILD_GRILO_TEST_UI_FALSE
@@ -829,10 +833,10 @@
 GTU_LIBS
 NET_CFLAGS
 NET_LIBS
-NETCACHE_CFLAGS
-NETCACHE_LIBS
 VALA_CFLAGS
-VALA_LIBS'
+VALA_LIBS
+GTKDOC_DEPS_CFLAGS
+GTKDOC_DEPS_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1375,7 +1379,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.1.17 to adapt to many kinds of systems.
+\`configure' configures grilo 0.1.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1445,7 +1449,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grilo 0.1.17:";;
+     short | recursive ) echo "Configuration of grilo 0.1.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1480,7 +1484,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1507,17 +1511,18 @@
   GTU_LIBS    linker flags for GTU, overriding pkg-config
   NET_CFLAGS  C compiler flags for NET, overriding pkg-config
   NET_LIBS    linker flags for NET, overriding pkg-config
-  NETCACHE_CFLAGS
-              C compiler flags for NETCACHE, overriding pkg-config
-  NETCACHE_LIBS
-              linker flags for NETCACHE, overriding pkg-config
   VALA_CFLAGS C compiler flags for VALA, overriding pkg-config
   VALA_LIBS   linker flags for VALA, overriding pkg-config
+  GTKDOC_DEPS_CFLAGS
+              C compiler flags for GTKDOC_DEPS, overriding pkg-config
+  GTKDOC_DEPS_LIBS
+              linker flags for GTKDOC_DEPS, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core>.
+grilo home page: <http://live.gnome.org/Grilo>.
 _ACEOF
 ac_status=$?
 fi
@@ -1580,7 +1585,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grilo configure 0.1.17
+grilo configure 0.1.18
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1858,7 +1863,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.1.17, which was
+It was created by grilo $as_me 0.1.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2674,7 +2679,7 @@
 
 # Define the identity of the package.
  PACKAGE='grilo'
- VERSION='0.1.17'
+ VERSION='0.1.18'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3711,8 +3716,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -4557,6 +4562,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4596,7 +4606,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -5025,7 +5035,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5666,13 +5676,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -5819,6 +5829,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6207,7 +6218,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6218,7 +6229,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -6858,7 +6882,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -6869,6 +6899,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -6901,6 +6932,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -6922,7 +6954,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7327,7 +7361,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7405,6 +7454,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -7864,7 +7917,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -7955,18 +8010,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -8328,7 +8398,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -8581,8 +8650,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -8962,6 +9030,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9007,6 +9076,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -9035,10 +9105,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9051,7 +9117,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9090,7 +9156,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9714,11 +9779,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -9808,7 +9868,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -9817,7 +9877,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -9882,7 +9942,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10021,7 +10081,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10029,10 +10089,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10040,7 +10096,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10058,7 +10114,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10078,7 +10134,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -10089,7 +10145,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -10150,7 +10206,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10166,7 +10222,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10203,9 +10259,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10299,7 +10355,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10368,7 +10424,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10393,7 +10449,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10417,7 +10473,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10448,7 +10504,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10458,7 +10514,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11240,6 +11296,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -12127,76 +12185,15 @@
 	HAVE_LIBSOUP=yes
 fi
 
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETCACHE" >&5
-$as_echo_n "checking for NETCACHE... " >&6; }
-
-if test -n "$NETCACHE_CFLAGS"; then
-    pkg_cv_NETCACHE_CFLAGS="$NETCACHE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.33.4\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.33.4") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_NETCACHE_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.33.4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$NETCACHE_LIBS"; then
-    pkg_cv_NETCACHE_LIBS="$NETCACHE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.33.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.33.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NETCACHE_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.33.4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        NETCACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.33.4" 2>&1`
-        else
-	        NETCACHE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.33.4" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NETCACHE_PKG_ERRORS" >&5
-
-	HAVE_CACHED_LIBSOUP=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	HAVE_CACHED_LIBSOUP=no
+  HAVE_CACHED_LIBSOUP=yes
 else
-	NETCACHE_CFLAGS=$pkg_cv_NETCACHE_CFLAGS
-	NETCACHE_LIBS=$pkg_cv_NETCACHE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_CACHED_LIBSOUP=yes
+  HAVE_CACHED_LIBSOUP=no
 fi
 # Check whether --enable-grl_net was given.
 if test "${enable_grl_net+set}" = set; then :
@@ -12451,7 +12448,9 @@
                         as_fn_error $? "No Vala compiler found." "$LINENO" 5
                 fi
 
-                VAPIDIR=`$PKG_CONFIG --variable=vapidir $valapkg`
+                if test "x$VAPIDIR" = "x"; then
+                        VAPIDIR=`$PKG_CONFIG --variable=vapidir $valapkg`
+                fi
 
 
                 # Extract the first word of "vala-gen-introspect", so it can be a program name with args.
@@ -12561,6 +12560,7 @@
 
 
 
+
     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -12718,6 +12718,99 @@
 else
   as_fn_error $? "You need to have gtk-doc >= 1.10 installed to build $PACKAGE_NAME" "$LINENO" 5
 fi
+        if test "x$PACKAGE_NAME" != "xglib"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
+$as_echo_n "checking for GTKDOC_DEPS... " >&6; }
+
+if test -n "$GTKDOC_DEPS_CFLAGS"; then
+    pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_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.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTKDOC_DEPS_LIBS"; then
+    pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_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.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+        else
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
+
+$GTKDOC_DEPS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
+	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    fi
   fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
@@ -12906,7 +12999,12 @@
 # OUTPUT
 # ----------------------------------------------------------
 
-ac_config_files="$ac_config_files Makefile grilo-uninstalled.pc grilo-0.1.pc grilo-net-uninstalled.pc grilo-net-0.1.pc src/Makefile tests/Makefile tests/python/Makefile tests/python/util.py libs/Makefile libs/net/Makefile tools/Makefile tools/grilo-test-ui/Makefile tools/grilo-inspect/Makefile tools/vala/Makefile bindings/Makefile bindings/vala/Makefile bindings/vala/grilo-uninstalled.files bindings/vala/grilo-uninstalled.namespace bindings/vala/grilo-net-uninstalled.files bindings/vala/grilo-net-uninstalled.namespace doc/Makefile doc/grilo/Makefile examples/Makefile"
+if test "x$HAVE_LIBSOUP" = "xyes"; then
+   ac_config_files="$ac_config_files grilo-net-uninstalled.pc grilo-net-0.1.pc"
+
+fi
+
+ac_config_files="$ac_config_files Makefile grilo-uninstalled.pc grilo-0.1.pc src/Makefile tests/Makefile tests/python/Makefile tests/python/util.py libs/Makefile libs/net/Makefile tools/Makefile tools/grilo-test-ui/Makefile tools/grilo-inspect/Makefile tools/vala/Makefile bindings/Makefile bindings/vala/Makefile bindings/vala/grilo-uninstalled.files bindings/vala/grilo-uninstalled.namespace bindings/vala/grilo-net-uninstalled.files bindings/vala/grilo-net-uninstalled.namespace doc/Makefile doc/grilo/Makefile examples/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -13491,7 +13589,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.1.17, which was
+This file was extended by grilo $as_me 0.1.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13551,13 +13649,14 @@
 Configuration commands:
 $config_commands
 
-Report bugs to the package provider."
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core>.
+grilo home page: <http://live.gnome.org/Grilo>."
 
 _ACEOF
 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.1.17
+grilo config.status 0.1.18
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -13694,6 +13793,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -13776,7 +13876,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -13832,6 +13931,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -13882,7 +13982,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -13966,11 +14065,11 @@
     "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "grilo-net-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES grilo-net-uninstalled.pc" ;;
+    "grilo-net-0.1.pc") CONFIG_FILES="$CONFIG_FILES grilo-net-0.1.pc" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "grilo-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES grilo-uninstalled.pc" ;;
     "grilo-0.1.pc") CONFIG_FILES="$CONFIG_FILES grilo-0.1.pc" ;;
-    "grilo-net-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES grilo-net-uninstalled.pc" ;;
-    "grilo-net-0.1.pc") CONFIG_FILES="$CONFIG_FILES grilo-net-0.1.pc" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/python/Makefile") CONFIG_FILES="$CONFIG_FILES tests/python/Makefile" ;;
@@ -14701,8 +14800,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -14756,6 +14855,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -15057,10 +15159,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff -Nru grilo-0.1.17/configure.ac grilo-0.1.18/configure.ac
--- grilo-0.1.17/configure.ac	2011-09-05 14:14:05.000000000 +0000
+++ grilo-0.1.18/configure.ac	2011-12-09 17:53:49.000000000 +0000
@@ -9,10 +9,14 @@
 m4_define([prj_gir_name], [Grilo])
 m4_define([grl_major_version], [0])
 m4_define([grl_minor_version], [1])
-m4_define([grl_micro_version], [17])
+m4_define([grl_micro_version], [18])
 m4_define([prj_version], grl_major_version.grl_minor_version.grl_micro_version)
 
-AC_INIT([prj_name], [prj_version])
+AC_INIT([prj_name],
+        [prj_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core],
+        [prj_name],
+        [http://live.gnome.org/Grilo])
 
 AM_INIT_AUTOMAKE([foreign])
 
@@ -112,9 +116,9 @@
 			HAVE_LIBSOUP=yes,
 			HAVE_LIBSOUP=no)
 
-PKG_CHECK_MODULES(NETCACHE, libsoup-2.4 >= 2.33.4,
-                            HAVE_CACHED_LIBSOUP=yes,
-                            HAVE_CACHED_LIBSOUP=no)
+PKG_CHECK_EXISTS([libsoup-2.4 >= 2.33.4],
+		 [HAVE_CACHED_LIBSOUP=yes],
+		 [HAVE_CACHED_LIBSOUP=no])
 AC_ARG_ENABLE([grl_net],
         AS_HELP_STRING([--enable-grl-net],
                 [Enable Grilo Net library (default: auto)]),
@@ -199,7 +203,9 @@
                         AC_MSG_ERROR([No Vala compiler found.])
                 fi
 
-                VAPIDIR=`$PKG_CONFIG --variable=vapidir $valapkg`
+                if test "x$VAPIDIR" = "x"; then
+                        VAPIDIR=`$PKG_CONFIG --variable=vapidir $valapkg`
+                fi
                 AC_SUBST([VAPIDIR])
 
                 AC_PATH_PROG([VALA_GEN_INTROSPECT], [vala-gen-introspect])
@@ -251,12 +257,14 @@
 # OUTPUT
 # ----------------------------------------------------------
 
+if test "x$HAVE_LIBSOUP" = "xyes"; then
+   AC_CONFIG_FILES([grilo-net-uninstalled.pc grilo-net-0.1.pc])
+fi
+
 AC_CONFIG_FILES([
   Makefile
   grilo-uninstalled.pc
   grilo-0.1.pc
-  grilo-net-uninstalled.pc
-  grilo-net-0.1.pc
   src/Makefile
   tests/Makefile
   tests/python/Makefile
diff -Nru grilo-0.1.17/debian/changelog grilo-0.1.18/debian/changelog
--- grilo-0.1.17/debian/changelog	2011-10-02 11:45:28.000000000 +0000
+++ grilo-0.1.18/debian/changelog	2012-01-24 10:56:42.000000000 +0000
@@ -1,6 +1,16 @@
-grilo (0.1.17-1~stracciatellappa+oneiric1) oneiric; urgency=low
+grilo (0.1.18-1~stracciatellappa+oneiric1) oneiric; urgency=low
 
-  * Imported from debian unstable to gnome stracciatella ppa without changes
+  * Imported from debian testing to gnome stracciatella ppa without any changes
+
+
+  [ Alberto Garcia ]
+  * New upstream release.
+  * debian/watch: scan for .xz files, upstream no longer uses bz2.
+  * debian/copyright: rewrite using the machine-readable format.
+
+ -- Gianvito Cavasoli <janvitus@ubuntu-it.org>  Tue, 24 Jan 2012 11:55:12 +0100
+
+grilo (0.1.17-1) unstable; urgency=low
 
   * New upstream release.
   * debian/libgrilo-0.1-0.shlibs: new API, bump shlibs to 0.1.17.
@@ -10,7 +20,7 @@
   * debian/control: this release breaks grilo-plugins-0.1 << 0.1.17 since
     now plugin XML files are located in a different place.
 
- -- Gianvito Cavasoli <janvitus@ubuntu-it.org>  Sun, 02 Oct 2011 13:44:09 +0200
+ -- Alberto Garcia <agarcia@igalia.com>  Mon, 05 Sep 2011 23:25:51 +0300
 
 grilo (0.1.16-1) unstable; urgency=low
 
diff -Nru grilo-0.1.17/debian/copyright grilo-0.1.18/debian/copyright
--- grilo-0.1.17/debian/copyright	2011-09-06 12:37:06.000000000 +0000
+++ grilo-0.1.18/debian/copyright	2011-12-10 13:43:45.000000000 +0000
@@ -1,40 +1,18 @@
-This work was packaged for Debian by:
-
-    Alberto Garcia <agarcia@igalia.com> on Thu, 16 Jun 2011 12:26:33 +0300
-
-It was downloaded from:
-
-    http://ftp.gnome.org/pub/GNOME/sources/grilo/
-
-Upstream Authors:
-
-    Juan A. Suarez Romero <jasuarez@igalia.com>
-    Iago Toral Quiroga <itoral@igalia.com>
-    Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
-
-See the AUTHORS file for details on other contributors.
-
-Copyright:
-
-    Copyright (C) 2010, 2011 Igalia S.L.
-
-License:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public License
-    as published by the Free Software Foundation; version 2.1 of the
-    License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    On Debian systems, the complete text of the license can be found
-    in the file /usr/share/common-licenses/LGPL-2.1
-
-The Debian packaging is:
-
-    Copyright (C) 2011 Alberto Garcia <agarcia@igalia.com>
-
-and is licensed under the LGPL version 2.1,
-see "/usr/share/common-licenses/GPL-2.1".
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Contact: Juan A. Suarez Romero <jasuarez@igalia.com>
+Source: http://ftp.gnome.org/pub/GNOME/sources/grilo/
+
+Files: *
+Copyright: 2010-2011 Igalia, S.L.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ On Debian systems, the complete text of the license can be found in
+ the file /usr/share/common-licenses/LGPL-2.1
diff -Nru grilo-0.1.17/debian/watch grilo-0.1.18/debian/watch
--- grilo-0.1.17/debian/watch	2011-09-06 12:37:06.000000000 +0000
+++ grilo-0.1.18/debian/watch	2011-12-10 13:43:45.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/grilo/(\d\.\d)/grilo-(.*)\.tar\.bz2
+http://ftp.gnome.org/pub/GNOME/sources/grilo/(\d\.\d)/grilo-(.*)\.tar\.xz
diff -Nru grilo-0.1.17/doc/grilo/html/annotation-glossary.html grilo-0.1.18/doc/grilo/html/annotation-glossary.html
--- grilo-0.1.17/doc/grilo/html/annotation-glossary.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/annotation-glossary.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Annotation Glossary</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="deprecated-api-index.html" title="Index of deprecated API">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -81,6 +81,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/api-index-full.html grilo-0.1.18/doc/grilo/html/api-index-full.html
--- grilo-0.1.17/doc/grilo/html/api-index-full.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/api-index-full.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="grilo-GrlNetWc.html" title="GrlNetWc">
 <link rel="next" href="deprecated-api-index.html" title="Index of deprecated API">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1771,6 +1771,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/ch01.html grilo-0.1.18/doc/grilo/html/ch01.html
--- grilo-0.1.17/doc/grilo/html/ch01.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/ch01.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Quick start guide</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn01.html" title="Tutorial">
 <link rel="prev" href="rn01.html" title="Tutorial">
 <link rel="next" href="ch02.html" title="Environment Setup">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp6222576"></a>Quick start guide</h2></div></div></div>
+<a name="idp51480"></a>Quick start guide</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch01.html#quick-start"></a></span></dt>
 <dd><dl>
@@ -95,6 +95,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/ch02.html grilo-0.1.18/doc/grilo/html/ch02.html
--- grilo-0.1.17/doc/grilo/html/ch02.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/ch02.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Environment Setup</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn01.html" title="Tutorial">
 <link rel="prev" href="ch01.html" title="Quick start guide">
 <link rel="next" href="ch03.html" title="Writing applications with Grilo">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp6223256"></a>Environment Setup</h2></div></div></div>
+<a name="idp1695112"></a>Environment Setup</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch02.html#environment-setup"></a></span></dt>
 <dd><dl>
@@ -206,6 +206,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/ch03.html grilo-0.1.18/doc/grilo/html/ch03.html
--- grilo-0.1.17/doc/grilo/html/ch03.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/ch03.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Writing applications with Grilo</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn01.html" title="Tutorial">
 <link rel="prev" href="ch02.html" title="Environment Setup">
 <link rel="next" href="ch04.html" title="Writing plugins for Grilo">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp6223912"></a>Writing applications with Grilo</h2></div></div></div>
+<a name="idp1695768"></a>Writing applications with Grilo</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch03.html#writing-apps"></a></span></dt>
 <dd><dl>
@@ -308,7 +308,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="idp10721304"></a>Metadata keys</h4></div></div></div>
+<a name="idp6439432"></a>Metadata keys</h4></div></div></div>
 <p>
         Metadata keys identify pieces of information (metadata).
         They are often an input parameter for many operations
@@ -1179,6 +1179,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/ch04.html grilo-0.1.18/doc/grilo/html/ch04.html
--- grilo-0.1.17/doc/grilo/html/ch04.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/ch04.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Writing plugins for Grilo</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn01.html" title="Tutorial">
 <link rel="prev" href="ch03.html" title="Writing applications with Grilo">
 <link rel="next" href="rn02.html" title="Object Index">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp6224568"></a>Writing plugins for Grilo</h2></div></div></div>
+<a name="idp1696424"></a>Writing plugins for Grilo</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch04.html#writing-plugins"></a></span></dt>
 <dd><dl>
@@ -1583,6 +1583,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/configure.html grilo-0.1.18/doc/grilo/html/configure.html
--- grilo-0.1.17/doc/grilo/html/configure.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/configure.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Configuring plug-ins</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="grilo-Multiple.html" title="Multiple">
 <link rel="next" href="GrlConfig.html" title="GrlConfig">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,6 +28,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/data.html grilo-0.1.18/doc/grilo/html/data.html
--- grilo-0.1.17/doc/grilo/html/data.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/data.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Media data</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="GrlConfig.html" title="GrlConfig">
 <link rel="next" href="GrlData.html" title="GrlData">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,6 +49,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/deprecated-api-index.html grilo-0.1.18/doc/grilo/html/deprecated-api-index.html
--- grilo-0.1.17/doc/grilo/html/deprecated-api-index.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/deprecated-api-index.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index of deprecated API</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,6 +26,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo.devhelp grilo-0.1.18/doc/grilo/html/grilo.devhelp
--- grilo-0.1.17/doc/grilo/html/grilo.devhelp	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo.devhelp	1970-01-01 00:00:00.000000000 +0000
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="Grilo Reference Manual" link="index.html" author="" name="grilo">
-  <chapters>
-    <sub name="Overview" link="pr01.html">
-      <sub name="" link="pr01.html#overview"/>
-    </sub>
-    <sub name="Tutorial" link="rn01.html">
-      <sub name="Quick start guide" link="ch01.html">
-        <sub name="" link="ch01.html#quick-start">
-          <sub name="Building Grilo from sources" link="ch01.html#building-grilo"/>
-          <sub name="Testing Grilo" link="ch01.html#testing-grilo"/>
-          <sub name="Compiling Grilo based programs" link="ch01.html#compiling-grilo-programs"/>
-        </sub>
-      </sub>
-      <sub name="Environment Setup" link="ch02.html">
-        <sub name="" link="ch02.html#environment-setup">
-          <sub name="Building Grilo " link="ch02.html#building-grilo-detailed">
-            <sub name="Building and installing Grilo" link="ch02.html#building-grilo-sources-install"/>
-            <sub name="Building and not installing Grilo" link="ch02.html#building-grilo-sources-uninstalled"/>
-            <sub name="Compilation options" link="ch02.html#compilation-options"/>
-          </sub>
-          <sub name="Compiling Grilo based programs" link="ch02.html#compiling-grilo-programs-detailed"/>
-          <sub name="Running Grilo based programs" link="ch02.html#running-grilo-programs-detailed"/>
-          <sub name="Debugging with Grilo" link="ch02.html#debugging-with-grilo"/>
-        </sub>
-      </sub>
-      <sub name="Writing applications with Grilo" link="ch03.html">
-        <sub name="" link="ch03.html#writing-apps">
-          <sub name="Basic concepts" link="ch03.html#programming-with-grilo-concepts">
-            <sub name="Understanding Grilo" link="ch03.html#programming-with-grilo-concepts-understanding"/>
-            <sub name="Media Sources" link="ch03.html#programming-with-grilo-media-sources"/>
-            <sub name="Metadata Sources" link="ch03.html#programming-with-grilo-metadata-sources"/>
-            <sub name="Asynchronous APIs" link="ch03.html#programming-with-grilo-async-apis"/>
-            <sub name="Operation identifiers" link="ch03.html#programming-with-grilo-operation-identifiers"/>
-            <sub name="Media objects" link="ch03.html#programmaing-with-grilo-media-objects"/>
-            <sub name="Metadata keys" link="ch03.html#idp10721304"/>
-          </sub>
-          <sub name="Typical use cases explained" link="ch03.html#programming-with-grilo-use-cases-explained">
-            <sub name="Configuring your plugins" link="ch03.html#programming-with-grilo-configuring-plugins"/>
-            <sub name="Browsing media content" link="ch03.html#programming-with-grilo-browsing"/>
-            <sub name="Searching media content" link="ch03.html#programming-with-grilo-searching"/>
-            <sub name="Handling multi-valued metadata" link="ch03.html#programming-with-grilo-multivalued-data"/>
-            <sub name="Efficient metadata resolution" link="ch03.html#programming-with-grilo-efficient-metadata-resolution"/>
-          </sub>
-        </sub>
-      </sub>
-      <sub name="Writing plugins for Grilo" link="ch04.html">
-        <sub name="" link="ch04.html#writing-plugins">
-          <sub name="Media Source plugins" link="ch04.html#media-source-plugins">
-            <sub name="" link="ch04.html#idp10433816">
-              <sub name="Introduction" link="ch04.html#media-source-plugins-intro"/>
-              <sub name="Registering Media Source Plugins" link="ch04.html#media-source-plugins-basics"/>
-              <sub name="Implementing Supported Keys" link="ch04.html#media-source-plugins-supported-keys"/>
-              <sub name="Implementing Slow Keys" link="ch04.html#media-source-plugins-slow-keys"/>
-              <sub name="Implementing Search" link="ch04.html#media-source-plugins-search"/>
-              <sub name="Implementing Browse" link="ch04.html#media-source-plugins-browse"/>
-              <sub name="Implementing Query" link="ch04.html#media-source-plugins-query"/>
-              <sub name="Common considerations for Search, Browse and Query implementations" link="ch04.html#media-source-plugins-common-considerations"/>
-              <sub name="Implementing Metadata" link="ch04.html#media-source-plugins-metadata"/>
-              <sub name="Implementing Store" link="ch04.html#media-source-plugins-store"/>
-              <sub name="Implementing Remove" link="ch04.html#media-source-plugins-remove"/>
-              <sub name="Implementing Media from URI" link="ch04.html#media-source-plugins-media-from-uri"/>
-              <sub name="Notifying changes" link="ch04.html#media-source-plugins-change_notification"/>
-            </sub>
-          </sub>
-          <sub name="Metadata Source plugins" link="ch04.html#metadata-source-plugins">
-            <sub name="" link="ch04.html#idp10957984">
-              <sub name="Introduction" link="ch04.html#metadata-source-plugins-intro"/>
-              <sub name="Registering the plugin" link="ch04.html#metadata-source-plugins-basics"/>
-              <sub name="Implementing Resolve" link="ch04.html#metadata-source-plugins-resolve"/>
-              <sub name="Implementing Set Metadata" link="ch04.html#metadata-source-plugins-set-metadata"/>
-              <sub name="Cancelling ongoing operations" link="ch04.html#metadata-source-plugins-cancel"/>
-            </sub>
-          </sub>
-          <sub name="Testing your plugins" link="ch04.html#testing-plugins">
-            <sub name="Testing your plugins" link="ch04.html#media-source-testing-plugins"/>
-          </sub>
-        </sub>
-      </sub>
-    </sub>
-    <sub name="Object Index" link="rn02.html"/>
-    <sub name="API Reference" link="rn03.html">
-      <sub name="grilo" link="grilo-grilo.html"/>
-      <sub name="Plug-in management" link="plugin-management.html">
-        <sub name="GrlPluginRegistry" link="GrlPluginRegistry.html"/>
-      </sub>
-      <sub name="Data sources" link="sources.html">
-        <sub name="GrlMediaPlugin" link="GrlMediaPlugin.html"/>
-        <sub name="GrlMetadataSource" link="GrlMetadataSource.html"/>
-        <sub name="GrlMediaSource" link="GrlMediaSource.html"/>
-      </sub>
-      <sub name="Search in multiple sources" link="multiple.html">
-        <sub name="Multiple" link="grilo-Multiple.html"/>
-      </sub>
-      <sub name="Configuring plug-ins" link="configure.html">
-        <sub name="GrlConfig" link="GrlConfig.html"/>
-      </sub>
-      <sub name="Media data" link="data.html">
-        <sub name="GrlData" link="GrlData.html"/>
-        <sub name="GrlRelatedKeys" link="GrlRelatedKeys.html"/>
-        <sub name="GrlMedia" link="GrlMedia.html"/>
-        <sub name="GrlMediaBox" link="GrlMediaBox.html"/>
-        <sub name="GrlMediaVideo" link="GrlMediaVideo.html"/>
-        <sub name="GrlMediaAudio" link="GrlMediaAudio.html"/>
-        <sub name="GrlMediaImage" link="GrlMediaImage.html"/>
-      </sub>
-      <sub name="Misc" link="misc.html">
-        <sub name="grl-metadata-key" link="grilo-grl-metadata-key.html"/>
-        <sub name="grl-log" link="grilo-grl-log.html"/>
-        <sub name="grl-error" link="grilo-grl-error.html"/>
-        <sub name="grl-definitions" link="grilo-grl-definitions.html"/>
-        <sub name="grl-operation" link="grilo-grl-operation.html"/>
-        <sub name="grl-util" link="grilo-grl-util.html"/>
-      </sub>
-    </sub>
-    <sub name="Grilo Libraries" link="rn04.html">
-      <sub name="Grilo Net Classes" link="grilo-net.html">
-        <sub name="GrlNetWc" link="grilo-GrlNetWc.html"/>
-      </sub>
-    </sub>
-    <sub name="API Index" link="api-index-full.html"/>
-    <sub name="Index of deprecated API" link="deprecated-api-index.html"/>
-    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
-  </chapters>
-  <functions>
-    <function name="grl_init ()" link="grilo-grilo.html#grl-init"/>
-    <function name="grl_init_get_option_group ()" link="grilo-grilo.html#grl-init-get-option-group"/>
-    <function name="GRL_PLUGIN_PATH_VAR" link="GrlPluginRegistry.html#GRL-PLUGIN-PATH-VAR:CAPS"/>
-    <function name="GRL_PLUGIN_RANKS_VAR" link="GrlPluginRegistry.html#GRL-PLUGIN-RANKS-VAR:CAPS"/>
-    <function name="GRL_PLUGIN_REGISTER()" link="GrlPluginRegistry.html#GRL-PLUGIN-REGISTER:CAPS"/>
-    <function name="struct GrlPluginInfo" link="GrlPluginRegistry.html#GrlPluginInfo"/>
-    <function name="struct GrlPluginDescriptor" link="GrlPluginRegistry.html#GrlPluginDescriptor"/>
-    <function name="enum GrlPluginRank" link="GrlPluginRegistry.html#GrlPluginRank"/>
-    <function name="struct GrlPluginRegistry" link="GrlPluginRegistry.html#GrlPluginRegistry-struct"/>
-    <function name="struct GrlPluginRegistryClass" link="GrlPluginRegistry.html#GrlPluginRegistryClass"/>
-    <function name="grl_plugin_registry_get_default ()" link="GrlPluginRegistry.html#grl-plugin-registry-get-default"/>
-    <function name="grl_plugin_registry_add_directory ()" link="GrlPluginRegistry.html#grl-plugin-registry-add-directory"/>
-    <function name="grl_plugin_registry_load ()" link="GrlPluginRegistry.html#grl-plugin-registry-load"/>
-    <function name="grl_plugin_registry_load_directory ()" link="GrlPluginRegistry.html#grl-plugin-registry-load-directory"/>
-    <function name="grl_plugin_registry_unload ()" link="GrlPluginRegistry.html#grl-plugin-registry-unload"/>
-    <function name="grl_plugin_registry_load_all ()" link="GrlPluginRegistry.html#grl-plugin-registry-load-all"/>
-    <function name="grl_plugin_registry_load_by_id ()" link="GrlPluginRegistry.html#grl-plugin-registry-load-by-id"/>
-    <function name="grl_plugin_registry_register_source ()" link="GrlPluginRegistry.html#grl-plugin-registry-register-source"/>
-    <function name="grl_plugin_registry_unregister_source ()" link="GrlPluginRegistry.html#grl-plugin-registry-unregister-source"/>
-    <function name="grl_plugin_registry_lookup_source ()" link="GrlPluginRegistry.html#grl-plugin-registry-lookup-source"/>
-    <function name="grl_plugin_registry_get_sources ()" link="GrlPluginRegistry.html#grl-plugin-registry-get-sources"/>
-    <function name="grl_plugin_registry_get_sources_by_operations ()" link="GrlPluginRegistry.html#grl-plugin-registry-get-sources-by-operations"/>
-    <function name="grl_plugin_registry_register_metadata_key ()" link="GrlPluginRegistry.html#grl-plugin-registry-register-metadata-key"/>
-    <function name="grl_plugin_registry_register_metadata_key_relation ()" link="GrlPluginRegistry.html#grl-plugin-registry-register-metadata-key-relation"/>
-    <function name="grl_plugin_registry_lookup_metadata_key ()" link="GrlPluginRegistry.html#grl-plugin-registry-lookup-metadata-key"/>
-    <function name="grl_plugin_registry_lookup_metadata_key_relation ()" link="GrlPluginRegistry.html#grl-plugin-registry-lookup-metadata-key-relation"/>
-    <function name="grl_plugin_registry_get_metadata_keys ()" link="GrlPluginRegistry.html#grl-plugin-registry-get-metadata-keys"/>
-    <function name="grl_plugin_registry_add_config ()" link="GrlPluginRegistry.html#grl-plugin-registry-add-config"/>
-    <function name="grl_plugin_registry_add_config_from_file ()" link="GrlPluginRegistry.html#grl-plugin-registry-add-config-from-file"/>
-    <function name="The &quot;source-added&quot; signal" link="GrlPluginRegistry.html#GrlPluginRegistry-source-added"/>
-    <function name="The &quot;source-removed&quot; signal" link="GrlPluginRegistry.html#GrlPluginRegistry-source-removed"/>
-    <function name="GRL_MEDIA_PLUGIN_NAME" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-NAME:CAPS"/>
-    <function name="GRL_MEDIA_PLUGIN_DESCRIPTION" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-DESCRIPTION:CAPS"/>
-    <function name="GRL_MEDIA_PLUGIN_VERSION" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-VERSION:CAPS"/>
-    <function name="GRL_MEDIA_PLUGIN_LICENSE" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-LICENSE:CAPS"/>
-    <function name="GRL_MEDIA_PLUGIN_AUTHOR" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-AUTHOR:CAPS"/>
-    <function name="GRL_MEDIA_PLUGIN_SITE" link="GrlMediaPlugin.html#GRL-MEDIA-PLUGIN-SITE:CAPS"/>
-    <function name="struct GrlMediaPlugin" link="GrlMediaPlugin.html#GrlMediaPlugin-struct"/>
-    <function name="struct GrlMediaPluginClass" link="GrlMediaPlugin.html#GrlMediaPluginClass"/>
-    <function name="grl_media_plugin_get_name ()" link="GrlMediaPlugin.html#grl-media-plugin-get-name"/>
-    <function name="grl_media_plugin_get_description ()" link="GrlMediaPlugin.html#grl-media-plugin-get-description"/>
-    <function name="grl_media_plugin_get_version ()" link="GrlMediaPlugin.html#grl-media-plugin-get-version"/>
-    <function name="grl_media_plugin_get_license ()" link="GrlMediaPlugin.html#grl-media-plugin-get-license"/>
-    <function name="grl_media_plugin_get_author ()" link="GrlMediaPlugin.html#grl-media-plugin-get-author"/>
-    <function name="grl_media_plugin_get_site ()" link="GrlMediaPlugin.html#grl-media-plugin-get-site"/>
-    <function name="grl_media_plugin_get_id ()" link="GrlMediaPlugin.html#grl-media-plugin-get-id"/>
-    <function name="grl_media_plugin_get_filename ()" link="GrlMediaPlugin.html#grl-media-plugin-get-filename"/>
-    <function name="grl_media_plugin_get_rank ()" link="GrlMediaPlugin.html#grl-media-plugin-get-rank"/>
-    <function name="grl_media_plugin_get_info_keys ()" link="GrlMediaPlugin.html#grl-media-plugin-get-info-keys"/>
-    <function name="grl_media_plugin_get_info ()" link="GrlMediaPlugin.html#grl-media-plugin-get-info"/>
-    <function name="enum GrlMetadataResolutionFlags" link="GrlMetadataSource.html#GrlMetadataResolutionFlags"/>
-    <function name="enum GrlMetadataWritingFlags" link="GrlMetadataSource.html#GrlMetadataWritingFlags"/>
-    <function name="struct GrlMetadataSource" link="GrlMetadataSource.html#GrlMetadataSource-struct"/>
-    <function name="GrlMetadataSourceResolveCb ()" link="GrlMetadataSource.html#GrlMetadataSourceResolveCb"/>
-    <function name="GrlMetadataSourceSetMetadataCb ()" link="GrlMetadataSource.html#GrlMetadataSourceSetMetadataCb"/>
-    <function name="GrlMetadataSourceResolveSpec" link="GrlMetadataSource.html#GrlMetadataSourceResolveSpec"/>
-    <function name="GrlMetadataSourceSetMetadataSpec" link="GrlMetadataSource.html#GrlMetadataSourceSetMetadataSpec"/>
-    <function name="enum GrlSupportedOps" link="GrlMetadataSource.html#GrlSupportedOps"/>
-    <function name="struct GrlMetadataSourceClass" link="GrlMetadataSource.html#GrlMetadataSourceClass"/>
-    <function name="grl_metadata_source_supported_operations ()" link="GrlMetadataSource.html#grl-metadata-source-supported-operations"/>
-    <function name="grl_metadata_source_supported_keys ()" link="GrlMetadataSource.html#grl-metadata-source-supported-keys"/>
-    <function name="grl_metadata_source_slow_keys ()" link="GrlMetadataSource.html#grl-metadata-source-slow-keys"/>
-    <function name="grl_metadata_source_filter_supported ()" link="GrlMetadataSource.html#grl-metadata-source-filter-supported"/>
-    <function name="grl_metadata_source_filter_slow ()" link="GrlMetadataSource.html#grl-metadata-source-filter-slow"/>
-    <function name="grl_metadata_source_filter_writable ()" link="GrlMetadataSource.html#grl-metadata-source-filter-writable"/>
-    <function name="grl_metadata_source_writable_keys ()" link="GrlMetadataSource.html#grl-metadata-source-writable-keys"/>
-    <function name="grl_metadata_source_may_resolve ()" link="GrlMetadataSource.html#grl-metadata-source-may-resolve"/>
-    <function name="grl_metadata_source_resolve ()" link="GrlMetadataSource.html#grl-metadata-source-resolve"/>
-    <function name="grl_metadata_source_resolve_sync ()" link="GrlMetadataSource.html#grl-metadata-source-resolve-sync"/>
-    <function name="grl_metadata_source_set_metadata ()" link="GrlMetadataSource.html#grl-metadata-source-set-metadata"/>
-    <function name="grl_metadata_source_set_metadata_sync ()" link="GrlMetadataSource.html#grl-metadata-source-set-metadata-sync"/>
-    <function name="grl_metadata_source_get_id ()" link="GrlMetadataSource.html#grl-metadata-source-get-id"/>
-    <function name="grl_metadata_source_get_name ()" link="GrlMetadataSource.html#grl-metadata-source-get-name"/>
-    <function name="grl_metadata_source_get_description ()" link="GrlMetadataSource.html#grl-metadata-source-get-description"/>
-    <function name="The &quot;source-desc&quot; property" link="GrlMetadataSource.html#GrlMetadataSource--source-desc"/>
-    <function name="The &quot;source-id&quot; property" link="GrlMetadataSource.html#GrlMetadataSource--source-id"/>
-    <function name="The &quot;source-name&quot; property" link="GrlMetadataSource.html#GrlMetadataSource--source-name"/>
-    <function name="enum GrlMediaSourceChangeType" link="GrlMediaSource.html#GrlMediaSourceChangeType"/>
-    <function name="struct GrlMediaSource" link="GrlMediaSource.html#GrlMediaSource-struct"/>
-    <function name="GrlMediaSourceResultCb ()" link="GrlMediaSource.html#GrlMediaSourceResultCb"/>
-    <function name="GrlMediaSourceMetadataCb ()" link="GrlMediaSource.html#GrlMediaSourceMetadataCb"/>
-    <function name="GrlMediaSourceStoreCb ()" link="GrlMediaSource.html#GrlMediaSourceStoreCb"/>
-    <function name="GrlMediaSourceRemoveCb ()" link="GrlMediaSource.html#GrlMediaSourceRemoveCb"/>
-    <function name="GrlMediaSourceBrowseSpec" link="GrlMediaSource.html#GrlMediaSourceBrowseSpec"/>
-    <function name="GrlMediaSourceSearchSpec" link="GrlMediaSource.html#GrlMediaSourceSearchSpec"/>
-    <function name="GrlMediaSourceQuerySpec" link="GrlMediaSource.html#GrlMediaSourceQuerySpec"/>
-    <function name="GrlMediaSourceMetadataSpec" link="GrlMediaSource.html#GrlMediaSourceMetadataSpec"/>
-    <function name="GrlMediaSourceStoreSpec" link="GrlMediaSource.html#GrlMediaSourceStoreSpec"/>
-    <function name="GrlMediaSourceRemoveSpec" link="GrlMediaSource.html#GrlMediaSourceRemoveSpec"/>
-    <function name="GrlMediaSourceMediaFromUriSpec" link="GrlMediaSource.html#GrlMediaSourceMediaFromUriSpec"/>
-    <function name="struct GrlMediaSourceClass" link="GrlMediaSource.html#GrlMediaSourceClass"/>
-    <function name="grl_media_source_browse ()" link="GrlMediaSource.html#grl-media-source-browse"/>
-    <function name="grl_media_source_browse_sync ()" link="GrlMediaSource.html#grl-media-source-browse-sync"/>
-    <function name="grl_media_source_search ()" link="GrlMediaSource.html#grl-media-source-search"/>
-    <function name="grl_media_source_search_sync ()" link="GrlMediaSource.html#grl-media-source-search-sync"/>
-    <function name="grl_media_source_query ()" link="GrlMediaSource.html#grl-media-source-query"/>
-    <function name="grl_media_source_query_sync ()" link="GrlMediaSource.html#grl-media-source-query-sync"/>
-    <function name="grl_media_source_metadata ()" link="GrlMediaSource.html#grl-media-source-metadata"/>
-    <function name="grl_media_source_metadata_sync ()" link="GrlMediaSource.html#grl-media-source-metadata-sync"/>
-    <function name="grl_media_source_store ()" link="GrlMediaSource.html#grl-media-source-store"/>
-    <function name="grl_media_source_store_sync ()" link="GrlMediaSource.html#grl-media-source-store-sync"/>
-    <function name="grl_media_source_remove ()" link="GrlMediaSource.html#grl-media-source-remove"/>
-    <function name="grl_media_source_remove_sync ()" link="GrlMediaSource.html#grl-media-source-remove-sync"/>
-    <function name="grl_media_source_set_auto_split_threshold ()" link="GrlMediaSource.html#grl-media-source-set-auto-split-threshold"/>
-    <function name="grl_media_source_get_auto_split_threshold ()" link="GrlMediaSource.html#grl-media-source-get-auto-split-threshold"/>
-    <function name="grl_media_source_test_media_from_uri ()" link="GrlMediaSource.html#grl-media-source-test-media-from-uri"/>
-    <function name="grl_media_source_get_media_from_uri ()" link="GrlMediaSource.html#grl-media-source-get-media-from-uri"/>
-    <function name="grl_media_source_get_media_from_uri_sync ()" link="GrlMediaSource.html#grl-media-source-get-media-from-uri-sync"/>
-    <function name="grl_media_source_notify_change_start ()" link="GrlMediaSource.html#grl-media-source-notify-change-start"/>
-    <function name="grl_media_source_notify_change_stop ()" link="GrlMediaSource.html#grl-media-source-notify-change-stop"/>
-    <function name="grl_media_source_notify_change_list ()" link="GrlMediaSource.html#grl-media-source-notify-change-list"/>
-    <function name="grl_media_source_notify_change ()" link="GrlMediaSource.html#grl-media-source-notify-change"/>
-    <function name="The &quot;auto-split-threshold&quot; property" link="GrlMediaSource.html#GrlMediaSource--auto-split-threshold"/>
-    <function name="The &quot;content-changed&quot; signal" link="GrlMediaSource.html#GrlMediaSource-content-changed"/>
-    <function name="grl_multiple_search ()" link="grilo-Multiple.html#grl-multiple-search"/>
-    <function name="grl_multiple_search_sync ()" link="grilo-Multiple.html#grl-multiple-search-sync"/>
-    <function name="grl_multiple_get_media_from_uri ()" link="grilo-Multiple.html#grl-multiple-get-media-from-uri"/>
-    <function name="GRL_CONFIG_KEY_PLUGIN" link="GrlConfig.html#GRL-CONFIG-KEY-PLUGIN:CAPS"/>
-    <function name="GRL_CONFIG_KEY_SOURCE" link="GrlConfig.html#GRL-CONFIG-KEY-SOURCE:CAPS"/>
-    <function name="GRL_CONFIG_KEY_APIKEY" link="GrlConfig.html#GRL-CONFIG-KEY-APIKEY:CAPS"/>
-    <function name="GRL_CONFIG_KEY_APIKEY_BLOB" link="GrlConfig.html#GRL-CONFIG-KEY-APIKEY-BLOB:CAPS"/>
-    <function name="GRL_CONFIG_KEY_APITOKEN" link="GrlConfig.html#GRL-CONFIG-KEY-APITOKEN:CAPS"/>
-    <function name="GRL_CONFIG_KEY_APISECRET" link="GrlConfig.html#GRL-CONFIG-KEY-APISECRET:CAPS"/>
-    <function name="GRL_CONFIG_KEY_USERNAME" link="GrlConfig.html#GRL-CONFIG-KEY-USERNAME:CAPS"/>
-    <function name="GRL_CONFIG_KEY_PASSWORD" link="GrlConfig.html#GRL-CONFIG-KEY-PASSWORD:CAPS"/>
-    <function name="struct GrlConfig" link="GrlConfig.html#GrlConfig-struct"/>
-    <function name="struct GrlConfigClass" link="GrlConfig.html#GrlConfigClass"/>
-    <function name="grl_config_set_plugin ()" link="GrlConfig.html#grl-config-set-plugin"/>
-    <function name="grl_config_set_source ()" link="GrlConfig.html#grl-config-set-source"/>
-    <function name="grl_config_set_api_key ()" link="GrlConfig.html#grl-config-set-api-key"/>
-    <function name="grl_config_set_api_key_blob ()" link="GrlConfig.html#grl-config-set-api-key-blob"/>
-    <function name="grl_config_set_api_token ()" link="GrlConfig.html#grl-config-set-api-token"/>
-    <function name="grl_config_set_api_secret ()" link="GrlConfig.html#grl-config-set-api-secret"/>
-    <function name="grl_config_set_username ()" link="GrlConfig.html#grl-config-set-username"/>
-    <function name="grl_config_set_password ()" link="GrlConfig.html#grl-config-set-password"/>
-    <function name="grl_config_get_plugin ()" link="GrlConfig.html#grl-config-get-plugin"/>
-    <function name="grl_config_get_api_key ()" link="GrlConfig.html#grl-config-get-api-key"/>
-    <function name="grl_config_get_api_key_blob ()" link="GrlConfig.html#grl-config-get-api-key-blob"/>
-    <function name="grl_config_get_api_token ()" link="GrlConfig.html#grl-config-get-api-token"/>
-    <function name="grl_config_get_api_secret ()" link="GrlConfig.html#grl-config-get-api-secret"/>
-    <function name="grl_config_get_username ()" link="GrlConfig.html#grl-config-get-username"/>
-    <function name="grl_config_get_password ()" link="GrlConfig.html#grl-config-get-password"/>
-    <function name="grl_config_new ()" link="GrlConfig.html#grl-config-new"/>
-    <function name="grl_config_set ()" link="GrlConfig.html#grl-config-set"/>
-    <function name="grl_config_set_string ()" link="GrlConfig.html#grl-config-set-string"/>
-    <function name="grl_config_set_int ()" link="GrlConfig.html#grl-config-set-int"/>
-    <function name="grl_config_set_float ()" link="GrlConfig.html#grl-config-set-float"/>
-    <function name="grl_config_set_boolean ()" link="GrlConfig.html#grl-config-set-boolean"/>
-    <function name="grl_config_set_binary ()" link="GrlConfig.html#grl-config-set-binary"/>
-    <function name="grl_config_get_string ()" link="GrlConfig.html#grl-config-get-string"/>
-    <function name="grl_config_get_int ()" link="GrlConfig.html#grl-config-get-int"/>
-    <function name="grl_config_get_float ()" link="GrlConfig.html#grl-config-get-float"/>
-    <function name="grl_config_get_boolean ()" link="GrlConfig.html#grl-config-get-boolean"/>
-    <function name="grl_config_get_binary ()" link="GrlConfig.html#grl-config-get-binary"/>
-    <function name="grl_config_has_param ()" link="GrlConfig.html#grl-config-has-param"/>
-    <function name="struct GrlData" link="GrlData.html#GrlData-struct"/>
-    <function name="struct GrlDataClass" link="GrlData.html#GrlDataClass"/>
-    <function name="grl_data_new ()" link="GrlData.html#grl-data-new"/>
-    <function name="grl_data_set ()" link="GrlData.html#grl-data-set"/>
-    <function name="grl_data_set_string ()" link="GrlData.html#grl-data-set-string"/>
-    <function name="grl_data_set_int ()" link="GrlData.html#grl-data-set-int"/>
-    <function name="grl_data_set_float ()" link="GrlData.html#grl-data-set-float"/>
-    <function name="grl_data_set_binary ()" link="GrlData.html#grl-data-set-binary"/>
-    <function name="grl_data_get ()" link="GrlData.html#grl-data-get"/>
-    <function name="grl_data_get_string ()" link="GrlData.html#grl-data-get-string"/>
-    <function name="grl_data_get_int ()" link="GrlData.html#grl-data-get-int"/>
-    <function name="grl_data_get_float ()" link="GrlData.html#grl-data-get-float"/>
-    <function name="grl_data_get_binary ()" link="GrlData.html#grl-data-get-binary"/>
-    <function name="grl_data_remove ()" link="GrlData.html#grl-data-remove"/>
-    <function name="grl_data_has_key ()" link="GrlData.html#grl-data-has-key"/>
-    <function name="grl_data_get_keys ()" link="GrlData.html#grl-data-get-keys"/>
-    <function name="grl_data_add_related_keys ()" link="GrlData.html#grl-data-add-related-keys"/>
-    <function name="grl_data_add_string ()" link="GrlData.html#grl-data-add-string"/>
-    <function name="grl_data_add_int ()" link="GrlData.html#grl-data-add-int"/>
-    <function name="grl_data_add_float ()" link="GrlData.html#grl-data-add-float"/>
-    <function name="grl_data_add_binary ()" link="GrlData.html#grl-data-add-binary"/>
-    <function name="grl_data_length ()" link="GrlData.html#grl-data-length"/>
-    <function name="grl_data_get_related_keys ()" link="GrlData.html#grl-data-get-related-keys"/>
-    <function name="grl_data_get_single_values_for_key ()" link="GrlData.html#grl-data-get-single-values-for-key"/>
-    <function name="grl_data_get_single_values_for_key_string ()" link="GrlData.html#grl-data-get-single-values-for-key-string"/>
-    <function name="grl_data_remove_nth ()" link="GrlData.html#grl-data-remove-nth"/>
-    <function name="grl_data_set_related_keys ()" link="GrlData.html#grl-data-set-related-keys"/>
-    <function name="grl_data_dup ()" link="GrlData.html#grl-data-dup"/>
-    <function name="The &quot;overwrite&quot; property" link="GrlData.html#GrlData--overwrite"/>
-    <function name="struct GrlRelatedKeys" link="GrlRelatedKeys.html#GrlRelatedKeys-struct"/>
-    <function name="struct GrlRelatedKeysClass" link="GrlRelatedKeys.html#GrlRelatedKeysClass"/>
-    <function name="grl_related_keys_new ()" link="GrlRelatedKeys.html#grl-related-keys-new"/>
-    <function name="grl_related_keys_new_valist ()" link="GrlRelatedKeys.html#grl-related-keys-new-valist"/>
-    <function name="grl_related_keys_new_with_keys ()" link="GrlRelatedKeys.html#grl-related-keys-new-with-keys"/>
-    <function name="grl_related_keys_set ()" link="GrlRelatedKeys.html#grl-related-keys-set"/>
-    <function name="grl_related_keys_set_string ()" link="GrlRelatedKeys.html#grl-related-keys-set-string"/>
-    <function name="grl_related_keys_set_int ()" link="GrlRelatedKeys.html#grl-related-keys-set-int"/>
-    <function name="grl_related_keys_set_float ()" link="GrlRelatedKeys.html#grl-related-keys-set-float"/>
-    <function name="grl_related_keys_set_binary ()" link="GrlRelatedKeys.html#grl-related-keys-set-binary"/>
-    <function name="grl_related_keys_get ()" link="GrlRelatedKeys.html#grl-related-keys-get"/>
-    <function name="grl_related_keys_get_string ()" link="GrlRelatedKeys.html#grl-related-keys-get-string"/>
-    <function name="grl_related_keys_get_int ()" link="GrlRelatedKeys.html#grl-related-keys-get-int"/>
-    <function name="grl_related_keys_get_float ()" link="GrlRelatedKeys.html#grl-related-keys-get-float"/>
-    <function name="grl_related_keys_get_binary ()" link="GrlRelatedKeys.html#grl-related-keys-get-binary"/>
-    <function name="grl_related_keys_has_key ()" link="GrlRelatedKeys.html#grl-related-keys-has-key"/>
-    <function name="grl_related_keys_get_keys ()" link="GrlRelatedKeys.html#grl-related-keys-get-keys"/>
-    <function name="grl_related_keys_dup ()" link="GrlRelatedKeys.html#grl-related-keys-dup"/>
-    <function name="enum GrlMediaSerializeType" link="GrlMedia.html#GrlMediaSerializeType"/>
-    <function name="struct GrlMedia" link="GrlMedia.html#GrlMedia-struct"/>
-    <function name="struct GrlMediaClass" link="GrlMedia.html#GrlMediaClass"/>
-    <function name="grl_media_set_id ()" link="GrlMedia.html#grl-media-set-id"/>
-    <function name="grl_media_set_url ()" link="GrlMedia.html#grl-media-set-url"/>
-    <function name="grl_media_set_author ()" link="GrlMedia.html#grl-media-set-author"/>
-    <function name="grl_media_set_title ()" link="GrlMedia.html#grl-media-set-title"/>
-    <function name="grl_media_set_description ()" link="GrlMedia.html#grl-media-set-description"/>
-    <function name="grl_media_set_source ()" link="GrlMedia.html#grl-media-set-source"/>
-    <function name="grl_media_set_thumbnail ()" link="GrlMedia.html#grl-media-set-thumbnail"/>
-    <function name="grl_media_set_thumbnail_binary ()" link="GrlMedia.html#grl-media-set-thumbnail-binary"/>
-    <function name="grl_media_set_site ()" link="GrlMedia.html#grl-media-set-site"/>
-    <function name="grl_media_set_duration ()" link="GrlMedia.html#grl-media-set-duration"/>
-    <function name="grl_media_set_date ()" link="GrlMedia.html#grl-media-set-date"/>
-    <function name="grl_media_set_creation_date ()" link="GrlMedia.html#grl-media-set-creation-date"/>
-    <function name="grl_media_set_mime ()" link="GrlMedia.html#grl-media-set-mime"/>
-    <function name="grl_media_set_play_count ()" link="GrlMedia.html#grl-media-set-play-count"/>
-    <function name="grl_media_set_last_played ()" link="GrlMedia.html#grl-media-set-last-played"/>
-    <function name="grl_media_set_last_position ()" link="GrlMedia.html#grl-media-set-last-position"/>
-    <function name="grl_media_set_external_player ()" link="GrlMedia.html#grl-media-set-external-player"/>
-    <function name="grl_media_set_external_url ()" link="GrlMedia.html#grl-media-set-external-url"/>
-    <function name="grl_media_set_studio ()" link="GrlMedia.html#grl-media-set-studio"/>
-    <function name="grl_media_set_certificate ()" link="GrlMedia.html#grl-media-set-certificate"/>
-    <function name="grl_media_set_license ()" link="GrlMedia.html#grl-media-set-license"/>
-    <function name="grl_media_set_rating ()" link="GrlMedia.html#grl-media-set-rating"/>
-    <function name="grl_media_set_url_data ()" link="GrlMedia.html#grl-media-set-url-data"/>
-    <function name="grl_media_add_url_data ()" link="GrlMedia.html#grl-media-add-url-data"/>
-    <function name="grl_media_add_author ()" link="GrlMedia.html#grl-media-add-author"/>
-    <function name="grl_media_add_thumbnail ()" link="GrlMedia.html#grl-media-add-thumbnail"/>
-    <function name="grl_media_add_thumbnail_binary ()" link="GrlMedia.html#grl-media-add-thumbnail-binary"/>
-    <function name="grl_media_add_external_player ()" link="GrlMedia.html#grl-media-add-external-player"/>
-    <function name="grl_media_add_external_url ()" link="GrlMedia.html#grl-media-add-external-url"/>
-    <function name="grl_media_get_id ()" link="GrlMedia.html#grl-media-get-id"/>
-    <function name="grl_media_get_url ()" link="GrlMedia.html#grl-media-get-url"/>
-    <function name="grl_media_get_url_data ()" link="GrlMedia.html#grl-media-get-url-data"/>
-    <function name="grl_media_get_url_data_nth ()" link="GrlMedia.html#grl-media-get-url-data-nth"/>
-    <function name="grl_media_get_author ()" link="GrlMedia.html#grl-media-get-author"/>
-    <function name="grl_media_get_author_nth ()" link="GrlMedia.html#grl-media-get-author-nth"/>
-    <function name="grl_media_get_title ()" link="GrlMedia.html#grl-media-get-title"/>
-    <function name="grl_media_get_description ()" link="GrlMedia.html#grl-media-get-description"/>
-    <function name="grl_media_get_source ()" link="GrlMedia.html#grl-media-get-source"/>
-    <function name="grl_media_get_thumbnail ()" link="GrlMedia.html#grl-media-get-thumbnail"/>
-    <function name="grl_media_get_thumbnail_nth ()" link="GrlMedia.html#grl-media-get-thumbnail-nth"/>
-    <function name="grl_media_get_thumbnail_binary ()" link="GrlMedia.html#grl-media-get-thumbnail-binary"/>
-    <function name="grl_media_get_thumbnail_binary_nth ()" link="GrlMedia.html#grl-media-get-thumbnail-binary-nth"/>
-    <function name="grl_media_get_site ()" link="GrlMedia.html#grl-media-get-site"/>
-    <function name="grl_media_get_duration ()" link="GrlMedia.html#grl-media-get-duration"/>
-    <function name="grl_media_get_date ()" link="GrlMedia.html#grl-media-get-date"/>
-    <function name="grl_media_get_creation_date ()" link="GrlMedia.html#grl-media-get-creation-date"/>
-    <function name="grl_media_get_mime ()" link="GrlMedia.html#grl-media-get-mime"/>
-    <function name="grl_media_get_rating ()" link="GrlMedia.html#grl-media-get-rating"/>
-    <function name="grl_media_get_play_count ()" link="GrlMedia.html#grl-media-get-play-count"/>
-    <function name="grl_media_get_last_position ()" link="GrlMedia.html#grl-media-get-last-position"/>
-    <function name="grl_media_get_last_played ()" link="GrlMedia.html#grl-media-get-last-played"/>
-    <function name="grl_media_get_player ()" link="GrlMedia.html#grl-media-get-player"/>
-    <function name="grl_media_get_player_nth ()" link="GrlMedia.html#grl-media-get-player-nth"/>
-    <function name="grl_media_get_external_url ()" link="GrlMedia.html#grl-media-get-external-url"/>
-    <function name="grl_media_get_external_url_nth ()" link="GrlMedia.html#grl-media-get-external-url-nth"/>
-    <function name="grl_media_get_studio ()" link="GrlMedia.html#grl-media-get-studio"/>
-    <function name="grl_media_get_certificate ()" link="GrlMedia.html#grl-media-get-certificate"/>
-    <function name="grl_media_get_license ()" link="GrlMedia.html#grl-media-get-license"/>
-    <function name="grl_media_new ()" link="GrlMedia.html#grl-media-new"/>
-    <function name="grl_media_serialize ()" link="GrlMedia.html#grl-media-serialize"/>
-    <function name="grl_media_serialize_extended ()" link="GrlMedia.html#grl-media-serialize-extended"/>
-    <function name="grl_media_unserialize ()" link="GrlMedia.html#grl-media-unserialize"/>
-    <function name="struct GrlMediaBox" link="GrlMediaBox.html#GrlMediaBox-struct"/>
-    <function name="struct GrlMediaBoxClass" link="GrlMediaBox.html#GrlMediaBoxClass"/>
-    <function name="grl_media_box_new ()" link="GrlMediaBox.html#grl-media-box-new"/>
-    <function name="grl_media_box_set_childcount ()" link="GrlMediaBox.html#grl-media-box-set-childcount"/>
-    <function name="grl_media_box_get_childcount ()" link="GrlMediaBox.html#grl-media-box-get-childcount"/>
-    <function name="struct GrlMediaVideo" link="GrlMediaVideo.html#GrlMediaVideo-struct"/>
-    <function name="struct GrlMediaVideoClass" link="GrlMediaVideo.html#GrlMediaVideoClass"/>
-    <function name="grl_media_video_set_width ()" link="GrlMediaVideo.html#grl-media-video-set-width"/>
-    <function name="grl_media_video_set_height ()" link="GrlMediaVideo.html#grl-media-video-set-height"/>
-    <function name="grl_media_video_set_framerate ()" link="GrlMediaVideo.html#grl-media-video-set-framerate"/>
-    <function name="grl_media_video_set_season ()" link="GrlMediaVideo.html#grl-media-video-set-season"/>
-    <function name="grl_media_video_set_episode ()" link="GrlMediaVideo.html#grl-media-video-set-episode"/>
-    <function name="grl_media_video_set_show ()" link="GrlMediaVideo.html#grl-media-video-set-show"/>
-    <function name="grl_media_video_get_width ()" link="GrlMediaVideo.html#grl-media-video-get-width"/>
-    <function name="grl_media_video_get_height ()" link="GrlMediaVideo.html#grl-media-video-get-height"/>
-    <function name="grl_media_video_get_framerate ()" link="GrlMediaVideo.html#grl-media-video-get-framerate"/>
-    <function name="grl_media_video_get_season ()" link="GrlMediaVideo.html#grl-media-video-get-season"/>
-    <function name="grl_media_video_get_episode ()" link="GrlMediaVideo.html#grl-media-video-get-episode"/>
-    <function name="grl_media_video_get_show ()" link="GrlMediaVideo.html#grl-media-video-get-show"/>
-    <function name="grl_media_video_new ()" link="GrlMediaVideo.html#grl-media-video-new"/>
-    <function name="grl_media_video_set_size ()" link="GrlMediaVideo.html#grl-media-video-set-size"/>
-    <function name="grl_media_video_set_url_data ()" link="GrlMediaVideo.html#grl-media-video-set-url-data"/>
-    <function name="grl_media_video_add_url_data ()" link="GrlMediaVideo.html#grl-media-video-add-url-data"/>
-    <function name="grl_media_video_get_url_data ()" link="GrlMediaVideo.html#grl-media-video-get-url-data"/>
-    <function name="grl_media_video_get_url_data_nth ()" link="GrlMediaVideo.html#grl-media-video-get-url-data-nth"/>
-    <function name="struct GrlMediaAudio" link="GrlMediaAudio.html#GrlMediaAudio-struct"/>
-    <function name="struct GrlMediaAudioClass" link="GrlMediaAudio.html#GrlMediaAudioClass"/>
-    <function name="grl_media_audio_set_artist ()" link="GrlMediaAudio.html#grl-media-audio-set-artist"/>
-    <function name="grl_media_audio_set_album ()" link="GrlMediaAudio.html#grl-media-audio-set-album"/>
-    <function name="grl_media_audio_set_genre ()" link="GrlMediaAudio.html#grl-media-audio-set-genre"/>
-    <function name="grl_media_audio_set_lyrics ()" link="GrlMediaAudio.html#grl-media-audio-set-lyrics"/>
-    <function name="grl_media_audio_set_bitrate ()" link="GrlMediaAudio.html#grl-media-audio-set-bitrate"/>
-    <function name="grl_media_audio_set_url_data ()" link="GrlMediaAudio.html#grl-media-audio-set-url-data"/>
-    <function name="grl_media_audio_add_artist ()" link="GrlMediaAudio.html#grl-media-audio-add-artist"/>
-    <function name="grl_media_audio_add_genre ()" link="GrlMediaAudio.html#grl-media-audio-add-genre"/>
-    <function name="grl_media_audio_add_lyrics ()" link="GrlMediaAudio.html#grl-media-audio-add-lyrics"/>
-    <function name="grl_media_audio_add_url_data ()" link="GrlMediaAudio.html#grl-media-audio-add-url-data"/>
-    <function name="grl_media_audio_get_artist ()" link="GrlMediaAudio.html#grl-media-audio-get-artist"/>
-    <function name="grl_media_audio_get_artist_nth ()" link="GrlMediaAudio.html#grl-media-audio-get-artist-nth"/>
-    <function name="grl_media_audio_get_album ()" link="GrlMediaAudio.html#grl-media-audio-get-album"/>
-    <function name="grl_media_audio_get_genre ()" link="GrlMediaAudio.html#grl-media-audio-get-genre"/>
-    <function name="grl_media_audio_get_genre_nth ()" link="GrlMediaAudio.html#grl-media-audio-get-genre-nth"/>
-    <function name="grl_media_audio_get_lyrics ()" link="GrlMediaAudio.html#grl-media-audio-get-lyrics"/>
-    <function name="grl_media_audio_get_lyrics_nth ()" link="GrlMediaAudio.html#grl-media-audio-get-lyrics-nth"/>
-    <function name="grl_media_audio_get_bitrate ()" link="GrlMediaAudio.html#grl-media-audio-get-bitrate"/>
-    <function name="grl_media_audio_get_url_data ()" link="GrlMediaAudio.html#grl-media-audio-get-url-data"/>
-    <function name="grl_media_audio_get_url_data_nth ()" link="GrlMediaAudio.html#grl-media-audio-get-url-data-nth"/>
-    <function name="grl_media_audio_new ()" link="GrlMediaAudio.html#grl-media-audio-new"/>
-    <function name="struct GrlMediaImage" link="GrlMediaImage.html#GrlMediaImage-struct"/>
-    <function name="struct GrlMediaImageClass" link="GrlMediaImage.html#GrlMediaImageClass"/>
-    <function name="grl_media_image_set_width ()" link="GrlMediaImage.html#grl-media-image-set-width"/>
-    <function name="grl_media_image_set_height ()" link="GrlMediaImage.html#grl-media-image-set-height"/>
-    <function name="grl_media_image_get_width ()" link="GrlMediaImage.html#grl-media-image-get-width"/>
-    <function name="grl_media_image_get_height ()" link="GrlMediaImage.html#grl-media-image-get-height"/>
-    <function name="grl_media_image_get_camera_model ()" link="GrlMediaImage.html#grl-media-image-get-camera-model"/>
-    <function name="grl_media_image_get_flash_used ()" link="GrlMediaImage.html#grl-media-image-get-flash-used"/>
-    <function name="grl_media_image_get_exposure_time ()" link="GrlMediaImage.html#grl-media-image-get-exposure-time"/>
-    <function name="grl_media_image_get_iso_speed ()" link="GrlMediaImage.html#grl-media-image-get-iso-speed"/>
-    <function name="grl_media_image_get_orientation ()" link="GrlMediaImage.html#grl-media-image-get-orientation"/>
-    <function name="grl_media_image_set_size ()" link="GrlMediaImage.html#grl-media-image-set-size"/>
-    <function name="grl_media_image_get_url_data ()" link="GrlMediaImage.html#grl-media-image-get-url-data"/>
-    <function name="grl_media_image_get_url_data_nth ()" link="GrlMediaImage.html#grl-media-image-get-url-data-nth"/>
-    <function name="grl_media_image_set_url_data ()" link="GrlMediaImage.html#grl-media-image-set-url-data"/>
-    <function name="grl_media_image_add_url_data ()" link="GrlMediaImage.html#grl-media-image-add-url-data"/>
-    <function name="grl_media_image_set_camera_model ()" link="GrlMediaImage.html#grl-media-image-set-camera-model"/>
-    <function name="grl_media_image_set_flash_used ()" link="GrlMediaImage.html#grl-media-image-set-flash-used"/>
-    <function name="grl_media_image_set_exposure_time ()" link="GrlMediaImage.html#grl-media-image-set-exposure-time"/>
-    <function name="grl_media_image_set_iso_speed ()" link="GrlMediaImage.html#grl-media-image-set-iso-speed"/>
-    <function name="grl_media_image_set_orientation ()" link="GrlMediaImage.html#grl-media-image-set-orientation"/>
-    <function name="grl_media_image_new ()" link="GrlMediaImage.html#grl-media-image-new"/>
-    <function name="GRL_METADATA_KEY_GET_ID()" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-ID:CAPS"/>
-    <function name="GRL_METADATA_KEY_GET_NAME()" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-NAME:CAPS"/>
-    <function name="GRL_METADATA_KEY_GET_DESC()" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-DESC:CAPS"/>
-    <function name="GRL_METADATA_KEY_GET_TYPE()" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GET-TYPE:CAPS"/>
-    <function name="GRL_KEYID_FORMAT" link="grilo-grl-metadata-key.html#GRL-KEYID-FORMAT:CAPS"/>
-    <function name="GrlKeyID" link="grilo-grl-metadata-key.html#GrlKeyID"/>
-    <function name="GRL_METADATA_KEY_ALBUM" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ALBUM:CAPS"/>
-    <function name="GRL_METADATA_KEY_ARTIST" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ARTIST:CAPS"/>
-    <function name="GRL_METADATA_KEY_AUTHOR" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-AUTHOR:CAPS"/>
-    <function name="GRL_METADATA_KEY_BITRATE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-BITRATE:CAPS"/>
-    <function name="GRL_METADATA_KEY_CERTIFICATE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CERTIFICATE:CAPS"/>
-    <function name="GRL_METADATA_KEY_CHILDCOUNT" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CHILDCOUNT:CAPS"/>
-    <function name="GRL_METADATA_KEY_DATE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DATE:CAPS"/>
-    <function name="GRL_METADATA_KEY_DESCRIPTION" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DESCRIPTION:CAPS"/>
-    <function name="GRL_METADATA_KEY_DURATION" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DURATION:CAPS"/>
-    <function name="GRL_METADATA_KEY_EXTERNAL_PLAYER" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-PLAYER:CAPS"/>
-    <function name="GRL_METADATA_KEY_EXTERNAL_URL" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-URL:CAPS"/>
-    <function name="GRL_METADATA_KEY_FRAMERATE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FRAMERATE:CAPS"/>
-    <function name="GRL_METADATA_KEY_GENRE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GENRE:CAPS"/>
-    <function name="GRL_METADATA_KEY_HEIGHT" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-HEIGHT:CAPS"/>
-    <function name="GRL_METADATA_KEY_ID" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ID:CAPS"/>
-    <function name="GRL_METADATA_KEY_LAST_PLAYED" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-PLAYED:CAPS"/>
-    <function name="GRL_METADATA_KEY_LAST_POSITION" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-POSITION:CAPS"/>
-    <function name="GRL_METADATA_KEY_LICENSE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LICENSE:CAPS"/>
-    <function name="GRL_METADATA_KEY_LYRICS" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LYRICS:CAPS"/>
-    <function name="GRL_METADATA_KEY_MIME" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-MIME:CAPS"/>
-    <function name="GRL_METADATA_KEY_PLAY_COUNT" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-PLAY-COUNT:CAPS"/>
-    <function name="GRL_METADATA_KEY_RATING" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-RATING:CAPS"/>
-    <function name="GRL_METADATA_KEY_SITE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SITE:CAPS"/>
-    <function name="GRL_METADATA_KEY_SOURCE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SOURCE:CAPS"/>
-    <function name="GRL_METADATA_KEY_STUDIO" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-STUDIO:CAPS"/>
-    <function name="GRL_METADATA_KEY_THUMBNAIL" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL:CAPS"/>
-    <function name="GRL_METADATA_KEY_THUMBNAIL_BINARY" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL-BINARY:CAPS"/>
-    <function name="GRL_METADATA_KEY_TITLE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-TITLE:CAPS"/>
-    <function name="GRL_METADATA_KEY_URL" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-URL:CAPS"/>
-    <function name="GRL_METADATA_KEY_WIDTH" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-WIDTH:CAPS"/>
-    <function name="GRL_METADATA_KEY_SEASON" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SEASON:CAPS"/>
-    <function name="GRL_METADATA_KEY_EPISODE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EPISODE:CAPS"/>
-    <function name="GRL_METADATA_KEY_SHOW" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SHOW:CAPS"/>
-    <function name="GRL_METADATA_KEY_CREATION_DATE" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CREATION-DATE:CAPS"/>
-    <function name="GRL_METADATA_KEY_CAMERA_MODEL" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CAMERA-MODEL:CAPS"/>
-    <function name="GRL_METADATA_KEY_ORIENTATION" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ORIENTATION:CAPS"/>
-    <function name="GRL_METADATA_KEY_FLASH_USED" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FLASH-USED:CAPS"/>
-    <function name="GRL_METADATA_KEY_EXPOSURE_TIME" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXPOSURE-TIME:CAPS"/>
-    <function name="GRL_METADATA_KEY_ISO_SPEED" link="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ISO-SPEED:CAPS"/>
-    <function name="grl_metadata_key_get_name ()" link="grilo-grl-metadata-key.html#grl-metadata-key-get-name"/>
-    <function name="grl_metadata_key_get_desc ()" link="grilo-grl-metadata-key.html#grl-metadata-key-get-desc"/>
-    <function name="grl_metadata_key_list_new()" link="grilo-grl-metadata-key.html#grl-metadata-key-list-new"/>
-    <function name="enum GrlLogLevel" link="grilo-grl-log.html#GrlLogLevel"/>
-    <function name="GRL_LOG_DOMAIN_DEFAULT" link="grilo-grl-log.html#GRL-LOG-DOMAIN-DEFAULT:CAPS"/>
-    <function name="GRL_LOG_DOMAIN()" link="grilo-grl-log.html#GRL-LOG-DOMAIN:CAPS"/>
-    <function name="GRL_LOG_DOMAIN_EXTERN()" link="grilo-grl-log.html#GRL-LOG-DOMAIN-EXTERN:CAPS"/>
-    <function name="GRL_LOG_DOMAIN_STATIC()" link="grilo-grl-log.html#GRL-LOG-DOMAIN-STATIC:CAPS"/>
-    <function name="GRL_LOG_DOMAIN_INIT()" link="grilo-grl-log.html#GRL-LOG-DOMAIN-INIT:CAPS"/>
-    <function name="GRL_LOG_DOMAIN_FREE()" link="grilo-grl-log.html#GRL-LOG-DOMAIN-FREE:CAPS"/>
-    <function name="GRL_LOG()" link="grilo-grl-log.html#GRL-LOG:CAPS"/>
-    <function name="GRL_LOG_valist ()" link="grilo-grl-log.html#GRL-LOG-valist"/>
-    <function name="GRL_ERROR()" link="grilo-grl-log.html#GRL-ERROR:CAPS"/>
-    <function name="GRL_WARNING()" link="grilo-grl-log.html#GRL-WARNING:CAPS"/>
-    <function name="GRL_MESSAGE()" link="grilo-grl-log.html#GRL-MESSAGE:CAPS"/>
-    <function name="GRL_INFO()" link="grilo-grl-log.html#GRL-INFO:CAPS"/>
-    <function name="GRL_DEBUG()" link="grilo-grl-log.html#GRL-DEBUG:CAPS"/>
-    <function name="grl_log_domain_new ()" link="grilo-grl-log.html#grl-log-domain-new"/>
-    <function name="grl_log_domain_free ()" link="grilo-grl-log.html#grl-log-domain-free"/>
-    <function name="grl_log_configure ()" link="grilo-grl-log.html#grl-log-configure"/>
-    <function name="grl_log ()" link="grilo-grl-log.html#grl-log"/>
-    <function name="GrlLogDomain" link="grilo-grl-log.html#GrlLogDomain"/>
-    <function name="GRL_CORE_ERROR" link="grilo-grl-error.html#GRL-CORE-ERROR:CAPS"/>
-    <function name="enum GrlCoreError" link="grilo-grl-error.html#GrlCoreError"/>
-    <function name="GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN" link="grilo-grl-definitions.html#GRL-METADATA-KEY-CHILDCOUNT-UNKNOWN:CAPS"/>
-    <function name="GRL_SOURCE_REMAINING_UNKNOWN" link="grilo-grl-definitions.html#GRL-SOURCE-REMAINING-UNKNOWN:CAPS"/>
-    <function name="grl_operation_cancel ()" link="grilo-grl-operation.html#grl-operation-cancel"/>
-    <function name="grl_operation_set_data ()" link="grilo-grl-operation.html#grl-operation-set-data"/>
-    <function name="grl_operation_get_data ()" link="grilo-grl-operation.html#grl-operation-get-data"/>
-    <function name="grl_paging_translate ()" link="grilo-grl-util.html#grl-paging-translate"/>
-    <function name="grl_list_from_va ()" link="grilo-grl-util.html#grl-list-from-va"/>
-    <function name="enum GrlNetWcError" link="grilo-GrlNetWc.html#GrlNetWcError"/>
-    <function name="GRL_NET_WC_ERROR" link="grilo-GrlNetWc.html#GRL-NET-WC-ERROR:CAPS"/>
-    <function name="struct GrlNetWc" link="grilo-GrlNetWc.html#GrlNetWc"/>
-    <function name="struct GrlNetWcClass" link="grilo-GrlNetWc.html#GrlNetWcClass"/>
-    <function name="grl_net_wc_error_quark ()" link="grilo-GrlNetWc.html#grl-net-wc-error-quark"/>
-    <function name="grl_net_wc_new ()" link="grilo-GrlNetWc.html#grl-net-wc-new"/>
-    <function name="grl_net_wc_request_async ()" link="grilo-GrlNetWc.html#grl-net-wc-request-async"/>
-    <function name="grl_net_wc_request_finish ()" link="grilo-GrlNetWc.html#grl-net-wc-request-finish"/>
-    <function name="grl_net_wc_set_log_level ()" link="grilo-GrlNetWc.html#grl-net-wc-set-log-level"/>
-    <function name="grl_net_wc_set_throttling ()" link="grilo-GrlNetWc.html#grl-net-wc-set-throttling"/>
-    <function name="grl_net_wc_set_cache ()" link="grilo-GrlNetWc.html#grl-net-wc-set-cache"/>
-    <function name="grl_net_wc_set_cache_size ()" link="grilo-GrlNetWc.html#grl-net-wc-set-cache-size"/>
-    <function name="grl_net_wc_flush_delayed_requests ()" link="grilo-GrlNetWc.html#grl-net-wc-flush-delayed-requests"/>
-  </functions>
-</book>
diff -Nru grilo-0.1.17/doc/grilo/html/grilo.devhelp2 grilo-0.1.18/doc/grilo/html/grilo.devhelp2
--- grilo-0.1.17/doc/grilo/html/grilo.devhelp2	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo.devhelp2	2011-12-09 17:54:40.000000000 +0000
@@ -34,7 +34,7 @@
             <sub name="Asynchronous APIs" link="ch03.html#programming-with-grilo-async-apis"/>
             <sub name="Operation identifiers" link="ch03.html#programming-with-grilo-operation-identifiers"/>
             <sub name="Media objects" link="ch03.html#programmaing-with-grilo-media-objects"/>
-            <sub name="Metadata keys" link="ch03.html#idp10721304"/>
+            <sub name="Metadata keys" link="ch03.html#idp6439432"/>
           </sub>
           <sub name="Typical use cases explained" link="ch03.html#programming-with-grilo-use-cases-explained">
             <sub name="Configuring your plugins" link="ch03.html#programming-with-grilo-configuring-plugins"/>
@@ -48,7 +48,7 @@
       <sub name="Writing plugins for Grilo" link="ch04.html">
         <sub name="" link="ch04.html#writing-plugins">
           <sub name="Media Source plugins" link="ch04.html#media-source-plugins">
-            <sub name="" link="ch04.html#idp10433816">
+            <sub name="" link="ch04.html#idp4952264">
               <sub name="Introduction" link="ch04.html#media-source-plugins-intro"/>
               <sub name="Registering Media Source Plugins" link="ch04.html#media-source-plugins-basics"/>
               <sub name="Implementing Supported Keys" link="ch04.html#media-source-plugins-supported-keys"/>
@@ -65,7 +65,7 @@
             </sub>
           </sub>
           <sub name="Metadata Source plugins" link="ch04.html#metadata-source-plugins">
-            <sub name="" link="ch04.html#idp10957984">
+            <sub name="" link="ch04.html#idp6325808">
               <sub name="Introduction" link="ch04.html#metadata-source-plugins-intro"/>
               <sub name="Registering the plugin" link="ch04.html#metadata-source-plugins-basics"/>
               <sub name="Implementing Resolve" link="ch04.html#metadata-source-plugins-resolve"/>
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grilo.html grilo-0.1.18/doc/grilo/html/grilo-grilo.html
--- grilo-0.1.17/doc/grilo/html/grilo-grilo.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grilo.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grilo</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="rn03.html" title="API Reference">
 <link rel="next" href="plugin-management.html" title="Plug-in management">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -110,6 +110,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-definitions.html grilo-0.1.18/doc/grilo/html/grilo-grl-definitions.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-definitions.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-definitions.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-definitions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="grilo-grl-error.html" title="grl-error">
 <link rel="next" href="grilo-grl-operation.html" title="grl-operation">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -64,6 +64,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-error.html grilo-0.1.18/doc/grilo/html/grilo-grl-error.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-error.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-error.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-error</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="grilo-grl-log.html" title="grl-log">
 <link rel="next" href="grilo-grl-definitions.html" title="grl-definitions">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -190,6 +190,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-log.html grilo-0.1.18/doc/grilo/html/grilo-grl-log.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-log.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-log.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-log</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="grilo-grl-metadata-key.html" title="grl-metadata-key">
 <link rel="next" href="grilo-grl-error.html" title="grl-error">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,7 +41,7 @@
 #include &lt;grilo.h&gt;
 
 enum                <a class="link" href="grilo-grl-log.html#GrlLogLevel" title="enum GrlLogLevel">GrlLogLevel</a>;
-extern              GrlLogDomain *<a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-DEFAULT:CAPS" title="GRL_LOG_DOMAIN_DEFAULT">GRL_LOG_DOMAIN_DEFAULT</a>;
+extern GrlLogDomain *<a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-DEFAULT:CAPS" title="GRL_LOG_DOMAIN_DEFAULT">GRL_LOG_DOMAIN_DEFAULT</a>;
 #define             <a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN:CAPS" title="GRL_LOG_DOMAIN()">GRL_LOG_DOMAIN</a>                      (domain)
 #define             <a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-EXTERN:CAPS" title="GRL_LOG_DOMAIN_EXTERN()">GRL_LOG_DOMAIN_EXTERN</a>               (domain)
 #define             <a class="link" href="grilo-grl-log.html#GRL-LOG-DOMAIN-STATIC:CAPS" title="GRL_LOG_DOMAIN_STATIC()">GRL_LOG_DOMAIN_STATIC</a>               (domain)
@@ -443,6 +443,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-metadata-key.html grilo-0.1.18/doc/grilo/html/grilo-grl-metadata-key.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-metadata-key.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-metadata-key.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-metadata-key</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="misc.html" title="Misc">
 <link rel="next" href="grilo-grl-log.html" title="grl-log">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -46,45 +46,45 @@
 #define             <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>           (key)
 #define             <a class="link" href="grilo-grl-metadata-key.html#GRL-KEYID-FORMAT:CAPS" title="GRL_KEYID_FORMAT">GRL_KEYID_FORMAT</a>
 typedef             <a class="link" href="grilo-grl-metadata-key.html#GrlKeyID" title="GrlKeyID">GrlKeyID</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ALBUM:CAPS" title="GRL_METADATA_KEY_ALBUM">GRL_METADATA_KEY_ALBUM</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ARTIST:CAPS" title="GRL_METADATA_KEY_ARTIST">GRL_METADATA_KEY_ARTIST</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-AUTHOR:CAPS" title="GRL_METADATA_KEY_AUTHOR">GRL_METADATA_KEY_AUTHOR</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-BITRATE:CAPS" title="GRL_METADATA_KEY_BITRATE">GRL_METADATA_KEY_BITRATE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CERTIFICATE:CAPS" title="GRL_METADATA_KEY_CERTIFICATE">GRL_METADATA_KEY_CERTIFICATE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CHILDCOUNT:CAPS" title="GRL_METADATA_KEY_CHILDCOUNT">GRL_METADATA_KEY_CHILDCOUNT</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DATE:CAPS" title="GRL_METADATA_KEY_DATE">GRL_METADATA_KEY_DATE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DESCRIPTION:CAPS" title="GRL_METADATA_KEY_DESCRIPTION">GRL_METADATA_KEY_DESCRIPTION</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DURATION:CAPS" title="GRL_METADATA_KEY_DURATION">GRL_METADATA_KEY_DURATION</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-PLAYER:CAPS" title="GRL_METADATA_KEY_EXTERNAL_PLAYER">GRL_METADATA_KEY_EXTERNAL_PLAYER</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-URL:CAPS" title="GRL_METADATA_KEY_EXTERNAL_URL">GRL_METADATA_KEY_EXTERNAL_URL</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FRAMERATE:CAPS" title="GRL_METADATA_KEY_FRAMERATE">GRL_METADATA_KEY_FRAMERATE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GENRE:CAPS" title="GRL_METADATA_KEY_GENRE">GRL_METADATA_KEY_GENRE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-HEIGHT:CAPS" title="GRL_METADATA_KEY_HEIGHT">GRL_METADATA_KEY_HEIGHT</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ID:CAPS" title="GRL_METADATA_KEY_ID">GRL_METADATA_KEY_ID</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-PLAYED:CAPS" title="GRL_METADATA_KEY_LAST_PLAYED">GRL_METADATA_KEY_LAST_PLAYED</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-POSITION:CAPS" title="GRL_METADATA_KEY_LAST_POSITION">GRL_METADATA_KEY_LAST_POSITION</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LICENSE:CAPS" title="GRL_METADATA_KEY_LICENSE">GRL_METADATA_KEY_LICENSE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LYRICS:CAPS" title="GRL_METADATA_KEY_LYRICS">GRL_METADATA_KEY_LYRICS</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-MIME:CAPS" title="GRL_METADATA_KEY_MIME">GRL_METADATA_KEY_MIME</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-PLAY-COUNT:CAPS" title="GRL_METADATA_KEY_PLAY_COUNT">GRL_METADATA_KEY_PLAY_COUNT</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-RATING:CAPS" title="GRL_METADATA_KEY_RATING">GRL_METADATA_KEY_RATING</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SITE:CAPS" title="GRL_METADATA_KEY_SITE">GRL_METADATA_KEY_SITE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SOURCE:CAPS" title="GRL_METADATA_KEY_SOURCE">GRL_METADATA_KEY_SOURCE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-STUDIO:CAPS" title="GRL_METADATA_KEY_STUDIO">GRL_METADATA_KEY_STUDIO</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL:CAPS" title="GRL_METADATA_KEY_THUMBNAIL">GRL_METADATA_KEY_THUMBNAIL</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL-BINARY:CAPS" title="GRL_METADATA_KEY_THUMBNAIL_BINARY">GRL_METADATA_KEY_THUMBNAIL_BINARY</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-TITLE:CAPS" title="GRL_METADATA_KEY_TITLE">GRL_METADATA_KEY_TITLE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-URL:CAPS" title="GRL_METADATA_KEY_URL">GRL_METADATA_KEY_URL</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-WIDTH:CAPS" title="GRL_METADATA_KEY_WIDTH">GRL_METADATA_KEY_WIDTH</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SEASON:CAPS" title="GRL_METADATA_KEY_SEASON">GRL_METADATA_KEY_SEASON</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EPISODE:CAPS" title="GRL_METADATA_KEY_EPISODE">GRL_METADATA_KEY_EPISODE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SHOW:CAPS" title="GRL_METADATA_KEY_SHOW">GRL_METADATA_KEY_SHOW</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CREATION-DATE:CAPS" title="GRL_METADATA_KEY_CREATION_DATE">GRL_METADATA_KEY_CREATION_DATE</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CAMERA-MODEL:CAPS" title="GRL_METADATA_KEY_CAMERA_MODEL">GRL_METADATA_KEY_CAMERA_MODEL</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ORIENTATION:CAPS" title="GRL_METADATA_KEY_ORIENTATION">GRL_METADATA_KEY_ORIENTATION</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FLASH-USED:CAPS" title="GRL_METADATA_KEY_FLASH_USED">GRL_METADATA_KEY_FLASH_USED</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXPOSURE-TIME:CAPS" title="GRL_METADATA_KEY_EXPOSURE_TIME">GRL_METADATA_KEY_EXPOSURE_TIME</a>;
-extern              GrlKeyID <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ISO-SPEED:CAPS" title="GRL_METADATA_KEY_ISO_SPEED">GRL_METADATA_KEY_ISO_SPEED</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ALBUM:CAPS" title="GRL_METADATA_KEY_ALBUM">GRL_METADATA_KEY_ALBUM</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ARTIST:CAPS" title="GRL_METADATA_KEY_ARTIST">GRL_METADATA_KEY_ARTIST</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-AUTHOR:CAPS" title="GRL_METADATA_KEY_AUTHOR">GRL_METADATA_KEY_AUTHOR</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-BITRATE:CAPS" title="GRL_METADATA_KEY_BITRATE">GRL_METADATA_KEY_BITRATE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CERTIFICATE:CAPS" title="GRL_METADATA_KEY_CERTIFICATE">GRL_METADATA_KEY_CERTIFICATE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CHILDCOUNT:CAPS" title="GRL_METADATA_KEY_CHILDCOUNT">GRL_METADATA_KEY_CHILDCOUNT</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DATE:CAPS" title="GRL_METADATA_KEY_DATE">GRL_METADATA_KEY_DATE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DESCRIPTION:CAPS" title="GRL_METADATA_KEY_DESCRIPTION">GRL_METADATA_KEY_DESCRIPTION</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-DURATION:CAPS" title="GRL_METADATA_KEY_DURATION">GRL_METADATA_KEY_DURATION</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-PLAYER:CAPS" title="GRL_METADATA_KEY_EXTERNAL_PLAYER">GRL_METADATA_KEY_EXTERNAL_PLAYER</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXTERNAL-URL:CAPS" title="GRL_METADATA_KEY_EXTERNAL_URL">GRL_METADATA_KEY_EXTERNAL_URL</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FRAMERATE:CAPS" title="GRL_METADATA_KEY_FRAMERATE">GRL_METADATA_KEY_FRAMERATE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-GENRE:CAPS" title="GRL_METADATA_KEY_GENRE">GRL_METADATA_KEY_GENRE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-HEIGHT:CAPS" title="GRL_METADATA_KEY_HEIGHT">GRL_METADATA_KEY_HEIGHT</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ID:CAPS" title="GRL_METADATA_KEY_ID">GRL_METADATA_KEY_ID</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-PLAYED:CAPS" title="GRL_METADATA_KEY_LAST_PLAYED">GRL_METADATA_KEY_LAST_PLAYED</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LAST-POSITION:CAPS" title="GRL_METADATA_KEY_LAST_POSITION">GRL_METADATA_KEY_LAST_POSITION</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LICENSE:CAPS" title="GRL_METADATA_KEY_LICENSE">GRL_METADATA_KEY_LICENSE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-LYRICS:CAPS" title="GRL_METADATA_KEY_LYRICS">GRL_METADATA_KEY_LYRICS</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-MIME:CAPS" title="GRL_METADATA_KEY_MIME">GRL_METADATA_KEY_MIME</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-PLAY-COUNT:CAPS" title="GRL_METADATA_KEY_PLAY_COUNT">GRL_METADATA_KEY_PLAY_COUNT</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-RATING:CAPS" title="GRL_METADATA_KEY_RATING">GRL_METADATA_KEY_RATING</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SITE:CAPS" title="GRL_METADATA_KEY_SITE">GRL_METADATA_KEY_SITE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SOURCE:CAPS" title="GRL_METADATA_KEY_SOURCE">GRL_METADATA_KEY_SOURCE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-STUDIO:CAPS" title="GRL_METADATA_KEY_STUDIO">GRL_METADATA_KEY_STUDIO</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL:CAPS" title="GRL_METADATA_KEY_THUMBNAIL">GRL_METADATA_KEY_THUMBNAIL</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-THUMBNAIL-BINARY:CAPS" title="GRL_METADATA_KEY_THUMBNAIL_BINARY">GRL_METADATA_KEY_THUMBNAIL_BINARY</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-TITLE:CAPS" title="GRL_METADATA_KEY_TITLE">GRL_METADATA_KEY_TITLE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-URL:CAPS" title="GRL_METADATA_KEY_URL">GRL_METADATA_KEY_URL</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-WIDTH:CAPS" title="GRL_METADATA_KEY_WIDTH">GRL_METADATA_KEY_WIDTH</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SEASON:CAPS" title="GRL_METADATA_KEY_SEASON">GRL_METADATA_KEY_SEASON</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EPISODE:CAPS" title="GRL_METADATA_KEY_EPISODE">GRL_METADATA_KEY_EPISODE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-SHOW:CAPS" title="GRL_METADATA_KEY_SHOW">GRL_METADATA_KEY_SHOW</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CREATION-DATE:CAPS" title="GRL_METADATA_KEY_CREATION_DATE">GRL_METADATA_KEY_CREATION_DATE</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-CAMERA-MODEL:CAPS" title="GRL_METADATA_KEY_CAMERA_MODEL">GRL_METADATA_KEY_CAMERA_MODEL</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ORIENTATION:CAPS" title="GRL_METADATA_KEY_ORIENTATION">GRL_METADATA_KEY_ORIENTATION</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-FLASH-USED:CAPS" title="GRL_METADATA_KEY_FLASH_USED">GRL_METADATA_KEY_FLASH_USED</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-EXPOSURE-TIME:CAPS" title="GRL_METADATA_KEY_EXPOSURE_TIME">GRL_METADATA_KEY_EXPOSURE_TIME</a>;
+extern GrlKeyID     <a class="link" href="grilo-grl-metadata-key.html#GRL-METADATA-KEY-ISO-SPEED:CAPS" title="GRL_METADATA_KEY_ISO_SPEED">GRL_METADATA_KEY_ISO_SPEED</a>;
 const <span class="returnvalue">gchar</span> *       <a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-get-name" title="grl_metadata_key_get_name ()">grl_metadata_key_get_name</a>           (<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>);
 const <span class="returnvalue">gchar</span> *       <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>           (<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>);
 #define             <a class="link" href="grilo-grl-metadata-key.html#grl-metadata-key-list-new" title="grl_metadata_key_list_new()">grl_metadata_key_list_new</a>           (first_key,
@@ -427,6 +427,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-GrlNetWc.html grilo-0.1.18/doc/grilo/html/grilo-GrlNetWc.html
--- grilo-0.1.17/doc/grilo/html/grilo-GrlNetWc.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-GrlNetWc.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlNetWc</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="grilo-net.html" title="Grilo Net Classes">
 <link rel="prev" href="grilo-net.html" title="Grilo Net Classes">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -415,6 +415,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-operation.html grilo-0.1.18/doc/grilo/html/grilo-grl-operation.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-operation.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-operation.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-operation</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="grilo-grl-definitions.html" title="grl-definitions">
 <link rel="next" href="grilo-grl-util.html" title="grl-util">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -116,6 +116,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-grl-util.html grilo-0.1.18/doc/grilo/html/grilo-grl-util.html
--- grilo-0.1.17/doc/grilo/html/grilo-grl-util.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-grl-util.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>grl-util</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="misc.html" title="Misc">
 <link rel="prev" href="grilo-grl-operation.html" title="grl-operation">
 <link rel="next" href="rn04.html" title="Grilo Libraries">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -144,6 +144,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-Multiple.html grilo-0.1.18/doc/grilo/html/grilo-Multiple.html
--- grilo-0.1.17/doc/grilo/html/grilo-Multiple.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-Multiple.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Multiple</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="multiple.html" title="Search in multiple sources">
 <link rel="prev" href="multiple.html" title="Search in multiple sources">
 <link rel="next" href="configure.html" title="Configuring plug-ins">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -218,7 +218,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>keys</code></em> :</span></p></td>
-<td>List of metadata keys we want to obtain.</td>
+<td>List of metadata keys we want to obtain. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GrlKeyID]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -245,6 +246,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/grilo-net.html grilo-0.1.18/doc/grilo/html/grilo-net.html
--- grilo-0.1.17/doc/grilo/html/grilo-net.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/grilo-net.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Grilo Net Classes</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn04.html" title="Grilo Libraries">
 <link rel="prev" href="rn04.html" title="Grilo Libraries">
 <link rel="next" href="grilo-GrlNetWc.html" title="GrlNetWc">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,6 +28,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlConfig.html grilo-0.1.18/doc/grilo/html/GrlConfig.html
--- grilo-0.1.17/doc/grilo/html/GrlConfig.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlConfig.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlConfig</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="configure.html" title="Configuring plug-ins">
 <link rel="prev" href="configure.html" title="Configuring plug-ins">
 <link rel="next" href="data.html" title="Media data">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -662,6 +662,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlData.html grilo-0.1.18/doc/grilo/html/GrlData.html
--- grilo-0.1.17/doc/grilo/html/GrlData.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlData.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlData</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="data.html" title="Media data">
 <link rel="next" href="GrlRelatedKeys.html" title="GrlRelatedKeys">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -963,6 +963,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaAudio.html grilo-0.1.18/doc/grilo/html/GrlMediaAudio.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaAudio.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaAudio.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaAudio</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlMediaVideo.html" title="GrlMediaVideo">
 <link rel="next" href="GrlMediaImage.html" title="GrlMediaImage">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -639,6 +639,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaBox.html grilo-0.1.18/doc/grilo/html/GrlMediaBox.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaBox.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaBox.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaBox</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlMedia.html" title="GrlMedia">
 <link rel="next" href="GrlMediaVideo.html" title="GrlMediaVideo">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -182,6 +182,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMedia.html grilo-0.1.18/doc/grilo/html/GrlMedia.html
--- grilo-0.1.17/doc/grilo/html/GrlMedia.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMedia.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMedia</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlRelatedKeys.html" title="GrlRelatedKeys">
 <link rel="next" href="GrlMediaBox.html" title="GrlMediaBox">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1655,6 +1655,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaImage.html grilo-0.1.18/doc/grilo/html/GrlMediaImage.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaImage.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaImage.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaImage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlMediaAudio.html" title="GrlMediaAudio">
 <link rel="next" href="misc.html" title="Misc">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -547,6 +547,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaPlugin.html grilo-0.1.18/doc/grilo/html/GrlMediaPlugin.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaPlugin.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaPlugin.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaPlugin</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="sources.html" title="Data sources">
 <link rel="prev" href="sources.html" title="Data sources">
 <link rel="next" href="GrlMetadataSource.html" title="GrlMetadataSource">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -408,6 +408,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaSource.html grilo-0.1.18/doc/grilo/html/GrlMediaSource.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaSource.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaSource.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaSource</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="sources.html" title="Data sources">
 <link rel="prev" href="GrlMetadataSource.html" title="GrlMetadataSource">
 <link rel="next" href="multiple.html" title="Search in multiple sources">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1650,7 +1650,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>keys</code></em> :</span></p></td>
-<td>A list of keys to resolve</td>
+<td>A list of keys to resolve. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GrlKeyID]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -1707,7 +1708,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>keys</code></em> :</span></p></td>
-<td>A list of keys to resolve</td>
+<td>A list of keys to resolve. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GrlKeyID]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -1971,6 +1973,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMediaVideo.html grilo-0.1.18/doc/grilo/html/GrlMediaVideo.html
--- grilo-0.1.17/doc/grilo/html/GrlMediaVideo.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMediaVideo.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMediaVideo</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlMediaBox.html" title="GrlMediaBox">
 <link rel="next" href="GrlMediaAudio.html" title="GrlMediaAudio">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -608,6 +608,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlMetadataSource.html grilo-0.1.18/doc/grilo/html/GrlMetadataSource.html
--- grilo-0.1.17/doc/grilo/html/GrlMetadataSource.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlMetadataSource.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlMetadataSource</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="sources.html" title="Data sources">
 <link rel="prev" href="GrlMediaPlugin.html" title="GrlMediaPlugin">
 <link rel="next" href="GrlMediaSource.html" title="GrlMediaSource">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -843,7 +843,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>missing_keys</code></em> :</span></p></td>
-<td>an optional originally empty list</td>
+<td>an optional originally empty list. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GrlKeyID]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -1165,6 +1166,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlPluginRegistry.html grilo-0.1.18/doc/grilo/html/GrlPluginRegistry.html
--- grilo-0.1.17/doc/grilo/html/GrlPluginRegistry.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlPluginRegistry.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlPluginRegistry</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="plugin-management.html" title="Plug-in management">
 <link rel="prev" href="plugin-management.html" title="Plug-in management">
 <link rel="next" href="sources.html" title="Data sources">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -902,7 +902,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>config</code></em> :</span></p></td>
-<td>a configuration set</td>
+<td>a configuration set. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
@@ -1010,6 +1011,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/GrlRelatedKeys.html grilo-0.1.18/doc/grilo/html/GrlRelatedKeys.html
--- grilo-0.1.17/doc/grilo/html/GrlRelatedKeys.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/GrlRelatedKeys.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GrlRelatedKeys</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="data.html" title="Media data">
 <link rel="prev" href="GrlData.html" title="GrlData">
 <link rel="next" href="GrlMedia.html" title="GrlMedia">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -616,6 +616,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/index.html grilo-0.1.18/doc/grilo/html/index.html
--- grilo-0.1.17/doc/grilo/html/index.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/index.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,10 +3,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Grilo Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="next" href="pr01.html" title="Overview">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -156,6 +156,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/misc.html grilo-0.1.18/doc/grilo/html/misc.html
--- grilo-0.1.17/doc/grilo/html/misc.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/misc.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Misc</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="GrlMediaImage.html" title="GrlMediaImage">
 <link rel="next" href="grilo-grl-metadata-key.html" title="grl-metadata-key">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -45,6 +45,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/multiple.html grilo-0.1.18/doc/grilo/html/multiple.html
--- grilo-0.1.17/doc/grilo/html/multiple.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/multiple.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Search in multiple sources</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="GrlMediaSource.html" title="GrlMediaSource">
 <link rel="next" href="grilo-Multiple.html" title="Multiple">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,6 +28,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/plugin-management.html grilo-0.1.18/doc/grilo/html/plugin-management.html
--- grilo-0.1.17/doc/grilo/html/plugin-management.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/plugin-management.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Plug-in management</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="grilo-grilo.html" title="grilo">
 <link rel="next" href="GrlPluginRegistry.html" title="GrlPluginRegistry">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,6 +28,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/pr01.html grilo-0.1.18/doc/grilo/html/pr01.html
--- grilo-0.1.17/doc/grilo/html/pr01.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/pr01.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Overview</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="index.html" title="Grilo Reference Manual">
 <link rel="next" href="rn01.html" title="Tutorial">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="preface">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp6221824"></a>Overview</h2></div></div></div>
+<a name="idp1693704"></a>Overview</h2></div></div></div>
 <div class="section">
 <div class="titlepage"></div>
 <p>
@@ -107,6 +107,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/rn01.html grilo-0.1.18/doc/grilo/html/rn01.html
--- grilo-0.1.17/doc/grilo/html/rn01.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/rn01.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Tutorial</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="pr01.html" title="Overview">
 <link rel="next" href="ch01.html" title="Quick start guide">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
 <div class="reference">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="idp4579336"></a>Tutorial</h1></div></div>
+<a name="idp51136"></a>Tutorial</h1></div></div>
 <hr>
 </div>
 <div class="toc">
@@ -69,6 +69,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/rn02.html grilo-0.1.18/doc/grilo/html/rn02.html
--- grilo-0.1.17/doc/grilo/html/rn02.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/rn02.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Object Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="ch04.html" title="Writing plugins for Grilo">
 <link rel="next" href="rn03.html" title="API Reference">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
 <div class="reference">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="idp4594328"></a>Object Index</h1></div></div>
+<a name="idp65240"></a>Object Index</h1></div></div>
 <hr>
 </div>
 <pre class="screen">
@@ -43,6 +43,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/rn03.html grilo-0.1.18/doc/grilo/html/rn03.html
--- grilo-0.1.17/doc/grilo/html/rn03.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/rn03.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="rn02.html" title="Object Index">
 <link rel="next" href="grilo-grilo.html" title="grilo">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
 <div class="reference">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="idp4595008"></a>API Reference</h1></div></div>
+<a name="idp65920"></a>API Reference</h1></div></div>
 <hr>
 </div>
 <div class="toc">
@@ -106,6 +106,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/rn04.html grilo-0.1.18/doc/grilo/html/rn04.html
--- grilo-0.1.17/doc/grilo/html/rn04.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/rn04.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Grilo Libraries</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="index.html" title="Grilo Reference Manual">
 <link rel="prev" href="grilo-grl-util.html" title="grl-util">
 <link rel="next" href="grilo-net.html" title="Grilo Net Classes">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
 <div class="reference">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="idp4555656"></a>Grilo Libraries</h1></div></div>
+<a name="idp27032"></a>Grilo Libraries</h1></div></div>
 <hr>
 </div>
 <div class="toc">
@@ -44,6 +44,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/html/sources.html grilo-0.1.18/doc/grilo/html/sources.html
--- grilo-0.1.17/doc/grilo/html/sources.html	2011-09-05 14:15:37.000000000 +0000
+++ grilo-0.1.18/doc/grilo/html/sources.html	2011-12-09 17:54:40.000000000 +0000
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Data sources</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Grilo Reference Manual">
 <link rel="up" href="rn03.html" title="API Reference">
 <link rel="prev" href="GrlPluginRegistry.html" title="GrlPluginRegistry">
 <link rel="next" href="GrlMediaPlugin.html" title="GrlMediaPlugin">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -36,6 +36,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>
\ No newline at end of file
diff -Nru grilo-0.1.17/doc/grilo/Makefile.in grilo-0.1.18/doc/grilo/Makefile.in
--- grilo-0.1.17/doc/grilo/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/doc/grilo/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -124,6 +124,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -154,8 +156,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -335,10 +335,10 @@
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/data $(DEPS_CFLAGS)
 GTKDOC_LIBS = $(top_builddir)/src/lib@GRL_NAME@.la $(DEPS_LIBS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
 
@@ -358,10 +358,10 @@
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = $(SETUP_FILES) $(man_MANS)
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) $(man_MANS)
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	setup.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -643,34 +643,40 @@
 
 setup-build.stamp:
 	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
 	fi
 	@touch setup-build.stamp
 
-setup.stamp: setup-build.stamp
-	@true
-
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
+	@echo '  DOC   Scanning header files'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+	    echo "  DOC   Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
-                 test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -680,8 +686,8 @@
 
 #### xml ####
 
-sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo '  DOC   Building XML'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -695,13 +701,19 @@
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
+	@echo '  DOC   Building HTML'
 	@rm -rf html
 	@mkdir html
 	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -713,48 +725,54 @@
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo 'gtk-doc: Fixing cross-references'
+	@echo '  DOC   Fixing cross-references'
 	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	@echo '  DOC   Building PDF'
+	@rm -f $(DOC_MODULE).pdf
+	@mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
 
 distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local: clean
-	rm -rf xml html
+	@rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(builddir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -763,14 +781,12 @@
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -792,13 +808,13 @@
 @ENABLE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/html
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
 
diff -Nru grilo-0.1.17/doc/Makefile.in grilo-0.1.18/doc/Makefile.in
--- grilo-0.1.17/doc/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/doc/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -139,6 +139,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -169,8 +171,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/examples/Makefile.in grilo-0.1.18/examples/Makefile.in
--- grilo-0.1.17/examples/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/examples/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -162,6 +162,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -192,8 +194,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/gtk-doc.make grilo-0.1.18/gtk-doc.make
--- grilo-0.1.17/gtk-doc.make	2011-09-05 14:14:26.000000000 +0000
+++ grilo-0.1.18/gtk-doc.make	2011-12-09 17:53:57.000000000 +0000
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -30,11 +30,12 @@
 	$(DOC_MODULE)-overrides.txt
 
 EXTRA_DIST = 				\
+	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
 DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	setup.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -75,36 +76,41 @@
 
 setup-build.stamp:
 	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
 	fi
 	@touch setup-build.stamp
 
 
-setup.stamp: setup-build.stamp
-	@true
-
-
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
+	@echo '  DOC   Scanning header files'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+	    echo "  DOC   Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
-                 test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -114,8 +120,8 @@
 
 #### xml ####
 
-sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo '  DOC   Building XML'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -129,13 +135,19 @@
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
+	@echo '  DOC   Building HTML'
 	@rm -rf html
 	@mkdir html
 	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -147,48 +159,54 @@
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo 'gtk-doc: Fixing cross-references'
+	@echo '  DOC   Fixing cross-references'
 	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	@echo '  DOC   Building PDF'
+	@rm -f $(DOC_MODULE).pdf
+	@mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
 
 distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local: clean
-	rm -rf xml html
+	@rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(builddir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -197,14 +215,12 @@
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -229,12 +245,12 @@
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/html
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff -Nru grilo-0.1.17/libs/Makefile.in grilo-0.1.18/libs/Makefile.in
--- grilo-0.1.17/libs/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/libs/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -139,6 +139,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -169,8 +171,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/libs/net/grl-net-wc.c grilo-0.1.18/libs/net/grl-net-wc.c
--- grilo-0.1.17/libs/net/grl-net-wc.c	2011-09-05 10:59:20.000000000 +0000
+++ grilo-0.1.18/libs/net/grl-net-wc.c	2011-12-09 13:28:03.000000000 +0000
@@ -397,6 +397,7 @@
     g_error_free (error);
 
     g_simple_async_result_complete (result);
+    g_object_unref (result);
     return;
   }
 
@@ -413,6 +414,7 @@
   }
 
   g_simple_async_result_complete (result);
+  g_object_unref (result);
 }
 
 static void
@@ -420,8 +422,21 @@
 {
   GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
   RequestResult *rr = g_simple_async_result_get_op_res_gpointer (result);
+  GError *error = NULL;
+
+  GInputStream *in = soup_request_send_finish (rr->request, res, &error);
+
+  if (error != NULL) {
+    g_simple_async_result_set_error (result, GRL_NET_WC_ERROR,
+                                     GRL_NET_WC_ERROR_UNAVAILABLE,
+                                     "Data not available");
+    g_error_free (error);
+
+    g_simple_async_result_complete (result);
+    g_object_unref (result);
+    return;
+  }
 
-  GInputStream *in = soup_request_send_finish (rr->request, res, NULL);
   rr->length = soup_request_get_content_length (rr->request) + 1;
   if (rr->length == 1) {
     rr->length = BUFFER_SIZE;
@@ -459,6 +474,7 @@
   }
 
   g_simple_async_result_complete (result);
+  g_object_unref (result);
 }
 
 static void
@@ -481,10 +497,12 @@
 {
   RequestResult *rr = g_slice_new0 (RequestResult);
 
-  rr->request = soup_requester_request (self->priv->requester, url, NULL);
   g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result),
                                              rr,
                                              NULL);
+
+  rr->request = soup_requester_request (self->priv->requester, url, NULL);
+
   soup_request_send_async (rr->request, cancellable, reply_cb, result);
 }
 
@@ -507,6 +525,7 @@
                                      GRL_NET_WC_ERROR_PROTOCOL_ERROR,
                                      "Malformed URL: %s", url);
     g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result));
+    g_object_unref (result);
 
     return;
   }
@@ -743,7 +762,6 @@
 #endif
 
 end_func:
-  g_object_unref (res);
   return ret;
 }
 
diff -Nru grilo-0.1.17/libs/net/Makefile.am grilo-0.1.18/libs/net/Makefile.am
--- grilo-0.1.17/libs/net/Makefile.am	2011-05-17 14:35:24.000000000 +0000
+++ grilo-0.1.18/libs/net/Makefile.am	2011-12-09 13:28:03.000000000 +0000
@@ -7,7 +7,6 @@
 
 
 lib_LTLIBRARIES = libgrlnet-@GRL_MAJORMINOR@.la
-noinst_PROGRAMS = wc-test
 
 libgrlnet_@GRL_MAJORMINOR@_la_DEPENDENCIES =	\
 	$(top_builddir)/src/lib@GRL_NAME@.la
@@ -31,6 +30,9 @@
 	$(DEPS_LIBS)				\
 	$(NET_LIBS)
 
+libgrlnet_@GRL_MAJORMINOR@_la_LDFLAGS =	\
+	-no-undefined
+
 libgrlnet_@GRL_MAJORMINOR@includedir =	\
 	$(includedir)/@GRL_NAME@/net
 
@@ -38,17 +40,6 @@
 	grl-net-wc.h				\
 	grl-net.h
 
-wc_test_SOURCES = 	\
-	wc-test.c
-
-wc_test_CFLAGS = 	\
-	$(DEPS_CFLAGS)	\
-	-D_GNU_SOURCE
-
-wc_test_LDADD =				\
-	libgrlnet-@GRL_MAJORMINOR@.la	\
-	$(DEPS_LIBS)
-
 MAINTAINERCLEANFILES =	\
 	*.in		\
 	*~
diff -Nru grilo-0.1.17/libs/net/Makefile.in grilo-0.1.18/libs/net/Makefile.in
--- grilo-0.1.17/libs/net/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/libs/net/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -24,7 +24,6 @@
 
 
 
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,7 +43,6 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = wc-test$(EXEEXT)
 @BUILD_GRILO_NET_WITH_CACHE_TRUE@am__append_1 = \
 @BUILD_GRILO_NET_WITH_CACHE_TRUE@	-DLIBSOUP_WITH_CACHE
 
@@ -101,15 +99,7 @@
 libgrlnet_@GRL_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libgrlnet_@GRL_MAJORMINOR@_la_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(noinst_PROGRAMS)
-am_wc_test_OBJECTS = wc_test-wc-test.$(OBJEXT)
-wc_test_OBJECTS = $(am_wc_test_OBJECTS)
-wc_test_DEPENDENCIES = libgrlnet-@GRL_MAJORMINOR@.la \
-	$(am__DEPENDENCIES_1)
-wc_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(wc_test_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(libgrlnet_@GRL_MAJORMINOR@_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -136,9 +126,8 @@
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES) $(wc_test_SOURCES)
-DIST_SOURCES = $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES) \
-	$(wc_test_SOURCES)
+SOURCES = $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES)
+DIST_SOURCES = $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES)
 am__dist_gir_DATA_DIST = GrlNet-@GRL_MAJORMINOR@.gir
 DATA = $(dist_gir_DATA) $(typelib_DATA)
 HEADERS = $(libgrlnet_@GRL_MAJORMINOR@include_HEADERS)
@@ -181,6 +170,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -211,8 +202,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -312,6 +301,9 @@
 	$(DEPS_LIBS)				\
 	$(NET_LIBS)
 
+libgrlnet_@GRL_MAJORMINOR@_la_LDFLAGS = \
+	-no-undefined
+
 libgrlnet_@GRL_MAJORMINOR@includedir = \
 	$(includedir)/@GRL_NAME@/net
 
@@ -319,17 +311,6 @@
 	grl-net-wc.h				\
 	grl-net.h
 
-wc_test_SOURCES = \
-	wc-test.c
-
-wc_test_CFLAGS = \
-	$(DEPS_CFLAGS)	\
-	-D_GNU_SOURCE
-
-wc_test_LDADD = \
-	libgrlnet-@GRL_MAJORMINOR@.la	\
-	$(DEPS_LIBS)
-
 MAINTAINERCLEANFILES = \
 	*.in		\
 	*~
@@ -421,18 +402,6 @@
 libgrlnet-@GRL_MAJORMINOR@.la: $(libgrlnet_@GRL_MAJORMINOR@_la_OBJECTS) $(libgrlnet_@GRL_MAJORMINOR@_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgrlnet_@GRL_MAJORMINOR@_la_LINK) -rpath $(libdir) $(libgrlnet_@GRL_MAJORMINOR@_la_OBJECTS) $(libgrlnet_@GRL_MAJORMINOR@_la_LIBADD) $(LIBS)
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-wc-test$(EXEEXT): $(wc_test_OBJECTS) $(wc_test_DEPENDENCIES) 
-	@rm -f wc-test$(EXEEXT)
-	$(AM_V_CCLD)$(wc_test_LINK) $(wc_test_OBJECTS) $(wc_test_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -440,7 +409,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrlnet_@GRL_MAJORMINOR@_la-grl-net-wc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc_test-wc-test.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -474,22 +442,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrlnet_@GRL_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgrlnet_@GRL_MAJORMINOR@_la-grl-net-wc.lo `test -f 'grl-net-wc.c' || echo '$(srcdir)/'`grl-net-wc.c
 
-wc_test-wc-test.o: wc-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wc_test_CFLAGS) $(CFLAGS) -MT wc_test-wc-test.o -MD -MP -MF $(DEPDIR)/wc_test-wc-test.Tpo -c -o wc_test-wc-test.o `test -f 'wc-test.c' || echo '$(srcdir)/'`wc-test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wc_test-wc-test.Tpo $(DEPDIR)/wc_test-wc-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wc-test.c' object='wc_test-wc-test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wc_test_CFLAGS) $(CFLAGS) -c -o wc_test-wc-test.o `test -f 'wc-test.c' || echo '$(srcdir)/'`wc-test.c
-
-wc_test-wc-test.obj: wc-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wc_test_CFLAGS) $(CFLAGS) -MT wc_test-wc-test.obj -MD -MP -MF $(DEPDIR)/wc_test-wc-test.Tpo -c -o wc_test-wc-test.obj `if test -f 'wc-test.c'; then $(CYGPATH_W) 'wc-test.c'; else $(CYGPATH_W) '$(srcdir)/wc-test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wc_test-wc-test.Tpo $(DEPDIR)/wc_test-wc-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wc-test.c' object='wc_test-wc-test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wc_test_CFLAGS) $(CFLAGS) -c -o wc_test-wc-test.obj `if test -f 'wc-test.c'; then $(CYGPATH_W) 'wc-test.c'; else $(CYGPATH_W) '$(srcdir)/wc-test.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -640,7 +592,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libgrlnet_@GRL_MAJORMINOR@includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -676,7 +628,7 @@
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -751,14 +703,13 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_girDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES \
+	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_girDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
 	install-libgrlnet_@GRL_MAJORMINOR@includeHEADERS install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-typelibDATA installcheck installcheck-am \
diff -Nru grilo-0.1.17/libs/net/wc-test.c grilo-0.1.18/libs/net/wc-test.c
--- grilo-0.1.17/libs/net/wc-test.c	2011-09-05 10:59:20.000000000 +0000
+++ grilo-0.1.18/libs/net/wc-test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-#include "grl-net-wc.h"
-
-#include <stdio.h>
-#include <unistd.h>
-
-GMainLoop *loop;
-const gchar *uri;
-
-static gboolean
-quit (gpointer data)
-{
-  g_object_unref (G_OBJECT (data));
-  g_main_loop_quit (loop);
-
-  return FALSE;
-}
-
-static void
-fetch_result (GObject *source,
-	      GAsyncResult *result,
-	      gpointer user_data)
-{
-  gchar *content;
-  gsize length;
-  GError *error = NULL;
-
-  if (!grl_net_wc_request_finish (GRL_NET_WC (source),
-                                  result,
-                                  &content,
-                                  &length,
-                                  &error)) {
-    g_print ("Error: %s\n", error->message);
-  } else {
-    if (write (fileno (stdout), content, length) < 0) {
-      g_print ("Error: unable to dump content on STDOUT\n");
-    }
-  }
-
-  g_idle_add (quit, source);
-}
-
-static gboolean
-cancel_request (gpointer data)
-{
-  GCancellable *cancellable;
-
-  cancellable = G_CANCELLABLE (data);
-  g_cancellable_cancel (cancellable);
-
-  return FALSE;
-}
-
-static gboolean
-request (gpointer data)
-{
-  GCancellable *cancellable;
-  GrlNetWc *wc;
-  const gchar *u;
-
-  wc = GRL_NET_WC (data);
-  u = uri ? uri : "http://www.yahoo.com";
-
-  cancellable = g_cancellable_new ();
-  grl_net_wc_request_async (wc, u, cancellable, fetch_result, NULL);
-  g_timeout_add_seconds (2, cancel_request, cancellable);
-
-  return FALSE;
-}
-
-int
-main (int argc, const char **argv)
-{
-  GrlNetWc *wc;
-
-  g_thread_init (NULL);
-  g_type_init ();
-
-  if (argc == 2)
-    uri = argv[1];
-
-  wc = grl_net_wc_new ();
-
-  g_object_set (wc, "loglevel", 1, NULL);
-
-  loop = g_main_loop_new (NULL, FALSE);
-
-  g_idle_add (request, wc);
-
-  g_main_loop_run (loop);
-}
diff -Nru grilo-0.1.17/ltmain.sh grilo-0.1.18/ltmain.sh
--- grilo-0.1.17/ltmain.sh	2011-09-05 14:14:25.000000000 +0000
+++ grilo-0.1.18/ltmain.sh	2011-12-09 17:53:57.000000000 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-4"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7319,6 +7333,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru grilo-0.1.17/m4/gtk-doc.m4 grilo-0.1.18/m4/gtk-doc.m4
--- grilo-0.1.17/m4/gtk-doc.m4	2011-09-05 14:14:26.000000000 +0000
+++ grilo-0.1.18/m4/gtk-doc.m4	2011-12-09 17:53:57.000000000 +0000
@@ -6,6 +6,7 @@
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
@@ -33,6 +34,11 @@
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
                         AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+    dnl don't check for glib if we build glib
+    if test "x$PACKAGE_NAME" != "xglib"; then
+      dnl don't fail if someone does not have glib
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+    fi
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
diff -Nru grilo-0.1.17/m4/libtool.m4 grilo-0.1.18/m4/libtool.m4
--- grilo-0.1.17/m4/libtool.m4	2011-09-05 14:14:25.000000000 +0000
+++ grilo-0.1.18/m4/libtool.m4	2011-12-09 17:53:57.000000000 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,7 +2513,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -2466,7 +2524,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2527,7 +2585,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2543,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2580,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2715,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2784,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2809,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2833,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2864,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2874,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3296,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3658,6 +3716,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4242,7 +4301,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4334,18 +4395,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4581,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4533,7 +4611,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4787,8 +4864,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5084,6 +5160,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5207,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5219,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5258,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5627,9 +5699,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5787,7 +5856,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6225,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6918,12 +6986,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7194,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7326,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7512,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7652,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru grilo-0.1.17/m4/ltoptions.m4 grilo-0.1.18/m4/ltoptions.m4
--- grilo-0.1.17/m4/ltoptions.m4	2011-09-05 14:14:25.000000000 +0000
+++ grilo-0.1.18/m4/ltoptions.m4	2011-12-09 17:53:57.000000000 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru grilo-0.1.17/m4/ltversion.m4 grilo-0.1.18/m4/ltversion.m4
--- grilo-0.1.17/m4/ltversion.m4	2011-09-05 14:14:26.000000000 +0000
+++ grilo-0.1.18/m4/ltversion.m4	2011-12-09 17:53:57.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru grilo-0.1.17/Makefile.in grilo-0.1.18/Makefile.in
--- grilo-0.1.17/Makefile.in	2011-09-05 14:14:30.000000000 +0000
+++ grilo-0.1.18/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -64,8 +64,8 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = grilo-uninstalled.pc grilo-0.1.pc \
-	grilo-net-uninstalled.pc grilo-net-0.1.pc
+CONFIG_CLEAN_FILES = grilo-net-uninstalled.pc grilo-net-0.1.pc \
+	grilo-uninstalled.pc grilo-0.1.pc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -185,6 +185,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -215,8 +217,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -363,14 +363,14 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-grilo-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/grilo-uninstalled.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-grilo-0.1.pc: $(top_builddir)/config.status $(srcdir)/grilo-0.1.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 grilo-net-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/grilo-net-uninstalled.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 grilo-net-0.1.pc: $(top_builddir)/config.status $(srcdir)/grilo-net-0.1.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+grilo-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/grilo-uninstalled.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+grilo-0.1.pc: $(top_builddir)/config.status $(srcdir)/grilo-0.1.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff -Nru grilo-0.1.17/NEWS grilo-0.1.18/NEWS
--- grilo-0.1.17/NEWS	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/NEWS	2011-12-09 13:28:03.000000000 +0000
@@ -1,3 +1,20 @@
+NEW in 0.1.18
+=============
+
+  * Added support for Windows building
+  * Several fixes, including:
+    * BGO#662762 - critical when HTTP request fails
+    * BGO#662763 - Bad unref in grl-net
+
+  * Contributors to this release:
+    Damien Lespiau <damien.lespiau@intel.com>
+    Guillaume Emont <guijemont@igalia.com>
+    Jens Georg <mail@jensge.org>
+    Juan A. Suarez Romero <jasuarez@igalia.com>
+    Sam Thursfield <sam.thursfield@codethink.co.uk>
+    Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+
 NEW in 0.1.17
 =============
 
diff -Nru grilo-0.1.17/src/grilo.c grilo-0.1.18/src/grilo.c
--- grilo-0.1.17/src/grilo.c	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/src/grilo.c	2011-12-09 13:28:03.000000000 +0000
@@ -40,12 +40,31 @@
 #include "grl-log-priv.h"
 #include "config.h"
 
-#define GRL_PLUGIN_PATH_DEFAULT GRL_PLUGINS_DIR
-
 static gboolean grl_initialized = FALSE;
 static const gchar *plugin_path = NULL;
 static const gchar *plugin_list = NULL;
 
+static const gchar *
+get_default_plugin_dir (void)
+{
+#ifdef G_OS_WIN32
+  static gchar *plugin_dir = NULL;
+  gchar *run_directory;
+
+  if (plugin_dir)
+    return plugin_dir;
+
+  run_directory = g_win32_get_package_installation_directory_of_module (NULL);
+  plugin_dir = g_build_filename (run_directory,
+                                 "lib", GRL_NAME,
+                                 NULL);
+  g_free (run_directory);
+  return plugin_dir;
+#else
+  return GRL_PLUGINS_DIR;
+#endif
+}
+
 /**
  * grl_init:
  * @argc: (inout) (allow-none): number of input arguments, length of @argv
@@ -107,10 +126,10 @@
   }
 
   if (!plugin_path) {
-    plugin_path = GRL_PLUGIN_PATH_DEFAULT;
+    plugin_path = get_default_plugin_dir ();
   }
 
-  split_list = g_strsplit (plugin_path, ":", 0);
+  split_list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0);
   for (split_element = split_list; *split_element; split_element++) {
     grl_plugin_registry_add_directory (registry, *split_element);
   }
@@ -150,9 +169,13 @@
   GOptionGroup *group;
   static const GOptionEntry grl_args[] = {
     { "grl-plugin-path", 0, 0, G_OPTION_ARG_STRING, &plugin_path,
-      "Colon-separated paths containing plugins", NULL },
+#ifdef G_OS_WIN32
+      "Semicolon-separated paths containing Grilo plugins", NULL },
+#else
+      "Colon-separated paths containing Grilo plugins", NULL },
+#endif
     { "grl-plugin-use", 0, 0, G_OPTION_ARG_STRING, &plugin_list,
-      "Colon-separated list of plugins to use", NULL },
+      "Colon-separated list of Grilo plugins to use", NULL },
     { NULL }
   };
 
diff -Nru grilo-0.1.17/src/Grl-0.1.gir grilo-0.1.18/src/Grl-0.1.gir
--- grilo-0.1.17/src/Grl-0.1.gir	2011-09-05 14:15:01.000000000 +0000
+++ grilo-0.1.18/src/Grl-0.1.gir	2011-12-09 17:54:14.000000000 +0000
@@ -17,28 +17,44 @@
     <alias name="KeyID" c:type="GrlKeyID">
       <type name="gpointer" c:type="gpointer"/>
     </alias>
-    <constant name="CONFIG_KEY_APIKEY" value="api-key">
+    <constant name="CONFIG_KEY_APIKEY"
+              value="api-key"
+              c:type="GRL_CONFIG_KEY_APIKEY">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_APIKEY_BLOB" value="api-key-blob">
+    <constant name="CONFIG_KEY_APIKEY_BLOB"
+              value="api-key-blob"
+              c:type="GRL_CONFIG_KEY_APIKEY_BLOB">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_APISECRET" value="api-secret">
+    <constant name="CONFIG_KEY_APISECRET"
+              value="api-secret"
+              c:type="GRL_CONFIG_KEY_APISECRET">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_APITOKEN" value="api-token">
+    <constant name="CONFIG_KEY_APITOKEN"
+              value="api-token"
+              c:type="GRL_CONFIG_KEY_APITOKEN">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_PASSWORD" value="password">
+    <constant name="CONFIG_KEY_PASSWORD"
+              value="password"
+              c:type="GRL_CONFIG_KEY_PASSWORD">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_PLUGIN" value="target-plugin">
+    <constant name="CONFIG_KEY_PLUGIN"
+              value="target-plugin"
+              c:type="GRL_CONFIG_KEY_PLUGIN">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_SOURCE" value="target-source">
+    <constant name="CONFIG_KEY_SOURCE"
+              value="target-source"
+              c:type="GRL_CONFIG_KEY_SOURCE">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="CONFIG_KEY_USERNAME" value="username">
+    <constant name="CONFIG_KEY_USERNAME"
+              value="username"
+              c:type="GRL_CONFIG_KEY_USERNAME">
       <type name="utf8" c:type="gchar*"/>
     </constant>
     <class name="Config"
@@ -641,7 +657,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList with</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.Value" c:type="GList*"/>
+            <type name="GObject.Value"/>
           </type>
         </return-value>
         <parameters>
@@ -663,7 +679,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList with values. Do</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="utf8" c:type="GList*"/>
+            <type name="utf8"/>
           </type>
         </return-value>
         <parameters>
@@ -737,7 +753,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">an array with the</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -783,7 +799,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList with</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.Value" c:type="GList*"/>
+            <type name="GObject.Value"/>
           </type>
         </return-value>
         <parameters>
@@ -803,7 +819,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList with values. Do</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="utf8" c:type="GList*"/>
+            <type name="utf8"/>
           </type>
         </return-value>
         <parameters>
@@ -1084,7 +1100,7 @@
     </record>
     <record name="DataPrivate" c:type="GrlDataPrivate" disguised="1">
     </record>
-    <constant name="KEYID_FORMAT" value="p">
+    <constant name="KEYID_FORMAT" value="p" c:type="GRL_KEYID_FORMAT">
       <type name="utf8" c:type="gchar*"/>
     </constant>
     <record name="LogDomain" c:type="GrlLogDomain" disguised="1">
@@ -1119,25 +1135,39 @@
       <member name="debug" value="5" c:identifier="GRL_LOG_LEVEL_DEBUG"/>
       <member name="last" value="6" c:identifier="GRL_LOG_LEVEL_LAST"/>
     </enumeration>
-    <constant name="MEDIA_PLUGIN_AUTHOR" value="author">
+    <constant name="MEDIA_PLUGIN_AUTHOR"
+              value="author"
+              c:type="GRL_MEDIA_PLUGIN_AUTHOR">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="MEDIA_PLUGIN_DESCRIPTION" value="description">
+    <constant name="MEDIA_PLUGIN_DESCRIPTION"
+              value="description"
+              c:type="GRL_MEDIA_PLUGIN_DESCRIPTION">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="MEDIA_PLUGIN_LICENSE" value="license">
+    <constant name="MEDIA_PLUGIN_LICENSE"
+              value="license"
+              c:type="GRL_MEDIA_PLUGIN_LICENSE">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="MEDIA_PLUGIN_NAME" value="name">
+    <constant name="MEDIA_PLUGIN_NAME"
+              value="name"
+              c:type="GRL_MEDIA_PLUGIN_NAME">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="MEDIA_PLUGIN_SITE" value="site">
+    <constant name="MEDIA_PLUGIN_SITE"
+              value="site"
+              c:type="GRL_MEDIA_PLUGIN_SITE">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="MEDIA_PLUGIN_VERSION" value="version">
+    <constant name="MEDIA_PLUGIN_VERSION"
+              value="version"
+              c:type="GRL_MEDIA_PLUGIN_VERSION">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="METADATA_KEY_CHILDCOUNT_UNKNOWN" value="-1">
+    <constant name="METADATA_KEY_CHILDCOUNT_UNKNOWN"
+              value="-1"
+              c:type="GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN">
       <type name="gint" c:type="gint"/>
     </constant>
     <class name="Media"
@@ -2730,7 +2760,7 @@
 when done using the list.</doc>
         <return-value transfer-ownership="container">
           <type name="GLib.List" c:type="GList*">
-            <type name="utf8" c:type="GList*"/>
+            <type name="utf8"/>
           </type>
         </return-value>
       </method>
@@ -2996,7 +3026,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -3039,7 +3069,7 @@
         <return-value transfer-ownership="full">
           <doc xml:whitespace="preserve">a #GList with #GrlMedia</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="Media" c:type="GList*"/>
+            <type name="Media"/>
           </type>
         </return-value>
         <parameters>
@@ -3050,7 +3080,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -3124,7 +3154,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">A list of keys to resolve</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="gpointer" c:type="gpointer"/>
+              <type name="KeyID"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -3170,7 +3200,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">A list of keys to resolve</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="gpointer" c:type="gpointer"/>
+              <type name="KeyID"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -3216,7 +3246,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -3258,7 +3288,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -3324,7 +3354,7 @@
           <parameter name="changed_medias" transfer-ownership="full">
             <doc xml:whitespace="preserve">: the list of medias that have changed</doc>
             <array name="GLib.PtrArray" c:type="GPtrArray*">
-              <type name="Media" c:type="GPtrArray*"/>
+              <type name="Media"/>
             </array>
           </parameter>
           <parameter name="change_type" transfer-ownership="none">
@@ -3385,7 +3415,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -3428,7 +3458,7 @@
         <return-value transfer-ownership="full">
           <doc xml:whitespace="preserve">a #GList with #GrlMedia</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="Media" c:type="GList*"/>
+            <type name="Media"/>
           </type>
         </return-value>
         <parameters>
@@ -3439,7 +3469,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -3525,7 +3555,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -3573,7 +3603,7 @@
         <return-value transfer-ownership="full">
           <doc xml:whitespace="preserve">a #GList with #GrlMedia</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="Media" c:type="GList*"/>
+            <type name="Media"/>
           </type>
         </return-value>
         <parameters>
@@ -3584,7 +3614,7 @@
           <parameter name="keys" transfer-ownership="none">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID&lt;!-- --&gt;s to request</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="skip" transfer-ownership="none">
@@ -4680,7 +4710,7 @@
 a #GList with the keys, or @NULL if it can not resolve @key_id</doc>
         <return-value transfer-ownership="none">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -4717,10 +4747,13 @@
             <doc xml:whitespace="preserve">the key corresponding to a metadata we might want</doc>
             <type name="KeyID" c:type="GrlKeyID"/>
           </parameter>
-          <parameter name="missing_keys" transfer-ownership="none">
+          <parameter name="missing_keys"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
             <doc xml:whitespace="preserve">an optional originally empty list</doc>
             <type name="GLib.List" c:type="GList**">
-              <type name="gpointer" c:type="gpointer"/>
+              <type name="KeyID"/>
             </type>
           </parameter>
         </parameters>
@@ -4754,7 +4787,7 @@
         <return-value transfer-ownership="none">
           <doc xml:whitespace="preserve">a #GList with the keys</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </virtual-method>
@@ -4766,7 +4799,7 @@
         <return-value transfer-ownership="none">
           <doc xml:whitespace="preserve">a #GList with the keys</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </virtual-method>
@@ -4785,7 +4818,7 @@
 a #GList with the keys</doc>
         <return-value transfer-ownership="none">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </virtual-method>
@@ -4849,7 +4882,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">if</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -4860,7 +4893,7 @@
                      allow-none="1">
             <doc xml:whitespace="preserve"> the list of keys to filter out</doc>
             <type name="GLib.List" c:type="GList**">
-              <type name="GObject.ParamSpec" c:type="GList**"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="return_filtered" transfer-ownership="none">
@@ -4879,7 +4912,7 @@
 otherwise %NULL</doc>
         <return-value transfer-ownership="container">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -4890,7 +4923,7 @@
                      allow-none="1">
             <doc xml:whitespace="preserve"> the list of keys to filter out</doc>
             <type name="GLib.List" c:type="GList**">
-              <type name="GObject.ParamSpec" c:type="GList**"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="return_filtered" transfer-ownership="none">
@@ -4913,7 +4946,7 @@
 otherwise %NULL</doc>
         <return-value transfer-ownership="container">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -4924,7 +4957,7 @@
                      allow-none="1">
             <doc xml:whitespace="preserve"> the list of keys to filter out</doc>
             <type name="GLib.List" c:type="GList**">
-              <type name="GObject.ParamSpec" c:type="GList**"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="return_filtered" transfer-ownership="none">
@@ -5034,7 +5067,7 @@
 a #GList with the keys, or @NULL if it can not resolve @key_id</doc>
         <return-value transfer-ownership="none">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -5071,10 +5104,13 @@
             <doc xml:whitespace="preserve">the key corresponding to a metadata we might want</doc>
             <type name="KeyID" c:type="GrlKeyID"/>
           </parameter>
-          <parameter name="missing_keys" transfer-ownership="none">
+          <parameter name="missing_keys"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
             <doc xml:whitespace="preserve">an optional originally empty list</doc>
             <type name="GLib.List" c:type="GList**">
-              <type name="gpointer" c:type="gpointer"/>
+              <type name="KeyID"/>
             </type>
           </parameter>
         </parameters>
@@ -5138,7 +5174,7 @@
           <parameter name="keys" transfer-ownership="none" allow-none="1">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID to retrieve</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="media" transfer-ownership="none">
@@ -5180,7 +5216,7 @@
           <parameter name="keys" transfer-ownership="none" allow-none="1">
             <doc xml:whitespace="preserve">the #GList of #GrlKeyID to retrieve</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="media" transfer-ownership="none">
@@ -5214,7 +5250,7 @@
           <parameter name="keys" transfer-ownership="none" allow-none="1">
             <doc xml:whitespace="preserve">a list of #GrlKeyID whose values we want to change.</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -5250,7 +5286,7 @@
 a #GList of keys that could not be updated, or @NULL</doc>
         <return-value transfer-ownership="container">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -5261,7 +5297,7 @@
           <parameter name="keys" transfer-ownership="none" allow-none="1">
             <doc xml:whitespace="preserve">a list of #GrlKeyID whose values we want to change</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
@@ -5344,7 +5380,7 @@
         <return-value transfer-ownership="none">
           <doc xml:whitespace="preserve">a #GList with the keys</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -5356,7 +5392,7 @@
         <return-value transfer-ownership="none">
           <doc xml:whitespace="preserve">a #GList with the keys</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -5381,7 +5417,7 @@
 a #GList with the keys</doc>
         <return-value transfer-ownership="none">
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -5446,7 +5482,7 @@
           <return-value transfer-ownership="none">
             <doc xml:whitespace="preserve">a #GList with the keys</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </return-value>
           <parameters>
@@ -5461,7 +5497,7 @@
           <return-value transfer-ownership="none">
             <doc xml:whitespace="preserve">a #GList with the keys</doc>
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </return-value>
           <parameters>
@@ -5475,7 +5511,7 @@
         <callback name="key_depends">
           <return-value transfer-ownership="none">
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </return-value>
           <parameters>
@@ -5493,7 +5529,7 @@
         <callback name="writable_keys">
           <return-value transfer-ownership="none">
             <type name="GLib.List" c:type="GList*">
-              <type name="GObject.ParamSpec" c:type="GList*"/>
+              <type name="GObject.ParamSpec"/>
             </type>
           </return-value>
           <parameters>
@@ -5553,10 +5589,13 @@
               <doc xml:whitespace="preserve">the key corresponding to a metadata we might want</doc>
               <type name="KeyID" c:type="GrlKeyID"/>
             </parameter>
-            <parameter name="missing_keys" transfer-ownership="none">
+            <parameter name="missing_keys"
+                       direction="out"
+                       caller-allocates="0"
+                       transfer-ownership="full">
               <doc xml:whitespace="preserve">an optional originally empty list</doc>
               <type name="GLib.List" c:type="GList**">
-                <type name="gpointer" c:type="gpointer"/>
+                <type name="KeyID"/>
               </type>
             </parameter>
           </parameters>
@@ -5670,7 +5709,7 @@
         <parameter name="failed_keys" transfer-ownership="container">
           <doc xml:whitespace="preserve">#GList of keys that could not be updated, if any</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </parameter>
         <parameter name="user_data" transfer-ownership="none" closure="3">
@@ -5723,27 +5762,33 @@
       <member name="normal" value="0" c:identifier="GRL_WRITE_NORMAL"/>
       <member name="full" value="1" c:identifier="GRL_WRITE_FULL"/>
     </bitfield>
-    <constant name="PADDING" value="16">
+    <constant name="PADDING" value="16" c:type="GRL_PADDING">
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="PADDING_SMALL" value="8">
+    <constant name="PADDING_SMALL" value="8" c:type="GRL_PADDING_SMALL">
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="PLUGIN_LIST_VAR" value="GRL_PLUGIN_LIST">
+    <constant name="PLUGIN_LIST_VAR"
+              value="GRL_PLUGIN_LIST"
+              c:type="GRL_PLUGIN_LIST_VAR">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="PLUGIN_PATH_VAR" value="GRL_PLUGIN_PATH">
+    <constant name="PLUGIN_PATH_VAR"
+              value="GRL_PLUGIN_PATH"
+              c:type="GRL_PLUGIN_PATH_VAR">
       <type name="utf8" c:type="gchar*"/>
     </constant>
-    <constant name="PLUGIN_RANKS_VAR" value="GRL_PLUGIN_RANKS">
+    <constant name="PLUGIN_RANKS_VAR"
+              value="GRL_PLUGIN_RANKS"
+              c:type="GRL_PLUGIN_RANKS_VAR">
       <type name="utf8" c:type="gchar*"/>
     </constant>
     <record name="PluginDescriptor" c:type="GrlPluginDescriptor">
       <field name="plugin_id" writable="1">
         <type name="utf8" c:type="gchar*"/>
       </field>
-      <field name="plugin_init">
-        <callback name="plugin_init">
+      <field name="plugin_init" introspectable="0">
+        <callback name="plugin_init" introspectable="0">
           <return-value transfer-ownership="none">
             <type name="gboolean" c:type="gboolean"/>
           </return-value>
@@ -5847,7 +5892,7 @@
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="config" transfer-ownership="none">
+          <parameter name="config" transfer-ownership="full">
             <doc xml:whitespace="preserve">a configuration set</doc>
             <type name="Config" c:type="GrlConfig*"/>
           </parameter>
@@ -5893,7 +5938,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -5909,7 +5954,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList of</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="MediaPlugin" c:type="GList*"/>
+            <type name="MediaPlugin"/>
           </type>
         </return-value>
         <parameters>
@@ -5932,7 +5977,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a #GList of</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="MediaPlugin" c:type="GList*"/>
+            <type name="MediaPlugin"/>
           </type>
         </return-value>
         <parameters>
@@ -6041,7 +6086,7 @@
         <return-value transfer-ownership="none">
           <doc xml:whitespace="preserve">a #GList of</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
         <parameters>
@@ -6406,7 +6451,7 @@
         <return-value transfer-ownership="container">
           <doc xml:whitespace="preserve">a list with</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </return-value>
       </method>
@@ -6590,7 +6635,9 @@
             c:type="GrlRelatedKeysPrivate"
             disguised="1">
     </record>
-    <constant name="SOURCE_REMAINING_UNKNOWN" value="-1">
+    <constant name="SOURCE_REMAINING_UNKNOWN"
+              value="-1"
+              c:type="GRL_SOURCE_REMAINING_UNKNOWN">
       <type name="gint" c:type="gint"/>
     </constant>
     <bitfield name="SupportedOps" c:type="GrlSupportedOps">
@@ -6638,7 +6685,7 @@
                    allow-none="1">
           <doc xml:whitespace="preserve">list of arguments</doc>
           <array length="0" zero-terminated="0" c:type="gchar**">
-            <type name="utf8" c:type="gchar**"/>
+            <type name="utf8"/>
           </array>
         </parameter>
       </parameters>
@@ -6863,7 +6910,7 @@
         <parameter name="keys" transfer-ownership="none">
           <doc xml:whitespace="preserve">List of metadata keys we want to obtain.</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="KeyID"/>
           </type>
         </parameter>
         <parameter name="flags" transfer-ownership="none">
@@ -6902,7 +6949,7 @@
         <parameter name="sources" transfer-ownership="none" allow-none="1">
           <doc xml:whitespace="preserve"> a #GList of #GrlMediaSource&lt;!-- --&gt;s to search from (%NULL for all searchable sources)</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="MediaSource" c:type="GList*"/>
+            <type name="MediaSource"/>
           </type>
         </parameter>
         <parameter name="text" transfer-ownership="none">
@@ -6912,7 +6959,7 @@
         <parameter name="keys" transfer-ownership="none">
           <doc xml:whitespace="preserve">the #GList of #GrlKeyID to retrieve</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </parameter>
         <parameter name="count" transfer-ownership="none">
@@ -6947,14 +6994,14 @@
       <return-value transfer-ownership="full">
         <doc xml:whitespace="preserve">a list with #GrlMedia elements</doc>
         <type name="GLib.List" c:type="GList*">
-          <type name="Media" c:type="GList*"/>
+          <type name="Media"/>
         </type>
       </return-value>
       <parameters>
         <parameter name="sources" transfer-ownership="none" allow-none="1">
           <doc xml:whitespace="preserve"> a #GList of #GrlMediaSource&lt;!-- --&gt;s where to search from (%NULL for all available sources with search capability)</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="MediaSource" c:type="GList*"/>
+            <type name="MediaSource"/>
           </type>
         </parameter>
         <parameter name="text" transfer-ownership="none">
@@ -6964,7 +7011,7 @@
         <parameter name="keys" transfer-ownership="none">
           <doc xml:whitespace="preserve">the #GList of #GrlKeyID to retrieve</doc>
           <type name="GLib.List" c:type="GList*">
-            <type name="GObject.ParamSpec" c:type="GList*"/>
+            <type name="GObject.ParamSpec"/>
           </type>
         </parameter>
         <parameter name="count" transfer-ownership="none">
diff -Nru grilo-0.1.17/src/grl-marshal.c grilo-0.1.18/src/grl-marshal.c
--- grilo-0.1.17/src/grl-marshal.c	2011-09-05 14:14:50.000000000 +0000
+++ grilo-0.1.18/src/grl-marshal.c	2011-12-09 17:54:10.000000000 +0000
@@ -5,7 +5,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
diff -Nru grilo-0.1.17/src/grl-media-source.c grilo-0.1.18/src/grl-media-source.c
--- grilo-0.1.17/src/grl-media-source.c	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/src/grl-media-source.c	2011-12-09 13:28:03.000000000 +0000
@@ -2493,7 +2493,7 @@
  * grl_media_source_get_media_from_uri:
  * @source: a media source
  * @uri: A URI that can be used to identify a media resource
- * @keys: A list of keys to resolve
+ * @keys: (element-type GrlKeyID): A list of keys to resolve
  * @flags: the resolution mode
  * @callback: (scope notified): the user defined callback
  * @user_data: the user data to pass in the callback
@@ -2582,7 +2582,7 @@
  * grl_media_source_get_media_from_uri_sync:
  * @source: a media source
  * @uri: A URI that can be used to identify a media resource
- * @keys: A list of keys to resolve
+ * @keys: (element-type GrlKeyID): A list of keys to resolve
  * @flags: the resolution mode
  * @error: a #GError, or @NULL
  *
diff -Nru grilo-0.1.17/src/grl-metadata-source.c grilo-0.1.18/src/grl-metadata-source.c
--- grilo-0.1.17/src/grl-metadata-source.c	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/src/grl-metadata-source.c	2011-12-09 13:28:03.000000000 +0000
@@ -817,7 +817,7 @@
  * @source: a metadata source
  * @media: a media on which we want more metadata
  * @key_id: the key corresponding to a metadata we might want
- * @missing_keys: an optional originally empty list
+ * @missing_keys: (out) (transfer full) (element-type GrlKeyID): an optional originally empty list
  *
  * Checks whether @key_id may be resolved with @source for @media, so that the
  * caller can avoid calling grl_metadata_source_resolve() if it can be known in
diff -Nru grilo-0.1.17/src/grl-multiple.c grilo-0.1.18/src/grl-multiple.c
--- grilo-0.1.17/src/grl-multiple.c	2011-09-05 10:59:20.000000000 +0000
+++ grilo-0.1.18/src/grl-multiple.c	2011-12-09 13:28:03.000000000 +0000
@@ -662,7 +662,7 @@
 /**
  * grl_multiple_get_media_from_uri:
  * @uri: A URI that can be used to identify a media resource
- * @keys: List of metadata keys we want to obtain.
+ * @keys: (element-type GrlKeyID): List of metadata keys we want to obtain.
  * @flags: the operation flags
  * @callback: (scope notified): the user defined callback
  * @user_data: the user data to pass to the user callback
diff -Nru grilo-0.1.17/src/grl-plugin-registry.c grilo-0.1.18/src/grl-plugin-registry.c
--- grilo-0.1.17/src/grl-plugin-registry.c	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/src/grl-plugin-registry.c	2011-12-09 13:28:03.000000000 +0000
@@ -675,7 +675,7 @@
                                                  NULL);
     plugin_info = grl_plugin_registry_load_plugin_info (registry,
                                                         plugin->plugin_id,
-                                                        plugin_info_filename);
+                                                        plugin_info_fullpathname);
     if (!plugin_info) {
       GRL_WARNING ("Plugin '%s' does not have XML information file '%s'",
                    plugin->plugin_id,
@@ -1215,7 +1215,7 @@
 /**
  * grl_plugin_registry_add_config:
  * @registry: the registry instance
- * @config: a configuration set
+ * @config: (transfer full): a configuration set
  * @error: error return location or @NULL to ignore
  *
  * Add a configuration for a plugin/source.
diff -Nru grilo-0.1.17/src/grl-util.h grilo-0.1.18/src/grl-util.h
--- grilo-0.1.17/src/grl-util.h	2011-01-25 19:48:22.000000000 +0000
+++ grilo-0.1.18/src/grl-util.h	2011-12-09 13:28:03.000000000 +0000
@@ -38,7 +38,7 @@
                            guint *page_number,
                            guint *internal_offset);
 
-GList *grl_list_from_va (gpointer p, ...);
+GList *grl_list_from_va (gpointer p, ...) G_GNUC_NULL_TERMINATED;
 
 G_END_DECLS
 
diff -Nru grilo-0.1.17/src/Makefile.am grilo-0.1.18/src/Makefile.am
--- grilo-0.1.17/src/Makefile.am	2011-09-05 11:22:07.000000000 +0000
+++ grilo-0.1.18/src/Makefile.am	2011-12-09 13:28:03.000000000 +0000
@@ -35,6 +35,9 @@
 lib@GRL_NAME@_la_LIBADD =	\
 	$(DEPS_LIBS)
 
+lib@GRL_NAME@_la_LDFLAGS =	\
+	-no-undefined
+
 lib@GRL_NAME@_la_SOURCES =					\
 	grl-media-plugin.c grl-media-plugin-priv.h		\
 	grl-plugin-registry.c grl-plugin-registry-priv.h	\
diff -Nru grilo-0.1.17/src/Makefile.in grilo-0.1.18/src/Makefile.in
--- grilo-0.1.17/src/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/src/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -112,8 +112,8 @@
 am__v_lt_0 = --silent
 lib@GRL_NAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(lib@GRL_NAME@_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(lib@GRL_NAME@_la_CFLAGS) $(CFLAGS) \
+	$(lib@GRL_NAME@_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -184,6 +184,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -214,8 +216,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -311,6 +311,9 @@
 lib@GRL_NAME@_la_LIBADD = \
 	$(DEPS_LIBS)
 
+lib@GRL_NAME@_la_LDFLAGS = \
+	-no-undefined
+
 lib@GRL_NAME@_la_SOURCES = grl-media-plugin.c grl-media-plugin-priv.h \
 	grl-plugin-registry.c grl-plugin-registry-priv.h \
 	grl-metadata-key.c grl-metadata-key-priv.h \
diff -Nru grilo-0.1.17/tests/Makefile.in grilo-0.1.18/tests/Makefile.in
--- grilo-0.1.17/tests/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/tests/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -169,6 +169,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -199,8 +201,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/tests/python/Makefile.in grilo-0.1.18/tests/python/Makefile.in
--- grilo-0.1.17/tests/python/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/tests/python/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -95,6 +95,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -125,8 +127,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/tools/grilo-inspect/Makefile.am grilo-0.1.18/tools/grilo-inspect/Makefile.am
--- grilo-0.1.17/tools/grilo-inspect/Makefile.am	2011-03-07 09:14:06.000000000 +0000
+++ grilo-0.1.18/tools/grilo-inspect/Makefile.am	2011-12-09 13:28:03.000000000 +0000
@@ -18,7 +18,6 @@
 	-I$(top_srcdir)/src/data
 
 grl_inspect_LDADD =	\
-	-ldl -lpthread	\
 	$(DEPS_LIBS)	\
 	$(GTK_LIBS)	\
 	$(top_builddir)/src/lib@GRL_NAME@.la
diff -Nru grilo-0.1.17/tools/grilo-inspect/Makefile.in grilo-0.1.18/tools/grilo-inspect/Makefile.in
--- grilo-0.1.17/tools/grilo-inspect/Makefile.in	2011-09-05 14:14:30.000000000 +0000
+++ grilo-0.1.18/tools/grilo-inspect/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -136,6 +136,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -166,8 +168,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -262,7 +262,6 @@
 	-I$(top_srcdir)/src/data
 
 grl_inspect_LDADD = \
-	-ldl -lpthread	\
 	$(DEPS_LIBS)	\
 	$(GTK_LIBS)	\
 	$(top_builddir)/src/lib@GRL_NAME@.la
diff -Nru grilo-0.1.17/tools/grilo-test-ui/Makefile.am grilo-0.1.18/tools/grilo-test-ui/Makefile.am
--- grilo-0.1.17/tools/grilo-test-ui/Makefile.am	2011-01-25 19:48:22.000000000 +0000
+++ grilo-0.1.18/tools/grilo-test-ui/Makefile.am	2011-12-09 13:28:03.000000000 +0000
@@ -22,7 +22,6 @@
 	-I$(top_srcdir)/src/data
 
 grilo_test_ui_LDADD =		\
-	-ldl -lpthread		\
 	$(DEPS_LIBS)		\
 	$(GTU_LIBS)		\
 	$(GRL_FLICKR_LIBS)	\
diff -Nru grilo-0.1.17/tools/grilo-test-ui/Makefile.in grilo-0.1.18/tools/grilo-test-ui/Makefile.in
--- grilo-0.1.17/tools/grilo-test-ui/Makefile.in	2011-09-05 14:14:30.000000000 +0000
+++ grilo-0.1.18/tools/grilo-test-ui/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -137,6 +137,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -167,8 +169,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
@@ -267,7 +267,6 @@
 	-I$(top_srcdir)/src/data
 
 grilo_test_ui_LDADD = \
-	-ldl -lpthread		\
 	$(DEPS_LIBS)		\
 	$(GTU_LIBS)		\
 	$(GRL_FLICKR_LIBS)	\
diff -Nru grilo-0.1.17/tools/Makefile.in grilo-0.1.18/tools/Makefile.in
--- grilo-0.1.17/tools/Makefile.in	2011-09-05 14:14:29.000000000 +0000
+++ grilo-0.1.18/tools/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -140,6 +140,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -170,8 +172,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@
diff -Nru grilo-0.1.17/tools/vala/grilo-test.c grilo-0.1.18/tools/vala/grilo-test.c
--- grilo-0.1.17/tools/vala/grilo-test.c	2011-09-05 14:15:06.000000000 +0000
+++ grilo-0.1.18/tools/vala/grilo-test.c	2011-12-09 17:54:17.000000000 +0000
@@ -1,4 +1,4 @@
-/* grilo-test.c generated by valac 0.13.3, the Vala compiler
+/* grilo-test.c generated by valac 0.14.0.81-c171a, the Vala compiler
  * generated from grilo-test.vala, do not modify */
 
 
diff -Nru grilo-0.1.17/tools/vala/Makefile.in grilo-0.1.18/tools/vala/Makefile.in
--- grilo-0.1.17/tools/vala/Makefile.in	2011-09-05 14:14:30.000000000 +0000
+++ grilo-0.1.18/tools/vala/Makefile.in	2011-12-09 17:54:00.000000000 +0000
@@ -133,6 +133,8 @@
 GRL_NAME = @GRL_NAME@
 GRL_PLUGINS_DIR = @GRL_PLUGINS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTU_CFLAGS = @GTU_CFLAGS@
@@ -163,8 +165,6 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-NETCACHE_CFLAGS = @NETCACHE_CFLAGS@
-NETCACHE_LIBS = @NETCACHE_LIBS@
 NET_CFLAGS = @NET_CFLAGS@
 NET_LIBS = @NET_LIBS@
 NM = @NM@