Merge lp:~kamstrup/couchdb-glib/couchdb-glib-gtkdoc into lp:couchdb-glib

[Mikkel Kamstrup Erlandsen]

[Mikkel Kamstrup Erlandsen (kamstrup)]

So here's my source structure overhaul as discussed on: http://groups.google.com/group/desktop-couchdb/browse_thread/thread/7bb2fe5055370140

After manually extracting my OAUTH credentials from ~/.config/desktop-couch/desktop-couchdb.ini I was able to run the unit tests successfully.

The big picture of what I've done:

 * Enable gtk-doc for all public classes

 * Shuffle the code for all public GObjects to be in <namespace>-<type>.{h,c} files

 * Make all GObject instance struct declarations private (ie. declared in the .c file)

To facilitate this in needed some changes in the source code - on top of the massive refactoring.

In couchdb.{h,c}:
 * Don't make CouchDB struct depend on whether we are configured with OAUTH
 * Move OAUTH related functionality from util.* here
 * New method couchdb_send_message() replacing send_message_and_parse() from util.*

In couchdb-document.c:
 * Change refs to internal API of CouchDB object's ->hostname to method calls
 * Change refs to internal API of CouchDBStructField ->json_object to use method call

In couchdb-struct-field.*:
 * Add method _get_json_object()

Future plans: I have a list of items I'd like to work on in the future - they might be better of discussed on the mailing list, but I put them here FYI:
 - Silent build rules
 - Single header includes
 - ? Get rid of CouchDBStructField ?
 - Make 'make check' run unit tests
 - Rename CouchDB class to CouchDBConnection
 - Add method couchdb_send_async using a SoupSessionAsync underneath
 - A .ini parser to extract OAUTH credentials from desktop-couchdb.ini, to make OAUTH "just work", like in the desktopcouch Python module

[Mikkel Kamstrup Erlandsen (kamstrup)]

I should also add that I also want to start writing some of the actual documentation once I start on the rest of my TODOs. Currently we just generate empty gtk-doc.

[Rodrigo Moya (rodrigo-moya)]

Code-wise it looks ok to me, too big a change to merge into the current tree (for karmic), so I need to make a branch on GNOME's GIT, and import that into bazaar so that that becomes the tree for karmic merge proposals.

Running now the tests...

[Mikkel Kamstrup Erlandsen (kamstrup)]

> Code-wise it looks ok to me, too big a change to merge into the current tree
> (for karmic), so I need to make a branch on GNOME's GIT, and import that into
> bazaar so that that becomes the tree for karmic merge proposals.

Yeah, agreed. So if I understand correctly, I keep it here as a Bzr tree on LP? If you would rather have a Git branch on Gnome's Git server then I can do that too.

[Rodrigo Moya (rodrigo-moya)]

> > Code-wise it looks ok to me, too big a change to merge into the current tree
> > (for karmic), so I need to make a branch on GNOME's GIT, and import that
> into
> > bazaar so that that becomes the tree for karmic merge proposals.
>
> Yeah, agreed. So if I understand correctly, I keep it here as a Bzr tree on
> LP? If you would rather have a Git branch on Gnome's Git server then I can do
> that too.

well, if you can do that, that would be better. But no need to create a GIT branch, let me first find out how to import a GIT branch into LP (so that we use that for karmic merge proposals), and then, once the GIT branch has been created (doing it now), you can just commit to GIT trunk

[lp:~kamstrup/couchdb-glib/couchdb-glib-gtkdoc]

115. By Mikkel Kamstrup Erlandsen on 2009-10-06

Update TODO

[Rodrigo Moya (rodrigo-moya)]

ok, so there is no way to import GIT branches into LP, so we will be doing manual code review (sending patches to an internal list) for the next few weeks from the gnome-2-28 branch I've created in GIT.

So, I'll approve your branch as soon as this other branch (https://code.edge.launchpad.net/~rodrigo-moya/couchdb-glib/no-revision-in-auth-header) gets accepted/merged. Just make sure your branch includes those 2 simple fixes, push it, so that the new diff is shown, and, as I said, I'll approve it (and push it to GNOME master branch, if you can't do so) as soon as the other branch lands in GNOME GIT.

[Tim Cole (tcole)]

The refcounting logic is unsafe as written; correct refcounting in the multithreaded case can be subtle and not something I would recommend attempting on your own.

(Is there a reason to use a boxed type rather than deriving from gobject, which has correct refcounting?)

The two biggest thread-related issues are with _unref; first, there is a race between the read of the refcount and acting on it, and secondly g_atomic_int_compare_and_exchange is misused here, since it can potentially fail and is supposed to be used in a retrying loop.

The requirements for refcounting here are at least a little simpler than gobject's (since I don't think you have to worry about e.g. revivification or weak/floating refs); if you were to continue with a boxed type, a correct implementation for your simple case would look something like this:

 CouchDBDatabaseInfo *
 couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo)
 {
  g_return_val_if_fail (dbinfo != NULL, NULL);
  g_return_val_if_fail (dbinfo->ref_count > 0, NULL);

  g_atomic_int_inc(&dbinfo->ref_count);

  return dbinfo;
 }

 void
 couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo)
 {
  gboolean is_zero;

  g_return_if_fail (dbinfo != NULL);
  g_return_if_fail (dbinfo->ref_count > 0);

  is_zero = g_atomic_int_dec_and_test(&dbinfo->ref_count);

  if (is_zero) {
   g_free (dbinfo->dbname);
   g_slice_free (CouchDBDatabaseInfo, dbinfo);
  }
 }

(Also, is single-space-indent acceptable from a CodingStyle point of view?)

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

> The refcounting logic is unsafe as written; correct refcounting in the
> multithreaded case can be subtle and not something I would recommend
> attempting on your own.

Note that I didn't change any of this code - I simply moved it around. I intentionally kept the branch API stable. I don't think it would be a good idea to block the merging of this branch because of this issue.

I agree however, that we could just as well use full GObjects everywhere we use custom boxed types (DatabaseInfo, DocumentInfo, and StructField as far as I recall). But we can work on this in master now that Rodrigo branched off the 0.5 series.

I have a bunch of API-breaking comments as well, but we should probably discuss such matters on the mailing list.

[lp:~kamstrup/couchdb-glib/couchdb-glib-gtkdoc]

116. By Mikkel Kamstrup Erlandsen on 2009-10-06

More items for the todo :-)

117. By Mikkel Kamstrup Erlandsen on 2009-10-06

Port bugfix in rev. 98 of lp:~rodrigo-moya/couchdb-glib/no-revision-in-auth-header to this branch

[Mikkel Kamstrup Erlandsen (kamstrup)]

> ok, so there is no way to import GIT branches into LP, so we will be doing
> manual code review (sending patches to an internal list) for the next few
> weeks from the gnome-2-28 branch I've created in GIT.
>
> So, I'll approve your branch as soon as this other branch
> (https://code.edge.launchpad.net/~rodrigo-moya/couchdb-glib/no-revision-in-
> auth-header) gets accepted/merged. Just make sure your branch includes those 2
> simple fixes, push it, so that the new diff is shown, and, as I said, I'll
> approve it (and push it to GNOME master branch, if you can't do so) as soon as
> the other branch lands in GNOME GIT.

I've ported you fixes to my branch in rev. 117: http://bazaar.launchpad.net/~kamstrup/couchdb-glib/couchdb-glib-gtkdoc/revision/117. I've have SSH keys for Gnome so I can merge it to master myself.

[Tim Cole (tcole)]

Hmm.. okay....

I'd still really like to see the refcounting fixed per my example though. That shouldn't cause any ABI/API incompatibilities.

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Well, AFAICS boxed types are used everywhere in GNOME for structs, so that's why I used them. I wouldn't mind using GObject's, but since they won't have any signal, property, or any other GObject-related feature, I think we can live with implementing the refcounting ourselves. Of course, it makes sense to use the g_atomic_* calls Tim suggests, although, yes, let's fix that once the branch has landed.

So Mikkel, please commit to GIT master

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

> So Mikkel, please commit to GIT master

Done.

(I hope I did not mess something up too badly with my bzr->git transition (using the bzr fast-import plugin)).

=== modified file 'Makefile.am'
--- Makefile.am	2009-07-20 11:27:33 +0000
+++ Makefile.am	2009-10-06 18:10:22 +0000
@@ -1,4 +1,6 @@
-SUBDIRS = couchdb-glib tests
+SUBDIRS = couchdb-glib tests doc
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 pcfiles = couchdb-glib-1.0.pc
 
@@ -8,7 +10,16 @@
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = couchdb-glib.pc.in LICENSE
+couchdbdocdir = ${datadir}/doc/couchdb-glib
+couchdbdoc_DATA =		\
+	README				\
+	LICENSE				\
+	couchdb-glib.doap	\
+	NEWS
+
+EXTRA_DIST =			\
+	couchdb-glib.pc.in	\
+	$(couchdbdoc_DATA)
 
 dist-hook:
 	git log --stat > ChangeLog.in && \
 
=== added file 'NOTES.kamstrup'
--- NOTES.kamstrup	1970-01-01 00:00:00 +0000
+++ NOTES.kamstrup	2009-10-06 18:10:22 +0000
@@ -0,0 +1,32 @@
+TODO:
+-----
+Silent build rules
+Single header includes
+? Get rid of CouchDBStructField ?
+Make 'make check' run unit tests
+Rename CouchDB class to CouchDBConnection
+Add method couchdb_send_async using a SoupSessionAsync underneath
+A .ini parser to extract OAUTH credentials from desktop-couchdb.ini
+Move couchdb_document_put() to couchdb_put(doc) in order to separate responsibilities and make CouchDB sub-classable
+Class struct padding for future ABI stability
+Ref counting in custom boxed types vs. full GObjects
+Abstract out OAUTH, in favour of custom message filters in couchdb_send_message
+
+DONE:
+-----
+
+In couchdb.*:
+ * Don't make API depend on whether we are configured with OAUTH
+ * Move OAUTH related functionality from util.* here
+ * New method couchdb_send_message() replacing send_message_and_parse() from util.*
+
+In couchdb-document.c:
+ * Change refs to internal API of CouchDB object's ->hostname to method calls
+ * Change refs to internal API of CouchDBStructField ->json_object to use method call
+
+In couchdb-struct-field.*:
+ * Add method _get_json_object()
+ 
+THOUGHTS:
+ * CouchDBStructField seems to be a superfluous wrapper of JSonObject
+ * Rename CouchDB object to CouchDBConnection
 
=== modified file 'configure.ac'
--- configure.ac	2009-09-29 12:19:40 +0000
+++ configure.ac	2009-10-06 18:10:22 +0000
@@ -43,11 +43,20 @@
 AC_SUBST(LIBCOUCHDBGLIB_REVISION)
 AC_SUBST(LIBCOUCHDBGLIB_AGE)
 
+##################################################
+# Check for gtk-doc.
+##################################################
+GTK_DOC_CHECK(1.0)
+DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
 AC_OUTPUT([
 Makefile
 couchdb-glib.pc
 couchdb-glib/Makefile
 tests/Makefile
+doc/Makefile
+doc/reference/Makefile
 ])
 
 AC_MSG_NOTICE([
 
=== modified file 'couchdb-glib/Makefile.am'
--- couchdb-glib/Makefile.am	2009-09-09 15:09:10 +0000
+++ couchdb-glib/Makefile.am	2009-10-06 18:10:22 +0000
@@ -22,21 +22,33 @@
 couchdb-marshal.c: couchdb-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --body --prefix=_couchdb_marshal > $@
 
-libcouchdb_glib_1_0_la_SOURCES =	\
-	$(MARSHAL_GENERATED)		\
+libcouchdb_glib_1_0_la_SOURCES =	\	
 	couchdb.c			\
+	couchdb.h			\
+	couchdb-database-info.c		\
+	couchdb-database-info.h		\
 	couchdb-document.c		\
+	couchdb-document.h		\
 	couchdb-document-contact.c	\
-	couchdb-types.c			\
+	couchdb-document-contact.h	\
+	couchdb-document-info.c		\
+	couchdb-document-info.h		\
+	couchdb-glib.h			\
+	couchdb-struct-field.c		\
+	couchdb-struct-field.h		\
+	couchdb-types.h			\
 	dbwatch.c			\
 	dbwatch.h			\
-	$(OAUTH_SOURCES)		\
 	utils.c				\
-	utils.h
+	utils.h				\
+	$(MARSHAL_GENERATED)		\
+	$(OAUTH_SOURCES)			
+	
 libcouchdb_glib_1_0_la_LIBADD =		\
 	$(COUCHDB_GLIB_LIBS)		\
 	$(OAUTH_LIBS)			\
 	-luuid
+
 libcouchdb_glib_1_0_la_LDFLAGS =	\
 	-version-info $(LIBCOUCHDBGLIB_CURRENT):$(LIBCOUCHDBGLIB_REVISION):$(LIBCOUCHDBGLIB_AGE)
 
 
=== added file 'couchdb-glib/couchdb-database-info.c'
--- couchdb-glib/couchdb-database-info.c	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-database-info.c	2009-10-06 18:10:22 +0000
@@ -0,0 +1,151 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "couchdb-database-info.h"
+
+struct _CouchDBDatabaseInfo {
+	gint ref_count;
+
+	char *dbname;
+	gint doc_count;
+	gint doc_del_count;
+	gint update_seq;
+	gboolean compact_running;
+	gint disk_size;
+};
+
+/*
+ * CouchDBDatabaseInfo object
+ */
+
+GType
+couchdb_database_info_get_type (void)
+{
+	static GType object_type = 0;
+
+	if (G_UNLIKELY (!object_type))
+		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDatabaseInfo"),
+							    (GBoxedCopyFunc) couchdb_database_info_ref,
+							    (GBoxedFreeFunc) couchdb_database_info_unref);
+
+	return object_type;
+}
+
+CouchDBDatabaseInfo *
+couchdb_database_info_new (const char *dbname,
+			   gint doc_count,
+			   gint doc_del_count,
+			   gint update_seq,
+			   gboolean compact_running,
+			   gint disk_size)
+{
+	CouchDBDatabaseInfo *dbinfo;
+
+	dbinfo = g_slice_new (CouchDBDatabaseInfo);
+	dbinfo->ref_count = 1;
+	dbinfo->dbname = g_strdup (dbname);
+	dbinfo->doc_count = doc_count;
+	dbinfo->doc_del_count = doc_del_count;
+	dbinfo->update_seq = update_seq;
+	dbinfo->compact_running = compact_running;
+	dbinfo->disk_size = disk_size;
+
+	return dbinfo;
+}
+
+CouchDBDatabaseInfo *
+couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, NULL);
+	g_return_val_if_fail (dbinfo->ref_count > 0, NULL);
+
+	g_atomic_int_exchange_and_add (&dbinfo->ref_count, 1);
+
+	return dbinfo;
+}
+
+void
+couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo)
+{
+	gint old_ref;
+
+	g_return_if_fail (dbinfo != NULL);
+	g_return_if_fail (dbinfo->ref_count > 0);
+
+	old_ref = g_atomic_int_get (&dbinfo->ref_count);
+	if (old_ref > 1)
+		g_atomic_int_compare_and_exchange (&dbinfo->ref_count, old_ref, old_ref - 1);
+	else {
+		g_free (dbinfo->dbname);
+		g_slice_free (CouchDBDatabaseInfo, dbinfo);
+	}
+}
+
+const char *
+couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, NULL);
+
+	return (const char *) dbinfo->dbname;
+}
+
+gint
+couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, 0);
+
+	return dbinfo->doc_count;
+}
+
+gint
+couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, 0);
+
+	return dbinfo->doc_del_count;
+}
+
+gint
+couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, 0);
+
+	return dbinfo->update_seq;
+}
+
+gboolean
+couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, FALSE);
+
+	return dbinfo->compact_running;
+}
+
+gint
+couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo)
+{
+	g_return_val_if_fail (dbinfo != NULL, 0);
+
+	return dbinfo->disk_size;
+}
+
 
