--- a/ChangeLog	Thu Aug 26 23:19:07 2004 +0000
+++ b/ChangeLog	Mon Aug 30 21:37:04 2004 +0000
@@ -1,3 +1,15 @@
+2004-08-30  Mikael Hallendal  <micke@imendio.com>
+
+	* Released 0.17.1
+	
+	* NEWS: Updated for 0.17.1
+	* configure.in: Bumped version to 0.17.1
+	* loudmouth/lm-connection.c: 
+	(connection_start_keep_alive):
+	- Don't add idle if keep alive rate is 0.
+	- Patch from Marcin Krzyżanowski <krzak@hakore.com>
+	(lm_connection_new): initialize keep alive rate
+
 2004-08-27  Mikael Hallendal  <micke@imendio.com>
 
 	* Released 0.17

--- a/NEWS	Thu Aug 26 23:19:07 2004 +0000
+++ b/NEWS	Mon Aug 30 21:37:04 2004 +0000
@@ -1,3 +1,7 @@
+Changes in 0.17.1:
+------------------
+* Fixed problem when not setting a keep alive rate.
+
 Changes in 0.17:
 ----------------
 * Compile fixes (Sjoerd Simons

--- a/configure.in	Thu Aug 26 23:19:07 2004 +0000
+++ b/configure.in	Mon Aug 30 21:37:04 2004 +0000
@@ -2,7 +2,7 @@
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(loudmouth, 0.17)
+AM_INIT_AUTOMAKE(loudmouth, 0.17.1)
 
 AM_MAINTAINER_MODE
 

--- a/loudmouth/lm-connection.c	Thu Aug 26 23:19:07 2004 +0000
+++ b/loudmouth/lm-connection.c	Mon Aug 30 21:37:04 2004 +0000
@@ -540,9 +540,12 @@
 		connection_stop_keep_alive (connection);
 	}
 
-	connection->keep_alive_id = g_timeout_add (connection->keep_alive_rate,
-						   (GSourceFunc) connection_send_keep_alive,
-						   connection);
+	if (connection->keep_alive_rate > 0) {
+		connection->keep_alive_id =
+			g_timeout_add (connection->keep_alive_rate,
+				       (GSourceFunc) connection_send_keep_alive,
+				       connection);
+	}
 }
 
 static void
@@ -1118,6 +1121,7 @@
 	connection->cancel_open       = FALSE;
 	connection->state             = LM_CONNECTION_STATE_CLOSED;
 	connection->keep_alive_id     = 0;
+	connection->keep_alive_rate   = 0;
 	
 	connection->id_handlers = g_hash_table_new_full (g_str_hash, 
 							 g_str_equal,