--- a/ChangeLog	Sat Jul 09 09:30:04 2005 +0000
+++ b/ChangeLog	Sat Jul 30 19:54:02 2005 +0000
@@ -1,3 +1,10 @@
+2005-07-30  Mikael Hallendal  <micke@imendio.com>
+
+	* autogen.sh:
+	* configure.in:
+	* loudmouth/lm-connection.c: (connection_add_watch):
+	- Gtk-doc fixes.
+
 2005-07-09  Martyn Russell  <mr@gnome.org>
 
 	* loudmouth/lm-connection.c (lm_connection_set_ssl): 

--- a/autogen.sh	Sat Jul 09 09:30:04 2005 +0000
+++ b/autogen.sh	Sat Jul 30 19:54:02 2005 +0000
@@ -7,6 +7,9 @@
 have_automake=false
 need_configure_in=false
 
+have_gtk_doc=false
+want_gtk_doc=false
+
 if libtool --version < /dev/null > /dev/null 2>&1 ; then
 	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	have_libtool=true
@@ -34,6 +37,18 @@
 	exit;
 fi
 
+if grep "^GTK_DOC_CHECK" ./configure.in; then
+	want_gtk_doc=true
+fi
+
+if $want_gtk_doc; then
+	(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+	        echo;
+		echo "You need gtk-doc to build $PACKAGE";
+		echo;
+	}
+fi
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo;
 	echo "You must have automake installed to compile $PACKAGE";
@@ -54,6 +69,7 @@
 
 aclocal $ACLOCAL_FLAGS
 libtoolize --force
+gtkdocize || exit 1
 autoheader
 automake --add-missing
 autoconf

--- a/configure.in	Sat Jul 09 09:30:04 2005 +0000
+++ b/configure.in	Sat Jul 30 19:54:02 2005 +0000
@@ -147,6 +147,9 @@
 AC_SUBST(LOUDMOUTH_CFLAGS)
 AC_SUBST(LOUDMOUTH_LIBS)
 
+dnl Gtk doc
+GTK_DOC_CHECK(1.0)
+
 dnl +--------------------------------------+
 dnl | Check if we shoudl build C# bindings |-------------------
 dnl +--------------------------------------+

--- a/loudmouth/lm-connection.c	Sat Jul 09 09:30:04 2005 +0000
+++ b/loudmouth/lm-connection.c	Sat Jul 30 19:54:02 2005 +0000
@@ -556,6 +556,7 @@
 	g_source_set_callback (source, (GSourceFunc)func, user_data, NULL);
                                                                                 
 	id = g_source_attach (source, connection->context);
+
 	g_source_unref (source);
   
 	return id;