=== added file 'couchdb-glib/couchdb-database-info.h'
--- couchdb-glib/couchdb-database-info.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-database-info.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+ 
+#ifndef __COUCHDB_DATABASE_INFO_H__
+#define __COUCHDB_DATABASE_INFO_H__
+ 
+#include <glib.h>
+#include <glib-object.h>
+#include "couchdb-types.h"
+
+G_BEGIN_DECLS
+
+#define COUCHDB_TYPE_DATABASE_INFO (couchdb_database_info_get_type ())
+
+/*
+ * CouchDBDatabaseInfo
+ */
+
+GType                couchdb_database_info_get_type (void);
+CouchDBDatabaseInfo *couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo);
+void                 couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo);
+
+const char          *couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo);
+gint                 couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo);
+gint                 couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo);
+gint                 couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo);
+gboolean             couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo);
+gint                 couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo);
+
+CouchDBDatabaseInfo*	couchdb_database_info_new (const char *dbname,
+						gint doc_count,
+						gint doc_del_count,
+						gint update_seq,
+						gboolean compact_running,
+						gint disk_size);
+
+G_END_DECLS
+
+#endif /* __COUCHDB_DATABASE_INFO_H__ */
 
=== modified file 'couchdb-glib/couchdb-document-contact.c'
--- couchdb-glib/couchdb-document-contact.c	2009-09-22 12:38:41 +0000
+++ couchdb-glib/couchdb-document-contact.c	2009-10-06 18:10:22 +0000
@@ -337,7 +337,7 @@
 	g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
 
 	addresses_json = json_object_get_object_member (
-		json_node_get_object (document->root_node), "email_addresses");;
+		couchdb_document_get_json_object (document), "email_addresses");;
 	if (addresses_json) {
 		json_object_foreach_member (addresses_json,
 					    (JsonObjectForeach) foreach_object_cb,
@@ -375,7 +375,7 @@
 		}
 	}
 
-	json_object_set_object_member (json_node_get_object (document->root_node), "email_addresses", addresses_json);
+	json_object_set_object_member (couchdb_document_get_json_object (document), "email_addresses", addresses_json);
 }
 
 GSList *
@@ -388,7 +388,7 @@
 	g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
 
 	phone_numbers = json_object_get_object_member (
-		json_node_get_object (document->root_node), "phone_numbers");
+		couchdb_document_get_json_object (document), "phone_numbers");
 	if (phone_numbers) {
 		json_object_foreach_member (phone_numbers,
 					    (JsonObjectForeach) foreach_object_cb,
@@ -428,7 +428,7 @@
 		}
 	}
 
-	json_object_set_object_member (json_node_get_object (document->root_node), "phone_numbers", phone_numbers);
+	json_object_set_object_member (couchdb_document_get_json_object (document), "phone_numbers", phone_numbers);
 }
 
 GSList *
@@ -441,7 +441,7 @@
 	g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
 
 	addresses = json_object_get_object_member (
-		json_node_get_object (document->root_node), "addresses");
+		couchdb_document_get_json_object (document), "addresses");
 	if (addresses) {
 		json_object_foreach_member (addresses,
 					    (JsonObjectForeach) foreach_object_cb,
@@ -489,7 +489,7 @@
 		}
 	}
 
-	json_object_set_object_member (json_node_get_object (document->root_node), "addresses", addresses);
+	json_object_set_object_member (couchdb_document_get_json_object (document), "addresses", addresses);
 }
 
 GSList *
@@ -502,7 +502,7 @@
 	g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
 
 	im_addresses = json_object_get_object_member (
-		json_node_get_object (document->root_node), "im_addresses");
+		couchdb_document_get_json_object (document), "im_addresses");
 	if (im_addresses != NULL) {
 		json_object_foreach_member (im_addresses,
 					    (JsonObjectForeach) foreach_object_cb,
@@ -542,7 +542,7 @@
 		}
 	}
 
-	json_object_set_object_member (json_node_get_object (document->root_node), "im_addresses", im_addresses_json);
+	json_object_set_object_member (couchdb_document_get_json_object (document), "im_addresses", im_addresses_json);
 }
 
 GSList *
@@ -555,7 +555,7 @@
 	g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
 
 	urls = json_object_get_object_member (
-		json_node_get_object (document->root_node), "urls");
+		couchdb_document_get_json_object (document), "urls");
 	if (urls) {
 		json_object_foreach_member (urls,
 					    (JsonObjectForeach) foreach_object_cb,
@@ -593,7 +593,7 @@
 		}
 	}
 
-	json_object_set_object_member (json_node_get_object (document->root_node), "urls", urls_json);
+	json_object_set_object_member (couchdb_document_get_json_object (document), "urls", urls_json);
 }
 
 const char *
 
=== modified file 'couchdb-glib/couchdb-document-contact.h'
--- couchdb-glib/couchdb-document-contact.h	2009-09-21 22:34:18 +0000
+++ couchdb-glib/couchdb-document-contact.h	2009-10-06 18:10:22 +0000
@@ -22,7 +22,11 @@
 #ifndef __COUCHDB_DOCUMENT_CONTACT_H__
 #define __COUCHDB_DOCUMENT_CONTACT_H__
 
-#include <couchdb-glib.h>
+#include <glib.h>
+#include "couchdb-document.h"
+#include "couchdb-struct-field.h"
+
+G_BEGIN_DECLS
 
 #define COUCHDB_RECORD_TYPE_CONTACT "http://www.freedesktop.org/wiki/Specifications/desktopcouch/contact"
 
@@ -191,4 +195,7 @@
 
 const char         *couchdb_document_contact_url_get_description (CouchDBStructField *sf);
 void                couchdb_document_contact_url_set_description (CouchDBStructField *sf, const char *description);
-#endif
+
+G_END_DECLS
+
+#endif /* __COUCHDB_DOCUMENT_CONTACT_H__ */
 
=== added file 'couchdb-glib/couchdb-document-info.c'
--- couchdb-glib/couchdb-document-info.c	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-document-info.c	2009-10-06 18:10:22 +0000
@@ -0,0 +1,107 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "couchdb-document-info.h"
+
+struct _CouchDBDocumentInfo {
+	gint ref_count;
+
+	char *docid;
+	char *revision;
+};
+
+/*
+ * CouchDBDocumentInfo object
+ */
+
+GType
+couchdb_document_info_get_type (void)
+{
+	static GType object_type = 0;
+
+	if (G_UNLIKELY (!object_type))
+		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDocumentInfo"),
+							    (GBoxedCopyFunc) couchdb_document_info_ref,
+							    (GBoxedFreeFunc) couchdb_document_info_unref);
+
+	return object_type;
+}
+
+CouchDBDocumentInfo *
+couchdb_document_info_new (const char *docid, const char *revision)
+{
+	CouchDBDocumentInfo *doc_info;
+
+	doc_info = g_slice_new (CouchDBDocumentInfo);
+	doc_info->ref_count = 1;
+	doc_info->docid = g_strdup (docid);
+	doc_info->revision = g_strdup (revision);
+
+	return doc_info;
+}
+
+CouchDBDocumentInfo *
+couchdb_document_info_ref (CouchDBDocumentInfo *doc_info)
+{
+	g_return_val_if_fail (doc_info != NULL, NULL);
+	g_return_val_if_fail (doc_info->ref_count > 0, NULL);
+
+	g_atomic_int_exchange_and_add (&doc_info->ref_count, 1);
+
+	return doc_info;
+}
+
+void
+couchdb_document_info_unref (CouchDBDocumentInfo *doc_info)
+{
+	gint old_ref;
+
+	g_return_if_fail (doc_info != NULL);
+	g_return_if_fail (doc_info->ref_count > 0);
+
+	old_ref = g_atomic_int_get (&doc_info->ref_count);
+	if (old_ref > 1)
+		g_atomic_int_compare_and_exchange (&doc_info->ref_count, old_ref, old_ref - 1);
+	else {
+		g_free (doc_info->docid);
+		g_free (doc_info->revision);
+		g_slice_free (CouchDBDocumentInfo, doc_info);
+	}
+}
+
+const char *
+couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info)
+{
+	g_return_val_if_fail (doc_info != NULL, NULL);
+
+	return (const char *) doc_info->docid;
+}
+
+const char *
+couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info)
+{
+	g_return_val_if_fail (doc_info != NULL, NULL);
+
+	return (const char *) doc_info->revision;
+}
+
 
=== added file 'couchdb-glib/couchdb-document-info.h'
--- couchdb-glib/couchdb-document-info.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-document-info.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,45 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __COUCHDB_DOCUMENT_INFO_H__
+#define __COUCHDB_DOCUMENT_INFO_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include "couchdb-types.h"
+
+G_BEGIN_DECLS
+
+#define COUCHDB_TYPE_DOCUMENT_INFO (couchdb_document_info_get_type ())
+
+GType                couchdb_document_info_get_type (void);
+CouchDBDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
+CouchDBDocumentInfo *couchdb_document_info_ref (CouchDBDocumentInfo *dbinfo);
+void                 couchdb_document_info_unref (CouchDBDocumentInfo *dbinfo);
+
+const char          *couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info);
+const char          *couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info);
+
+G_END_DECLS
+
+#endif /* __COUCHDB_DOCUMENT_INFO_H__ */
 
=== modified file 'couchdb-glib/couchdb-document.c'
--- couchdb-glib/couchdb-document.c	2009-09-09 12:30:29 +0000
+++ couchdb-glib/couchdb-document.c	2009-10-06 18:10:22 +0000
@@ -1,8 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
  *
  * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU Lesser General Public
@@ -23,9 +25,17 @@
 #include <libsoup/soup-session-async.h>
 #include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
-#include "couchdb-glib.h"
+#include "couchdb-document.h"
 #include "utils.h"
 
+struct _CouchDBDocument {
+	GObject		parent;
+
+	CouchDB		*couchdb;
+	char		*dbname;
+	JsonNode	*root_node;
+};
+
 G_DEFINE_TYPE(CouchDBDocument, couchdb_document, G_TYPE_OBJECT);
 
 static void
@@ -85,17 +95,16 @@
 	g_return_val_if_fail (docid != NULL, NULL);
 
 	encoded_docid = soup_uri_encode (docid, NULL);
-	url = g_strdup_printf ("%s/%s/%s", couchdb->hostname, dbname, encoded_docid);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_GET, url, NULL, error);
-	if (parser) {
+	url = g_strdup_printf ("%s/%s/%s", couchdb_get_hostname (couchdb), dbname, encoded_docid);
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_GET, url, NULL, parser, error)) {
 		document = g_object_new (COUCHDB_TYPE_DOCUMENT, NULL);
 		document->couchdb = couchdb;
 		document->dbname = g_strdup (dbname);
 
-		document->root_node = json_node_copy (json_parser_get_root (parser));
-		g_object_unref (G_OBJECT (parser));
+		document->root_node = json_node_copy (json_parser_get_root (parser));		
 	}
-
+	g_object_unref (G_OBJECT (parser));
 	g_free (encoded_docid);
 	g_free (url);
 
@@ -111,34 +120,34 @@
 	const char *id;
 	JsonParser *parser;
 	gboolean result = FALSE;
+	gboolean send_ok;;
 
 	g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), FALSE);
 	g_return_val_if_fail (dbname != NULL, FALSE);
 
 	id = couchdb_document_get_id (document);
 	body = couchdb_document_to_string (document);
+	parser = json_parser_new ();
 	if (id) {
 		char *encoded_docid;
 
 		encoded_docid = soup_uri_encode (id, NULL);
-		url = g_strdup_printf ("%s/%s/%s", document->couchdb->hostname, dbname, encoded_docid);
-		parser = send_message_and_parse (document->couchdb, SOUP_METHOD_PUT, url, body, error);
+		url = g_strdup_printf ("%s/%s/%s", couchdb_get_hostname (document->couchdb), dbname, encoded_docid);		
+		send_ok = couchdb_send_message (document->couchdb, SOUP_METHOD_PUT, url, body, parser, error);
 
 		g_free (encoded_docid);
 	} else {
-		url = g_strdup_printf ("%s/%s/", document->couchdb->hostname, dbname);
-		parser = send_message_and_parse (document->couchdb, SOUP_METHOD_POST, url, body, error);
+		url = g_strdup_printf ("%s/%s/", couchdb_get_hostname (document->couchdb), dbname);
+		send_ok = couchdb_send_message (document->couchdb, SOUP_METHOD_POST, url, body, parser, error);
 	}
 
-	if (parser) {
+	if (send_ok) {
 		JsonObject *object;
 
 		object = json_node_get_object (json_parser_get_root (parser));
 		couchdb_document_set_id (document, json_object_get_string_member (object, "id"));
 		couchdb_document_set_revision (document, json_object_get_string_member (object, "rev"));
 
-		g_object_unref (G_OBJECT (parser));
-
 		if (document->dbname) {
 			g_free (document->dbname);
 			document->dbname = g_strdup (dbname);
@@ -155,6 +164,7 @@
 	/* free memory */
 	g_free (url);
 	g_free (body);
+	g_object_unref (G_OBJECT (parser));
 
 	return result;
 }
@@ -174,11 +184,11 @@
 	if (!id || !revision) /* we can't remove a document without an ID and/or a REVISION */
 		return FALSE;
 
-	url = g_strdup_printf ("%s/%s/%s?rev=%s", document->couchdb->hostname, document->dbname, id, revision);
-	parser = send_message_and_parse (document->couchdb, SOUP_METHOD_DELETE, url, NULL, error);
-	if (parser) {
-		g_object_unref (G_OBJECT (parser));
-
+	url = g_strdup_printf ("%s/%s/%s?rev=%s", couchdb_get_hostname (document->couchdb), document->dbname, id, revision);
+	
+	/* We don't parse the http response, therefore the parser arg is NULL */
+	if (couchdb_send_message (document->couchdb, SOUP_METHOD_DELETE, url, NULL, NULL, error)) {
+		result = TRUE;		
 		g_signal_emit_by_name (document->couchdb, "document_deleted", document->dbname, id);
 	}
 
@@ -410,7 +420,7 @@
 
 	json_object_set_object_member (json_node_get_object (document->root_node),
 				       field,
-				       json_object_ref (value->json_object));
+				       json_object_ref (couchdb_struct_field_get_json_object (value)));
 }
 
 CouchDBStructField *
@@ -450,3 +460,11 @@
 
 	return NULL;
 }
+
+JsonObject *
+couchdb_document_get_json_object (CouchDBDocument *document)
+{
+	g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
+	
+	return json_node_get_object (document->root_node);
+}
 
=== added file 'couchdb-glib/couchdb-document.h'
--- couchdb-glib/couchdb-document.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-document.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,134 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __COUCHDB_DOCUMENT_H__
+#define __COUCHDB_DOCUMENT_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <json-glib/json-glib.h>
+#include "couchdb-types.h"
+#include "couchdb-struct-field.h"
+
+G_BEGIN_DECLS
+
+#define COUCHDB_TYPE_DOCUMENT                (couchdb_document_get_type ())
+#define COUCHDB_DOCUMENT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocument))
+#define COUCHDB_IS_DOCUMENT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE_DOCUMENT))
+#define COUCHDB_DOCUMENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
+#define COUCHDB_IS_DOCUMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE_DOCUMENT))
+#define COUCHDB_DOCUMENT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
+
+typedef struct {
+	GObjectClass parent_class;
+} CouchDBDocumentClass;
+
+
+GType            couchdb_document_get_type 		(void);
+
+CouchDBDocument *couchdb_document_new			(CouchDB         *couchdb);
+
+CouchDBDocument *couchdb_document_get			(CouchDB         *couchdb,
+	                                                 const char      *dbname,
+	                                                 const char      *docid,
+	                                                 GError          **error);
+	                                                 
+gboolean         couchdb_document_put			(CouchDBDocument *document,
+	                                                 const char      *dbname,
+	                                                 GError **error);
+	                                                 
+gboolean         couchdb_document_delete		(CouchDBDocument *document,
+	                                                 GError          **error);
+
+const char      *couchdb_document_get_id		(CouchDBDocument *document);
+
+void             couchdb_document_set_id		(CouchDBDocument *document,
+	                                                 const char      *id);
+	                                                 
+const char      *couchdb_document_get_revision		(CouchDBDocument *document);
+void             couchdb_document_set_revision		(CouchDBDocument *document,
+	                                                 const char      *revision);
+	                                                 
+const char      *couchdb_document_get_record_type	(CouchDBDocument *document);
+
+void             couchdb_document_set_record_type	(CouchDBDocument *document,
+
+	                                                 const char      *record_type);
+
+gboolean         couchdb_document_has_field		(CouchDBDocument *document,
+	                                                 const char      *field);
+	                                                 
+void             couchdb_document_remove_field		(CouchDBDocument *document,
+	                                                 const char      *field);
+
+gboolean         couchdb_document_get_boolean_field	(CouchDBDocument *document,
+	                                                 const char      *field);
+	                                                 
+void             couchdb_document_set_boolean_field	(CouchDBDocument *document,
+	                                                 const char      *field,
+	                                                 gboolean        value);
+
+gint             couchdb_document_get_int_field		(CouchDBDocument *document,
+	                                                 const char      *field);
+	                                                 
+void             couchdb_document_set_int_field		(CouchDBDocument *document,
+	                                                 const char      *field,
+	                                                 gint            value);
+
+gdouble          couchdb_document_get_double_field	(CouchDBDocument *document,
+	                                                 const char      *field);
+
+void             couchdb_document_set_double_field	(CouchDBDocument *document,
+	                                                 const char      *field,
+	                                                 gdouble         value);
+
+const char      *couchdb_document_get_string_field	(CouchDBDocument *document,
+	                                                 const char      *field);
+
+void             couchdb_document_set_string_field	(CouchDBDocument *document,
+	                                                 const char      *field,
+	                                                 const char      *value);
+
+CouchDBStructField*
+	         couchdb_document_get_struct_field	(CouchDBDocument *document,
+	                                                 const char      *field);
+
+void             couchdb_document_set_struct_field	(CouchDBDocument *document,
+	                                                 const char      *field,
+	                                                 CouchDBStructField *value);
+
+CouchDBStructField*
+	         couchdb_document_get_application_annotations
+	                                                (CouchDBDocument *document);
+	                                                
+void             couchdb_document_set_application_annotations
+	                                                (CouchDBDocument    *document,
+	                                                 CouchDBStructField *annotations);
+      
+char*		couchdb_document_to_string		(CouchDBDocument *document);
+
+JsonObject*	couchdb_document_get_json_object	(CouchDBDocument *document);
+
+G_END_DECLS
+
+#endif /* __COUCHDB_DOCUMENT_H__ */
 
=== modified file 'couchdb-glib/couchdb-glib.h'
--- couchdb-glib/couchdb-glib.h	2009-09-09 14:53:00 +0000
+++ couchdb-glib/couchdb-glib.h	2009-10-06 18:10:22 +0000
@@ -1,8 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
  *
  * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU Lesser General Public
@@ -18,115 +20,18 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+ 
 #ifndef __COUCHDB_GLIB_H__
 #define __COUCHDB_GLIB_H__
 
 #include <couchdb-types.h>
-
-#define COUCHDB_TYPE                (couchdb_get_type ())
-#define COUCHDB(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE, CouchDB))
-#define COUCHDB_IS(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE))
-#define COUCHDB_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE, CouchDBClass))
-#define COUCHDB_IS_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE))
-#define COUCHDB_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE, CouchDBClass))
-
-typedef struct _CouchDBDocument CouchDBDocument;
-
-typedef struct _CouchDB CouchDB;
-typedef struct {
-	GObjectClass parent_class;
-
-	void (* database_created) (CouchDB *couchdb, const char *dbname);
-	void (* database_deleted) (CouchDB *couchdb, const char *dbname);
-
-	void (* document_created) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
-	void (* document_updated) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
-	void (* document_deleted) (CouchDB *couchdb, const char *dbname, const char *docid);
-} CouchDBClass;
-
-GType       couchdb_get_type (void);
-CouchDB    *couchdb_new (const char *hostname);
-
-const char *couchdb_get_hostname (CouchDB *couchdb);
-
-/*
- * Databases API
- */
-
-GSList              *couchdb_list_databases (CouchDB *couchdb, GError **error);
-void                 couchdb_free_database_list (GSList *dblist);
-
-CouchDBDatabaseInfo *couchdb_get_database_info (CouchDB *couchdb, const char *dbname, GError **error);
-
-gboolean             couchdb_create_database (CouchDB *couchdb, const char *dbname, GError **error);
-gboolean             couchdb_delete_database (CouchDB *couchdb, const char *dbname, GError **error);
-
-void                 couchdb_listen_for_changes (CouchDB *couchdb, const char *dbname);
-
-gboolean             couchdb_enable_oauth (CouchDB *couchdb,
-					   const char *consumer_key,
-					   const char *consumer_secret,
-					   const char *token_key,
-					   const char *token_secret);
-void                 couchdb_disable_oauth (CouchDB *couchdb);
-
-/*
- * Documents API
- */
-
-#define COUCHDB_TYPE_DOCUMENT                (couchdb_document_get_type ())
-#define COUCHDB_DOCUMENT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocument))
-#define COUCHDB_IS_DOCUMENT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE_DOCUMENT))
-#define COUCHDB_DOCUMENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
-#define COUCHDB_IS_DOCUMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE_DOCUMENT))
-#define COUCHDB_DOCUMENT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
-
-typedef struct {
-	GObjectClass parent_class;
-} CouchDBDocumentClass;
-
-GSList          *couchdb_list_documents (CouchDB *couchdb, const char *dbname, GError **error);
-void             couchdb_free_document_list (GSList *doclist);
-
-GType            couchdb_document_get_type (void); 
-CouchDBDocument *couchdb_document_new (CouchDB *couchdb);
-CouchDBDocument *couchdb_document_get (CouchDB *couchdb,
-				       const char *dbname,
-				       const char *docid,
-				       GError **error);
-gboolean         couchdb_document_put (CouchDBDocument *document,
-				       const char *dbname,
-				       GError **error);
-gboolean         couchdb_document_delete (CouchDBDocument *document, GError **error);
-
-const char      *couchdb_document_get_id (CouchDBDocument *document);
-void             couchdb_document_set_id (CouchDBDocument *document, const char *id);
-const char      *couchdb_document_get_revision (CouchDBDocument *document);
-void             couchdb_document_set_revision (CouchDBDocument *document, const char *revision);
-const char      *couchdb_document_get_record_type (CouchDBDocument *document);
-void             couchdb_document_set_record_type (CouchDBDocument *document, const char *record_type);
-
-gboolean         couchdb_document_has_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_remove_field (CouchDBDocument *document, const char *field);
-
-gboolean         couchdb_document_get_boolean_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_set_boolean_field (CouchDBDocument *document, const char *field, gboolean value);
-gint             couchdb_document_get_int_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_set_int_field (CouchDBDocument *document, const char *field, gint value);
-gdouble          couchdb_document_get_double_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_set_double_field (CouchDBDocument *document, const char *field, gdouble value);
-const char      *couchdb_document_get_string_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_set_string_field (CouchDBDocument *document, const char *field, const char *value);
-CouchDBStructField *couchdb_document_get_struct_field (CouchDBDocument *document, const char *field);
-void             couchdb_document_set_struct_field (CouchDBDocument *document,
-						    const char *field,
-						    CouchDBStructField *value);
-
-CouchDBStructField *couchdb_document_get_application_annotations (CouchDBDocument *document);
-void             couchdb_document_set_application_annotations (CouchDBDocument *document, CouchDBStructField *annotations);
-      
-char *couchdb_document_to_string (CouchDBDocument *document);
-
-
-#endif
+#include <couchdb.h>
+#include <couchdb-database-info.h>
+#include <couchdb-document.h>
+#include <couchdb-document-contact.h>
+#include <couchdb-document-info.h>
+#include <couchdb-struct-field.h>
+
+#endif /* __COUCHDB_GLIB_H__ */
+
+
 
=== added file 'couchdb-glib/couchdb-struct-field.c'
--- couchdb-glib/couchdb-struct-field.c	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-struct-field.c	2009-10-06 18:10:22 +0000
@@ -0,0 +1,291 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "couchdb-struct-field.h"
+
+struct _CouchDBStructField {
+	gint ref_count;
+	JsonObject *json_object;
+
+	/* Extra data needed for some specific StructField's */
+	char *uuid; /* the UUID of this item */
+};
+
+GType
+couchdb_struct_field_get_type (void)
+{
+	static GType object_type = 0;
+
+	if (G_UNLIKELY (!object_type))
+		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBStructField"),
+							    (GBoxedCopyFunc) couchdb_struct_field_ref,
+							    (GBoxedFreeFunc) couchdb_struct_field_unref);
+
+	return object_type;
+}
+
+CouchDBStructField *
+couchdb_struct_field_new (void)
+{
+	CouchDBStructField *sf;
+
+	sf = g_slice_new (CouchDBStructField);
+	sf->ref_count = 1;
+	sf->json_object = json_object_new ();
+	sf->uuid = NULL;
+
+	return sf;
+}
+
+CouchDBStructField *
+couchdb_struct_field_new_from_string (const char *str)
+{
+	JsonParser *parser;
+	GError *error = NULL;
+	CouchDBStructField *sf = NULL;
+
+	g_return_val_if_fail (str != NULL, NULL);
+
+	parser = json_parser_new ();
+	if (json_parser_load_from_data (parser, str, strlen (str), &error)) {
+		JsonNode *node = json_parser_get_root (parser);
+
+		if (json_node_get_node_type (node) == JSON_NODE_OBJECT)
+			sf = couchdb_struct_field_new_from_json_object (json_node_get_object (node));
+	} else {
+		g_warning ("Could not parse string: %s", error->message);
+		g_error_free (error);
+	}
+
+	g_object_unref (G_OBJECT (parser));
+
+	return sf;
+}
+
+CouchDBStructField *
+couchdb_struct_field_new_from_json_object (JsonObject *json_object)
+{
+	CouchDBStructField *sf;
+
+	sf = g_slice_new (CouchDBStructField);
+	sf->ref_count = 1;
+	sf->json_object = json_object_ref (json_object);
+	sf->uuid = NULL;
+
+	return sf;
+}
+
+CouchDBStructField *
+couchdb_struct_field_ref (CouchDBStructField *sf)
+{
+	g_return_val_if_fail (sf != NULL, NULL);
+	g_return_val_if_fail (sf->ref_count > 0, NULL);
+
+	g_atomic_int_exchange_and_add (&sf->ref_count, 1);
+
+	return sf;
+}
+
+void
+couchdb_struct_field_unref (CouchDBStructField *sf)
+{
+	gint old_ref;
+
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (sf->ref_count > 0);
+
+	old_ref = g_atomic_int_get (&sf->ref_count);
+	if (old_ref > 1)
+		g_atomic_int_compare_and_exchange (&sf->ref_count, old_ref, old_ref - 1);
+	else {
+		json_object_unref (sf->json_object);
+		g_slice_free (CouchDBStructField, sf);
+	}
+}
+
+gboolean
+couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, FALSE);
+	g_return_val_if_fail (field != NULL, FALSE);
+
+	return json_object_has_member (sf->json_object, field);
+}
+
+void
+couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+
+	json_object_remove_member (sf->json_object, field);
+}
+
+gboolean
+couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, 0);
+	g_return_val_if_fail (field != NULL, 0);
+
+	return json_object_get_boolean_member (sf->json_object, field);
+}
+
+void
+couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+
+	json_object_set_boolean_member (sf->json_object, field, value);
+}
+
+gdouble
+couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, 0);
+	g_return_val_if_fail (field != NULL, 0);
+
+	return json_object_get_double_member (sf->json_object, field);
+}
+
+void
+couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+
+	json_object_set_double_member (sf->json_object, field, value);
+}
+
+gint
+couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, 0);
+	g_return_val_if_fail (field != NULL, 0);
+
+	return json_object_get_int_member (sf->json_object, field);
+}
+
+void
+couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+
+	json_object_set_int_member (sf->json_object, field, value);
+}
+
+const char *
+couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, NULL);
+	g_return_val_if_fail (field != NULL, NULL);
+
+	return json_object_get_string_member (sf->json_object, field);
+}
+
+void
+couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+
+	if (value)
+		json_object_set_string_member (sf->json_object, field, value);
+	else {
+		/* Remove the field if the value is NULL */
+		couchdb_struct_field_remove_field (sf, field);
+	}
+}
+
+CouchDBStructField *
+couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field)
+{
+	g_return_val_if_fail (sf != NULL, NULL);
+	g_return_val_if_fail (field != NULL, NULL);
+
+	return couchdb_struct_field_new_from_json_object (
+		json_object_get_object_member (sf->json_object, field));
+}
+
+void
+couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value)
+{
+	g_return_if_fail (sf != NULL);
+	g_return_if_fail (field != NULL);
+	g_return_if_fail (value != NULL);
+
+	json_object_set_object_member (sf->json_object, field, json_object_ref (value->json_object));
+}
+
+const char *
+couchdb_struct_field_get_uuid (CouchDBStructField *sf)
+{
+	g_return_val_if_fail (sf != NULL, NULL);
+
+	return (const char *) sf->uuid;
+}
+
+void
+couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid)
+{
+	g_return_if_fail (sf != NULL);
+
+	if (sf->uuid)
+		g_free (sf->uuid);
+
+	sf->uuid = g_strdup (uuid);
+}
+
+char *
+couchdb_struct_field_to_string (CouchDBStructField *sf)
+{
+	JsonNode *node;
+	JsonGenerator *generator;
+	gsize size;
+	char *str = NULL;
+
+	g_return_val_if_fail (sf != NULL, NULL);
+
+	node = json_node_new (JSON_NODE_OBJECT);
+	json_node_set_object (node, sf->json_object);
+
+	generator = json_generator_new ();
+	json_generator_set_root (generator, node);
+
+	str = json_generator_to_data (generator, &size);
+	g_object_unref (G_OBJECT (generator));
+
+	json_node_free (node);
+
+	return str;
+}
+
+JsonObject *
+couchdb_struct_field_get_json_object (CouchDBStructField *sf)
+{
+	g_return_val_if_fail (sf != NULL, NULL);
+	
+	return sf->json_object;
+}
+
 
=== added file 'couchdb-glib/couchdb-struct-field.h'
--- couchdb-glib/couchdb-struct-field.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-struct-field.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __COUCHDB_STRUCT_FIELD_H__
+#define __COUCHDB_STRUCT_FIELD_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <json-glib/json-glib.h>
+#include "couchdb.h"
+#include "couchdb-types.h"
+
+G_BEGIN_DECLS
+
+#define COUCHDB_TYPE_STRUCT_FIELD  (couchdb_struct_field_get_type ())
+
+GType               couchdb_struct_field_get_type (void);
+CouchDBStructField *couchdb_struct_field_new (void);
+CouchDBStructField *couchdb_struct_field_new_from_string (const char *str);
+CouchDBStructField *couchdb_struct_field_ref (CouchDBStructField *sf);
+void                couchdb_struct_field_unref (CouchDBStructField *sf);
+
+gboolean            couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field);
+
+gboolean            couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value);
+gdouble             couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value);
+gint                couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value);
+const char         *couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value);
+CouchDBStructField *couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field);
+void                couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value);
+
+const char         *couchdb_struct_field_get_uuid (CouchDBStructField *sf);
+void                couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid);
+
+char               *couchdb_struct_field_to_string (CouchDBStructField *sf);
+
+CouchDBStructField *couchdb_struct_field_new_from_json_object (JsonObject *json_object);
+
+JsonObject         *couchdb_struct_field_get_json_object (CouchDBStructField *sf);  
+
+G_END_DECLS
+
+#endif /* __COUCHDB_STRUCT_FIELD__ */
 
=== removed file 'couchdb-glib/couchdb-types.c'
--- couchdb-glib/couchdb-types.c	2009-08-19 16:43:24 +0000
+++ couchdb-glib/couchdb-types.c	1970-01-01 00:00:00 +0000
@@ -1,466 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program 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.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "couchdb-glib.h"
-#include "utils.h"
-
-/*
- * CouchDBDatabaseInfo object
- */
-
-GType
-couchdb_database_info_get_type (void)
-{
-	static GType object_type = 0;
-
-	if (G_UNLIKELY (!object_type))
-		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDatabaseInfo"),
-							    (GBoxedCopyFunc) couchdb_database_info_ref,
-							    (GBoxedFreeFunc) couchdb_database_info_unref);
-
-	return object_type;
-}
-
-CouchDBDatabaseInfo *
-couchdb_database_info_new (const char *dbname,
-			   gint doc_count,
-			   gint doc_del_count,
-			   gint update_seq,
-			   gboolean compact_running,
-			   gint disk_size)
-{
-	CouchDBDatabaseInfo *dbinfo;
-
-	dbinfo = g_slice_new (CouchDBDatabaseInfo);
-	dbinfo->ref_count = 1;
-	dbinfo->dbname = g_strdup (dbname);
-	dbinfo->doc_count = doc_count;
-	dbinfo->doc_del_count = doc_del_count;
-	dbinfo->update_seq = update_seq;
-	dbinfo->compact_running = compact_running;
-	dbinfo->disk_size = disk_size;
-
-	return dbinfo;
-}
-
-CouchDBDatabaseInfo *
-couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, NULL);
-	g_return_val_if_fail (dbinfo->ref_count > 0, NULL);
-
-	g_atomic_int_exchange_and_add (&dbinfo->ref_count, 1);
-
-	return dbinfo;
-}
-
-void
-couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo)
-{
-	gint old_ref;
-
-	g_return_if_fail (dbinfo != NULL);
-	g_return_if_fail (dbinfo->ref_count > 0);
-
-	old_ref = g_atomic_int_get (&dbinfo->ref_count);
-	if (old_ref > 1)
-		g_atomic_int_compare_and_exchange (&dbinfo->ref_count, old_ref, old_ref - 1);
-	else {
-		g_free (dbinfo->dbname);
-		g_slice_free (CouchDBDatabaseInfo, dbinfo);
-	}
-}
-
-const char *
-couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, NULL);
-
-	return (const char *) dbinfo->dbname;
-}
-
-gint
-couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, 0);
-
-	return dbinfo->doc_count;
-}
-
-gint
-couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, 0);
-
-	return dbinfo->doc_del_count;
-}
-
-gint
-couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, 0);
-
-	return dbinfo->update_seq;
-}
-
-gboolean
-couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, FALSE);
-
-	return dbinfo->compact_running;
-}
-
-gint
-couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo)
-{
-	g_return_val_if_fail (dbinfo != NULL, 0);
-
-	return dbinfo->disk_size;
-}
-
-/*
- * CouchDBDocumentInfo object
- */
-
-GType
-couchdb_document_info_get_type (void)
-{
-	static GType object_type = 0;
-
-	if (G_UNLIKELY (!object_type))
-		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDocumentInfo"),
-							    (GBoxedCopyFunc) couchdb_document_info_ref,
-							    (GBoxedFreeFunc) couchdb_document_info_unref);
-
-	return object_type;
-}
-
-CouchDBDocumentInfo *
-couchdb_document_info_new (const char *docid, const char *revision)
-{
-	CouchDBDocumentInfo *doc_info;
-
-	doc_info = g_slice_new (CouchDBDocumentInfo);
-	doc_info->ref_count = 1;
-	doc_info->docid = g_strdup (docid);
-	doc_info->revision = g_strdup (revision);
-
-	return doc_info;
-}
-
-CouchDBDocumentInfo *
-couchdb_document_info_ref (CouchDBDocumentInfo *doc_info)
-{
-	g_return_val_if_fail (doc_info != NULL, NULL);
-	g_return_val_if_fail (doc_info->ref_count > 0, NULL);
-
-	g_atomic_int_exchange_and_add (&doc_info->ref_count, 1);
-
-	return doc_info;
-}
-
-void
-couchdb_document_info_unref (CouchDBDocumentInfo *doc_info)
-{
-	gint old_ref;
-
-	g_return_if_fail (doc_info != NULL);
-	g_return_if_fail (doc_info->ref_count > 0);
-
-	old_ref = g_atomic_int_get (&doc_info->ref_count);
-	if (old_ref > 1)
-		g_atomic_int_compare_and_exchange (&doc_info->ref_count, old_ref, old_ref - 1);
-	else {
-		g_free (doc_info->docid);
-		g_free (doc_info->revision);
-		g_slice_free (CouchDBDocumentInfo, doc_info);
-	}
-}
-
-const char *
-couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info)
-{
-	g_return_val_if_fail (doc_info != NULL, NULL);
-
-	return (const char *) doc_info->docid;
-}
-
-const char *
-couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info)
-{
-	g_return_val_if_fail (doc_info != NULL, NULL);
-
-	return (const char *) doc_info->revision;
-}
-
-/*
- * CouchDBStructField
- */
-GType
-couchdb_struct_field_get_type (void)
-{
-	static GType object_type = 0;
-
-	if (G_UNLIKELY (!object_type))
-		object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBStructField"),
-							    (GBoxedCopyFunc) couchdb_struct_field_ref,
-							    (GBoxedFreeFunc) couchdb_struct_field_unref);
-
-	return object_type;
-}
-
-CouchDBStructField *
-couchdb_struct_field_new (void)
-{
-	CouchDBStructField *sf;
-
-	sf = g_slice_new (CouchDBStructField);
-	sf->ref_count = 1;
-	sf->json_object = json_object_new ();
-	sf->uuid = NULL;
-
-	return sf;
-}
-
-CouchDBStructField *
-couchdb_struct_field_new_from_string (const char *str)
-{
-	JsonParser *parser;
-	GError *error = NULL;
-	CouchDBStructField *sf = NULL;
-
-	g_return_val_if_fail (str != NULL, NULL);
-
-	parser = json_parser_new ();
-	if (json_parser_load_from_data (parser, str, strlen (str), &error)) {
-		JsonNode *node = json_parser_get_root (parser);
-
-		if (json_node_get_node_type (node) == JSON_NODE_OBJECT)
-			sf = couchdb_struct_field_new_from_json_object (json_node_get_object (node));
-	} else {
-		g_warning ("Could not parse string: %s", error->message);
-		g_error_free (error);
-	}
-
-	g_object_unref (G_OBJECT (parser));
-
-	return sf;
-}
-
-CouchDBStructField *
-couchdb_struct_field_new_from_json_object (JsonObject *json_object)
-{
-	CouchDBStructField *sf;
-
-	sf = g_slice_new (CouchDBStructField);
-	sf->ref_count = 1;
-	sf->json_object = json_object_ref (json_object);
-	sf->uuid = NULL;
-
-	return sf;
-}
-
-CouchDBStructField *
-couchdb_struct_field_ref (CouchDBStructField *sf)
-{
-	g_return_val_if_fail (sf != NULL, NULL);
-	g_return_val_if_fail (sf->ref_count > 0, NULL);
-
-	g_atomic_int_exchange_and_add (&sf->ref_count, 1);
-
-	return sf;
-}
-
-void
-couchdb_struct_field_unref (CouchDBStructField *sf)
-{
-	gint old_ref;
-
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (sf->ref_count > 0);
-
-	old_ref = g_atomic_int_get (&sf->ref_count);
-	if (old_ref > 1)
-		g_atomic_int_compare_and_exchange (&sf->ref_count, old_ref, old_ref - 1);
-	else {
-		json_object_unref (sf->json_object);
-		g_slice_free (CouchDBStructField, sf);
-	}
-}
-
-gboolean
-couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, FALSE);
-	g_return_val_if_fail (field != NULL, FALSE);
-
-	return json_object_has_member (sf->json_object, field);
-}
-
-void
-couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-
-	json_object_remove_member (sf->json_object, field);
-}
-
-gboolean
-couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, 0);
-	g_return_val_if_fail (field != NULL, 0);
-
-	return json_object_get_boolean_member (sf->json_object, field);
-}
-
-void
-couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-
-	json_object_set_boolean_member (sf->json_object, field, value);
-}
-
-gdouble
-couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, 0);
-	g_return_val_if_fail (field != NULL, 0);
-
-	return json_object_get_double_member (sf->json_object, field);
-}
-
-void
-couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-
-	json_object_set_double_member (sf->json_object, field, value);
-}
-
-gint
-couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, 0);
-	g_return_val_if_fail (field != NULL, 0);
-
-	return json_object_get_int_member (sf->json_object, field);
-}
-
-void
-couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-
-	json_object_set_int_member (sf->json_object, field, value);
-}
-
-const char *
-couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, NULL);
-	g_return_val_if_fail (field != NULL, NULL);
-
-	return json_object_get_string_member (sf->json_object, field);
-}
-
-void
-couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-
-	if (value)
-		json_object_set_string_member (sf->json_object, field, value);
-	else {
-		/* Remove the field if the value is NULL */
-		couchdb_struct_field_remove_field (sf, field);
-	}
-}
-
-CouchDBStructField *
-couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field)
-{
-	g_return_val_if_fail (sf != NULL, NULL);
-	g_return_val_if_fail (field != NULL, NULL);
-
-	return couchdb_struct_field_new_from_json_object (
-		json_object_get_object_member (sf->json_object, field));
-}
-
-void
-couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value)
-{
-	g_return_if_fail (sf != NULL);
-	g_return_if_fail (field != NULL);
-	g_return_if_fail (value != NULL);
-
-	json_object_set_object_member (sf->json_object, field, json_object_ref (value->json_object));
-}
-
-const char *
-couchdb_struct_field_get_uuid (CouchDBStructField *sf)
-{
-	g_return_val_if_fail (sf != NULL, NULL);
-
-	return (const char *) sf->uuid;
-}
-
-void
-couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid)
-{
-	g_return_if_fail (sf != NULL);
-
-	if (sf->uuid)
-		g_free (sf->uuid);
-
-	sf->uuid = g_strdup (uuid);
-}
-
-char *
-couchdb_struct_field_to_string (CouchDBStructField *sf)
-{
-	JsonNode *node;
-	JsonGenerator *generator;
-	gsize size;
-	char *str = NULL;
-
-	g_return_val_if_fail (sf != NULL, NULL);
-
-	node = json_node_new (JSON_NODE_OBJECT);
-	json_node_set_object (node, sf->json_object);
-
-	generator = json_generator_new ();
-	json_generator_set_root (generator, node);
-
-	str = json_generator_to_data (generator, &size);
-	g_object_unref (G_OBJECT (generator));
-
-	json_node_free (node);
-
-	return str;
-}
 
=== added file 'couchdb-glib/couchdb-types.h'
--- couchdb-glib/couchdb-types.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-types.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,39 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+ 
+#ifndef __COUCHDB_TYPES_H__
+#define __COUCHDB_TYPES_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _CouchDBDocument CouchDBDocument;
+typedef struct _CouchDB CouchDB;
+typedef struct _CouchDBDatabaseInfo CouchDBDatabaseInfo;
+typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
+typedef struct _CouchDBStructField CouchDBStructField;
+
+G_END_DECLS
+
+#endif /* __COUCHDB_TYPES_H__ */
 
=== removed file 'couchdb-glib/couchdb-types.h'
--- couchdb-glib/couchdb-types.h	2009-08-19 16:43:24 +0000
+++ couchdb-glib/couchdb-types.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program 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.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __COUCHDB_TYPES_H__
-#define __COUCHDB_TYPES_H__
-
-#include <glib-object.h>
-
-#define COUCHDB_TYPE_DATABASE_INFO (couchdb_database_info_get_type ())
-#define COUCHDB_TYPE_DOCUMENT_INFO (couchdb_document_info_get_type ())
-#define COUCHDB_TYPE_STRUCT_FIELD  (couchdb_struct_field_get_type ())
-
-/*
- * CouchDBDatabaseInfo
- */
-typedef struct _CouchDBDatabaseInfo CouchDBDatabaseInfo;
-
-GType                couchdb_database_info_get_type (void);
-CouchDBDatabaseInfo *couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo);
-void                 couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo);
-
-const char          *couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo);
-gint                 couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo);
-gint                 couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo);
-gint                 couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo);
-gboolean             couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo);
-gint                 couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo);
-
-/*
- * CouchDBDocumentInfo
- */
-typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
-
-GType                couchdb_document_info_get_type (void);
-CouchDBDocumentInfo *couchdb_document_info_ref (CouchDBDocumentInfo *doc_info);
-void                 couchdb_document_info_unref (CouchDBDocumentInfo *doc_info);
-
-const char          *couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info);
-const char          *couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info);
-
-/*
- * CouchDBStructField
- */
-typedef struct _CouchDBStructField CouchDBStructField;
-
-GType               couchdb_struct_field_get_type (void);
-CouchDBStructField *couchdb_struct_field_new (void);
-CouchDBStructField *couchdb_struct_field_new_from_string (const char *str);
-CouchDBStructField *couchdb_struct_field_ref (CouchDBStructField *sf);
-void                couchdb_struct_field_unref (CouchDBStructField *sf);
-
-gboolean            couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field);
-
-gboolean            couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value);
-gdouble             couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value);
-gint                couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value);
-const char         *couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value);
-CouchDBStructField *couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field);
-void                couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value);
-
-const char         *couchdb_struct_field_get_uuid (CouchDBStructField *sf);
-void                couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid);
-
-char               *couchdb_struct_field_to_string (CouchDBStructField *sf);
-
-#endif
 
=== modified file 'couchdb-glib/couchdb.c'
--- couchdb-glib/couchdb.c	2009-09-21 22:34:56 +0000
+++ couchdb-glib/couchdb.c	2009-10-06 18:10:22 +0000
@@ -1,8 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
  *
  * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU Lesser General Public
@@ -21,11 +23,32 @@
 
 #include <libsoup/soup-logger.h>
 #include <libsoup/soup-gnome.h>
-#include <json-glib/json-glib.h>
-#include "couchdb-glib.h"
+#include <libsoup/soup-message.h>
+#include "couchdb.h"
+#include "couchdb-document-info.h"
 #include "couchdb-marshal.h"
 #include "dbwatch.h"
 #include "utils.h"
+#include <string.h>
+#ifdef HAVE_OAUTH
+#include <time.h>
+#include "oauth.h"
+#endif
+
+struct _CouchDB {
+	GObject parent;
+
+	char *hostname;
+	SoupSession *http_session;
+
+	GHashTable *db_watchlist;
+
+	gboolean oauth_enabled;
+	char *oauth_consumer_key;
+	char *oauth_consumer_secret;
+	char *oauth_token_key;
+	char *oauth_token_secret;	
+};
 
 G_DEFINE_TYPE(CouchDB, couchdb, G_TYPE_OBJECT)
 
@@ -49,12 +72,14 @@
 	g_free (couchdb->hostname);
 	g_object_unref (couchdb->http_session);
 
-#ifdef HAVE_OAUTH
-	g_free (couchdb->oauth_consumer_key);
-	g_free (couchdb->oauth_consumer_secret);
-	g_free (couchdb->oauth_token_key);
-	g_free (couchdb->oauth_token_secret);
-#endif
+	if (couchdb->oauth_consumer_key)
+		g_free (couchdb->oauth_consumer_key);
+	if (couchdb->oauth_consumer_secret)
+		g_free (couchdb->oauth_consumer_secret);
+	if (couchdb->oauth_token_key)
+		g_free (couchdb->oauth_token_key);
+	if (couchdb->oauth_token_secret)
+		g_free (couchdb->oauth_token_secret);
 
 	G_OBJECT_CLASS (couchdb_parent_class)->finalize (object);
 }
@@ -135,6 +160,13 @@
 	couchdb->http_session = soup_session_sync_new_with_options (
 		SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_GNOME_FEATURES_2_26,
                 NULL);
+	
+	couchdb->oauth_consumer_key = NULL;        
+	couchdb->oauth_consumer_secret = NULL;
+	couchdb->oauth_token_key = NULL;
+	couchdb->oauth_token_secret = NULL;
+	couchdb->oauth_enabled = FALSE;
+	
 	soup_session_add_feature_by_type (couchdb->http_session, SOUP_TYPE_LOGGER);
 
 	return couchdb;
@@ -159,8 +191,8 @@
 
 	/* Prepare request */
 	url = g_strdup_printf ("%s/_all_dbs", couchdb->hostname);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_GET, url, NULL, error);
-	if (parser) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_GET, url, NULL, parser, error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
@@ -173,10 +205,9 @@
 					dblist,
 					g_strdup (json_node_get_string ((JsonNode *) sl->data)));
 			}
-		}
-
-		g_object_unref (G_OBJECT (parser));
+		}		
 	}
+	g_object_unref (G_OBJECT (parser));
 
 	/* Free memory */
 	g_free (url);
@@ -195,8 +226,8 @@
 	g_return_val_if_fail (dbname != NULL, NULL);
 
 	url = g_strdup_printf ("%s/%s/", couchdb->hostname, dbname);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_GET, url, NULL, error);
-	if (parser) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_GET, url, NULL, parser, error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
@@ -210,9 +241,8 @@
 							    json_object_get_boolean_member (object, "compact_running"),
 							    json_object_get_int_member (object, "disk_size"));
 		}
-		
-		g_object_unref (G_OBJECT (parser));
 	}
+	g_object_unref (G_OBJECT (parser));
 
 	return result;
 }
@@ -228,18 +258,17 @@
 	g_return_val_if_fail (dbname != NULL, FALSE);
 
 	url = g_strdup_printf ("%s/%s/", couchdb->hostname, dbname);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_PUT, url, NULL, error);
-	if (parser) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_PUT, url, NULL, parser, error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
 		if (json_node_get_node_type (root_node) == JSON_NODE_OBJECT)
 			result = json_object_get_boolean_member (
-				json_node_get_object (root_node), "ok");
-
-		g_object_unref (G_OBJECT (parser));
+				json_node_get_object (root_node), "ok");		
 	}
-
+	
+	g_object_unref (G_OBJECT (parser));
 	g_free (url);
 
 	if (result)
@@ -259,17 +288,16 @@
 	g_return_val_if_fail (dbname != NULL, FALSE);
 
 	url = g_strdup_printf ("%s/%s/", couchdb->hostname, dbname);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_DELETE, url, NULL, error);
-	if (parser) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_DELETE, url, NULL, parser, error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
 		if (json_node_get_node_type (root_node) == JSON_NODE_OBJECT)
 			result = json_object_get_boolean_member (
-				json_node_get_object (root_node), "ok");
-
-		g_object_unref (G_OBJECT (parser));
+				json_node_get_object (root_node), "ok");		
 	}
+	g_object_unref (G_OBJECT (parser));
 
 	g_free (url);
 
@@ -304,8 +332,8 @@
 	g_return_val_if_fail (dbname != NULL, NULL);
 
 	url = g_strdup_printf ("%s/%s/_all_docs", couchdb->hostname, dbname);
-	parser = send_message_and_parse (couchdb, SOUP_METHOD_GET, url, NULL, error);
-	if (parser) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (couchdb, SOUP_METHOD_GET, url, NULL, parser, error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
@@ -332,7 +360,7 @@
 			}
 		}
 	}
-
+	g_object_unref (G_OBJECT (parser));
 	g_free (url);
 
 	return doclist;
@@ -423,3 +451,158 @@
 	return FALSE;
 #endif
 }
+
+gboolean
+couchdb_is_oauth_enabled (CouchDB *couchdb)
+{
+	g_return_val_if_fail (COUCHDB_IS (couchdb), FALSE);
+	
+	return couchdb->oauth_enabled;
+}
+
+
+static void
+couchdb_add_oauth_signature (CouchDB *couchdb, SoupMessage *http_message, const char *method, const char *url)
+{
+	/* This method is a no-op if we are configured without OAUTH */
+#ifdef HAVE_OAUTH
+	char *signed_url;
+
+	signed_url = oauth_sign_url2 (url, NULL, OA_HMAC, method,
+				      couchdb->oauth_consumer_key,
+				      couchdb->oauth_consumer_secret,
+				      couchdb->oauth_token_key,
+				      couchdb->oauth_token_secret);
+	if (signed_url != NULL) {
+		char **parsed_url;
+		GString *header = NULL;
+
+		/* Get the OAuth signature from the signed URL */
+		parsed_url = g_strsplit (signed_url, "?", 2);
+		if (parsed_url != NULL) {
+			gchar **params;
+			int i;
+
+			params = g_strsplit (parsed_url[1], "&", 0);
+#ifdef DEBUG_OAUTH
+			g_debug ("Parsing %s", parsed_url[1]);
+#endif
+			for (i = 0; params[i] != NULL; i++) {
+				gchar **url_param;
+				
+				/* Don't include non-OAuth URL parameters in OAuth header */
+				if (!g_str_has_prefix (params[i], "oauth_"))
+					continue;
+				
+#ifdef DEBUG_OAUTH
+				g_debug ("%s\n", params[i]);
+#endif
+				url_param = g_strsplit (params[i], "=", 2);
+				if (url_param == NULL)
+					continue;
+
+				if (header != NULL)
+					header = g_string_append (header, ", ");
+				else
+					header = g_string_new ("OAuth ");
+
+				header = g_string_append (header, url_param[0]);
+				header = g_string_append (header, "=\"");
+				header = g_string_append (header, url_param[1]);
+				header = g_string_append (header, "\"");
+
+				g_strfreev (url_param);
+			}
+
+			if (params)
+				g_strfreev (params);
+
+			g_strfreev (parsed_url);
+		}
+
+		if (header != NULL) {
+			soup_message_headers_append (http_message->request_headers, "Authorization", header->str);
+
+			g_string_free (header, TRUE);
+		}
+
+		free (signed_url);
+	}
+#endif /* HAVE_OAUTH */
+}
+
+static gboolean
+parse_json_response (CouchDB *couchdb, JsonParser *json_parser, SoupMessage *http_message, GError **error)
+{
+	SoupBuffer *buffer;
+        GString *str = NULL;
+        goffset offset = 0;
+        gboolean success = TRUE;
+	
+	while ((buffer = soup_message_body_get_chunk (http_message->response_body, offset))) {
+		if (!str)
+                        str = g_string_new ("");
+                g_string_append_len (str, buffer->data, buffer->length);
+
+                offset += buffer->length;
+                soup_buffer_free (buffer);
+	}
+
+	if (str && str->len > 0) {
+		g_debug ("Response body: %s", str->str);
+		if (!json_parser_load_from_data (json_parser,
+						 (const gchar *) str->str,
+						 str->len,
+						 error)) {
+			g_object_unref (G_OBJECT (json_parser));
+			g_set_error (error, COUCHDB_ERROR, -1, "Invalid JSON response");
+			success = FALSE;
+		}
+
+		g_string_free (str, TRUE);
+	}
+
+	return success;
+}
+
+static void
+debug_print_headers (const char *name, const char *value, gpointer user_data)
+{
+	g_print ("\t%s: %s\n", name, value);
+}
+
+gboolean
+couchdb_send_message (CouchDB *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error)
+{
+	SoupMessage *http_message;
+	guint status;
+	
+	g_return_val_if_fail (COUCHDB_IS (couchdb), FALSE);
+	g_return_val_if_fail (method != NULL, FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+	
+	http_message = soup_message_new (method, url);
+	if (body != NULL) {
+		soup_message_set_request (http_message, "application/json", SOUP_MEMORY_COPY,
+					  body, strlen (body));
+	}
+
+	if (couchdb_is_oauth_enabled (couchdb))
+		couchdb_add_oauth_signature (couchdb, http_message, method, url);
+	
+
+	g_debug ("Sending %s to %s... with headers\n: ", method, url);
+	soup_message_headers_foreach (http_message->request_headers,
+				      (SoupMessageHeadersForeachFunc) debug_print_headers,
+				      NULL);
+
+	status = soup_session_send_message (couchdb->http_session, http_message);
+	if (SOUP_STATUS_IS_SUCCESSFUL (status)) {
+		if (parser != NULL)
+		       	parse_json_response (couchdb, parser, http_message, error);
+	       	return TRUE;
+	} else {
+		g_set_error (error, COUCHDB_ERROR, status, "%s", http_message->reason_phrase);
+		return FALSE;
+	}
+}
 
=== added file 'couchdb-glib/couchdb.h'
--- couchdb-glib/couchdb.h	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb.h	2009-10-06 18:10:22 +0000
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *               2009 Mikkel Kamstrup Erlandsen
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *          Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __COUCHDB_H__
+#define __COUCHDB_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <json-glib/json-glib.h>
+#include "couchdb-types.h"
+#include "couchdb-database-info.h"
+
+G_BEGIN_DECLS
+
+#define COUCHDB_TYPE                (couchdb_get_type ())
+#define COUCHDB(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE, CouchDB))
+#define COUCHDB_IS(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE))
+#define COUCHDB_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE, CouchDBClass))
+#define COUCHDB_IS_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE))
+#define COUCHDB_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE, CouchDBClass))
+
+typedef struct {
+	GObjectClass parent_class;
+
+	void (* database_created) (CouchDB *couchdb, const char *dbname);
+	void (* database_deleted) (CouchDB *couchdb, const char *dbname);
+
+	void (* document_created) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
+	void (* document_updated) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
+	void (* document_deleted) (CouchDB *couchdb, const char *dbname, const char *docid);
+} CouchDBClass;
+
+GType       couchdb_get_type (void);
+CouchDB    *couchdb_new (const char *hostname);
+
+const char *couchdb_get_hostname (CouchDB *couchdb);
+
+GSList              *couchdb_list_databases (CouchDB *couchdb, GError **error);
+void                 couchdb_free_database_list (GSList *dblist);
+
+CouchDBDatabaseInfo *couchdb_get_database_info (CouchDB *couchdb, const char *dbname, GError **error);
+
+gboolean             couchdb_create_database (CouchDB *couchdb, const char *dbname, GError **error);
+gboolean             couchdb_delete_database (CouchDB *couchdb, const char *dbname, GError **error);
+
+void                 couchdb_listen_for_changes (CouchDB *couchdb, const char *dbname);
+
+gboolean             couchdb_enable_oauth (CouchDB *couchdb,
+					   const char *consumer_key,
+					   const char *consumer_secret,
+					   const char *token_key,
+					   const char *token_secret);
+void                 couchdb_disable_oauth (CouchDB *couchdb);
+
+gboolean             couchdb_is_oauth_enabled (CouchDB *couchdb);
+
+gboolean             couchdb_send_message (CouchDB *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error);
+
+GSList          *couchdb_list_documents (CouchDB *couchdb, const char *dbname, GError **error);
+void             couchdb_free_document_list (GSList *doclist);
+
+G_END_DECLS
+
+#endif /* __COUCHDB_H__ */
 
=== modified file 'couchdb-glib/dbwatch.c'
--- couchdb-glib/dbwatch.c	2009-08-31 15:48:46 +0000
+++ couchdb-glib/dbwatch.c	2009-10-06 18:10:22 +0000
@@ -19,7 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "couchdb-glib.h"
+#include <libsoup/soup-method.h>
+#include "couchdb-document.h"
 #include "dbwatch.h"
 #include "utils.h"
 
@@ -78,11 +79,11 @@
 	DBWatch *watch = (DBWatch *) user_data;
 
 	url = g_strdup_printf ("%s/%s/_changes?since=%d",
-			       watch->couchdb->hostname,
+			       couchdb_get_hostname (watch->couchdb),
 			       watch->dbname,
 			       watch->last_update_seq);
-	parser = send_message_and_parse (watch->couchdb, SOUP_METHOD_GET, url, NULL, &error);
-	if (parser != NULL) {
+	parser = json_parser_new ();
+	if (couchdb_send_message (watch->couchdb, SOUP_METHOD_GET, url, NULL, parser, &error)) {
 		JsonNode *root_node;
 
 		root_node = json_parser_get_root (parser);
@@ -102,12 +103,11 @@
 
 			if (json_object_has_member (root_object, "last_seq"))
 				watch->last_update_seq = json_object_get_int_member (root_object, "last_seq");
-		}
-
-		g_object_unref (G_OBJECT (parser));
+		}		
 	}
 
 	/* Free memory */
+	g_object_unref (G_OBJECT (parser));
 	g_free (url);
 }
 
 
=== modified file 'couchdb-glib/dbwatch.h'
--- couchdb-glib/dbwatch.h	2009-08-31 15:48:46 +0000
+++ couchdb-glib/dbwatch.h	2009-10-06 18:10:22 +0000
@@ -22,6 +22,8 @@
 #ifndef __DBWATCH_H__
 #define __DBWATCH_H__
 
+#include <glib.h>
+#include "couchdb.h"
 #include "utils.h"
 
 typedef struct {
@@ -34,4 +36,4 @@
 DBWatch *dbwatch_new (CouchDB *couchdb, const gchar *dbname, gint update_seq);
 void     dbwatch_free (DBWatch *watch);
 
-#endif
+#endif /* __DBWATCH_H__ */
 
=== modified file 'couchdb-glib/utils.c'
--- couchdb-glib/utils.c	2009-09-09 14:53:00 +0000
+++ couchdb-glib/utils.c	2009-10-06 18:10:22 +0000
@@ -24,46 +24,6 @@
 #include <libsoup/soup-session-async.h>
 #include "couchdb-glib.h"
 #include "utils.h"
-#ifdef HAVE_OAUTH
-#include <time.h>
-#include "oauth.h"
-#endif
-
-static JsonParser *
-parse_json_response (SoupMessage *http_message, GError **error)
-{
-	SoupBuffer *buffer;
-        GString *str = NULL;
-        goffset offset = 0;
-	JsonParser *json_parser = NULL;
-
-	while ((buffer = soup_message_body_get_chunk (http_message->response_body, offset))) {
-		if (!str)
-                        str = g_string_new ("");
-                g_string_append_len (str, buffer->data, buffer->length);
-
-                offset += buffer->length;
-                soup_buffer_free (buffer);
-	}
-
-	if (str && str->len > 0) {
-		g_debug ("Response body: %s", str->str);
-		json_parser = json_parser_new ();
-		if (!json_parser_load_from_data (json_parser,
-						 (const gchar *) str->str,
-						 str->len,
-						 error)) {
-			g_object_unref (G_OBJECT (json_parser));
-			json_parser = NULL;
-
-			g_set_error (error, COUCHDB_ERROR, -1, "Invalid JSON response");
-		}
-
-		g_string_free (str, TRUE);
-	}
-
-	return json_parser;
-}
 
 GQuark
 couchdb_error_quark (void)
@@ -76,110 +36,6 @@
 	return error;
 }
 
-#ifdef HAVE_OAUTH
-static void
-add_oauth_signature (CouchDB *couchdb, SoupMessage *http_message, const char *method, const char *url)
-{
-	char *signed_url;
-
-	signed_url = oauth_sign_url2 (url, NULL, OA_HMAC, method,
-				      couchdb->oauth_consumer_key,
-				      couchdb->oauth_consumer_secret,
-				      couchdb->oauth_token_key,
-				      couchdb->oauth_token_secret);
-	if (signed_url != NULL) {
-		char **parsed_url;
-		GString *header = NULL;
-
-		/* Get the OAuth signature from the signed URL */
-		parsed_url = g_strsplit (signed_url, "?", 2);
-		if (parsed_url != NULL) {
-			gchar **params;
-			int i;
-
-			params = g_strsplit (parsed_url[1], "&", 0);
-#ifdef DEBUG_OAUTH
-			g_debug ("Parsing %s", parsed_url[1]);
-#endif
-			for (i = 0; params[i] != NULL; i++) {
-				gchar **url_param;
-
-#ifdef DEBUG_OAUTH
-				g_debug ("%s\n", params[i]);
-#endif
-				url_param = g_strsplit (params[i], "=", 2);
-				if (url_param == NULL)
-					continue;
-
-				if (header != NULL)
-					header = g_string_append (header, ", ");
-				else
-					header = g_string_new ("OAuth ");
-
-				header = g_string_append (header, url_param[0]);
-				header = g_string_append (header, "=\"");
-				header = g_string_append (header, url_param[1]);
-				header = g_string_append (header, "\"");
-
-				g_strfreev (url_param);
-			}
-
-			if (params)
-				g_strfreev (params);
-
-			g_strfreev (parsed_url);
-		}
-
-		if (header != NULL) {
-			soup_message_headers_append (http_message->request_headers, "Authorization", header->str);
-
-			g_string_free (header, TRUE);
-		}
-
-		free (signed_url);
-	}
-}
-#endif
-
-static void
-debug_print_headers (const char *name, const char *value, gpointer user_data)
-{
-	g_print ("\t%s: %s\n", name, value);
-}
-
-JsonParser *
-send_message_and_parse (CouchDB *couchdb, const char *method, const char *url, const char *body, GError **error)
-{
-	SoupMessage *http_message;
-	guint status;
-	JsonParser *parser = NULL;
-
-	http_message = soup_message_new (method, url);
-	if (body != NULL) {
-		soup_message_set_request (http_message, "application/json", SOUP_MEMORY_COPY,
-					  body, strlen (body));
-	}
-
-#ifdef HAVE_OAUTH
-	if (couchdb->oauth_enabled)
-		add_oauth_signature (couchdb, http_message, method, url);
-#endif
-
-	g_debug ("Sending %s to %s... with headers\n: ", method, url);
-	soup_message_headers_foreach (http_message->request_headers,
-				      (SoupMessageHeadersForeachFunc) debug_print_headers,
-				      NULL);
-
-	status = soup_session_send_message (couchdb->http_session, http_message);
-	if (SOUP_STATUS_IS_SUCCESSFUL (status)) {
-	       	parser = parse_json_response (http_message, error);
-	} else {
-		g_set_error (error, COUCHDB_ERROR, status, "%s", http_message->reason_phrase);
-	}
-
-	return parser;
-}
-
 char *
 generate_uuid (void)
 {
 
=== modified file 'couchdb-glib/utils.h'
--- couchdb-glib/utils.h	2009-09-09 14:53:00 +0000
+++ couchdb-glib/utils.h	2009-10-06 18:10:22 +0000
@@ -22,85 +22,14 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
+#include <glib.h>
+#include <json-glib/json-glib.h>
 #include "config.h"
-#include <libsoup/soup-session-async.h>
-#include <json-glib/json-glib.h>
-
-struct _CouchDB {
-	GObject parent;
-
-	char *hostname;
-	SoupSession *http_session;
-
-	GHashTable *db_watchlist;
-
-#ifdef HAVE_OAUTH
-	gboolean oauth_enabled;
-	char *oauth_consumer_key;
-	char *oauth_consumer_secret;
-	char *oauth_token_key;
-	char *oauth_token_secret;
-#endif
-};
-
-struct _CouchDBDocument {
-	GObject parent;
-
-	CouchDB *couchdb;
-	char *dbname;
-	JsonNode *root_node;
-};
-
-struct _CouchDBDatabaseInfo {
-	gint ref_count;
-
-	char *dbname;
-	gint doc_count;
-	gint doc_del_count;
-	gint update_seq;
-	gboolean compact_running;
-	gint disk_size;
-};
-
-CouchDBDatabaseInfo *couchdb_database_info_new (const char *dbname,
-						gint doc_count,
-						gint doc_del_count,
-						gint update_seq,
-						gboolean compact_running,
-						gint disk_size);
-
-struct _CouchDBDocumentInfo {
-	gint ref_count;
-
-	char *docid;
-	char *revision;
-};
-
-CouchDBDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
-
-struct _CouchDBStructField {
-	gint ref_count;
-	JsonObject *json_object;
-
-	/* Extra data needed for some specific StructField's */
-	char *uuid; /* the UUID of this item */
-};
-
-CouchDBStructField *couchdb_struct_field_new_from_json_object (JsonObject *json_object);
-
-/*
- * Utility functions
- */
+#include "couchdb.h"
 
 #define COUCHDB_ERROR couchdb_error_quark()
 GQuark      couchdb_error_quark (void);
 
-JsonParser *send_message_and_parse (CouchDB *couchdb,
-				    const char *method,
-				    const char *url,
-				    const char *body,
-				    GError **error);
-
-char *generate_uuid (void);
+char* generate_uuid (void);
 
 #endif
 
=== modified file 'debian/control'
--- debian/control	2009-08-11 15:04:39 +0000
+++ debian/control	2009-10-06 18:10:22 +0000
@@ -27,3 +27,15 @@
  Ubuntu One.
  .
  This package contains the development files.
+ 
+Package: libcouchdb-glib-doc
+Section: doc
+Architecture: any
+Depends: ${misc:Depends}
+Description: API documentation for GLib-based API for CouchDB
+ CouchDB-GLib is a GLib-based API to access CouchDB servers
+ (http://couchdb.apache.org), a replication/synchronization
+ database of JSON documents, used in online services like
+ Ubuntu One.
+ .
+ This package contains the API documentation for the couchdb-glib library
 
=== added file 'debian/libcouchdb-glib-doc.install'
--- debian/libcouchdb-glib-doc.install	1970-01-01 00:00:00 +0000
+++ debian/libcouchdb-glib-doc.install	2009-10-06 18:10:22 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/gtk-doc
 
=== modified file 'debian/rules'
--- debian/rules	2009-07-20 12:11:54 +0000
+++ debian/rules	2009-10-06 18:10:22 +0000
@@ -2,3 +2,5 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
 
=== added directory 'doc'
=== added file 'doc/Makefile.am'
--- doc/Makefile.am	1970-01-01 00:00:00 +0000
+++ doc/Makefile.am	2009-10-06 18:10:22 +0000
@@ -0,0 +1,4 @@
+# Include to make 'make check' work with GTest
+#include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = reference
 
=== added directory 'doc/reference'
=== added file 'doc/reference/Makefile.am'
--- doc/reference/Makefile.am	1970-01-01 00:00:00 +0000
+++ doc/reference/Makefile.am	2009-10-06 18:10:22 +0000
@@ -0,0 +1,67 @@
+## Process this file with automake to produce Makefile.in
+
+# Dummy targets we need to make distcheck and check pass
+test test-report perf-report full-report:
+	## Ignore
+
+# automake requirements
+AUTOMAKE_OPTIONS = 1.7
+
+# The name of the module
+DOC_MODULE=couchdb-glib
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+
+# The directory containing the source code. Relative to $(srcdir).
+DOC_SOURCE_DIR=../..
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# Fx --rebuild-types --rebuild-sections
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files=trio
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+FIXXREF_OPTIONS=
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+HFILE_GLOB=$(top_srcdir)/couchdb-glib/couchdb*.h
+CFILE_GLOB=$(top_srcdir)/couchdb-glib/couchdb*.c
+
+# Header files to ignore when scanning.
+IGNORE_HFILES=		\
+	xmalloc.h		\
+	dbwatch.h		\
+	oauth.h			\
+	utils.h			\
+	xmalloc.h		\
+	config.h
+
+# Images to copy into HTML directory.
+HTML_IMAGES=
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+content_files = 
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+INCLUDES=-I$(top_srcdir)/couchdb-glib   \
+         $(COUCHDB_GLIB_CFLAGS)
+
+GTKDOC_LIBS=$(COUCHDB_GLIB_LIBS) \
+            $(top_builddir)/couchdb-glib/libcouchdb-glib-1.0.la
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	couchdb-glib.types        \
+	couchdb-glib-docs.sgml
+#	couchdb-glib-sections.txt
+
 
=== added file 'doc/reference/couchdb-glib-docs.sgml'
--- doc/reference/couchdb-glib-docs.sgml	1970-01-01 00:00:00 +0000
+++ doc/reference/couchdb-glib-docs.sgml	2009-10-06 18:10:22 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>Reference Manual for CouchDB GLib Bindings</title>
+  </bookinfo>
+
+  <chapter>
+    <title>Core API</title>
+    <xi:include href="xml/couchdb.xml"/>
+    <xi:include href="xml/couchdb-document.xml"/>
+    <xi:include href="xml/couchdb-document-contact.xml"/>
+    <xi:include href="xml/couchdb-document-info.xml"/>
+    <xi:include href="xml/couchdb-database-info.xml"/>
+    <xi:include href="xml/couchdb-struct-field.xml"/>
+  </chapter>
+
+</book>
 
=== added file 'doc/reference/couchdb-glib.types'
--- doc/reference/couchdb-glib.types	1970-01-01 00:00:00 +0000
+++ doc/reference/couchdb-glib.types	2009-10-06 18:10:22 +0000
@@ -0,0 +1,6 @@
+couchdb_get_type
+couchdb_database_info_get_type
+couchdb_document_get_type
+couchdb_document_info_get_type
+couchdb_struct_field_get_type
+
 
=== modified file 'tests/test-couchdb-glib.c'
--- tests/test-couchdb-glib.c	2009-08-31 15:48:46 +0000
+++ tests/test-couchdb-glib.c	2009-10-06 18:10:22 +0000
@@ -31,7 +31,12 @@
 	GSList *dblist;
 
 	dblist = couchdb_list_databases (couchdb, &error);
-	g_assert (error == NULL);
+	if (error != NULL) {
+		/* A critical will abort the test case */
+		g_critical ("Error listing databases: %s", error->message);
+		g_error_free (error);
+		error = NULL;		
+	}
 
 	while (dblist != NULL) {
 		CouchDBDatabaseInfo *dbinfo;
@@ -112,7 +117,10 @@
 
 	/* Create database */
 	couchdb_create_database (couchdb, dbname, &error);
-	g_assert (error == NULL);
+	if (error) {
+		g_critical ("Error creating database '%s': %s", dbname, error->message);
+		g_error_free (error);
+	}
 
 	couchdb_listen_for_changes (couchdb, dbname);
 
@@ -184,7 +192,9 @@
 	g_test_init (&argc, &argv, NULL);
 
 	/* Initialize data needed for all tests */
-	couchdb = couchdb_new (NULL);
+	couchdb =  argc > 1 ? couchdb_new (argv[1]) : couchdb_new (NULL);
+	g_printf ("Connecting to CouchDB at %s\n", couchdb_get_hostname (couchdb));
+	
 	if (!couchdb) {
 		g_print ("Could not create CouchDB object\n");
 		return -1;
 
=== modified file 'tests/test-list-databases.c'
--- tests/test-list-databases.c	2009-07-27 21:52:04 +0000
+++ tests/test-list-databases.c	2009-10-06 18:10:22 +0000
@@ -32,14 +32,21 @@
 	g_type_init ();
 	g_thread_init (NULL);
 
-	/* initialize CouchDB */
-	couchdb = couchdb_new (NULL);
+	/* Initialize CouchDB */
+	couchdb =  argc > 1 ? couchdb_new (argv[1]) : couchdb_new (NULL);
+	g_printf ("Connecting to CouchDB at %s\n", couchdb_get_hostname (couchdb));
+	
 	if (!couchdb) {
 		g_print ("Could not create CouchDB object\n");
 		return -1;
 	}
 
 	dblist = couchdb_list_databases (couchdb, &error);
+	if (error != NULL) {
+		g_critical ("Error listing databases: %s", error->message);
+		g_error_free (error);
+	}
+	
 	for (sl = dblist; sl != NULL; sl = sl->next) {
 		CouchDBDatabaseInfo *dbinfo;
 		GSList *doclist;