--- a/ChangeLog	Thu Sep 21 11:31:39 2006 +0000
+++ b/ChangeLog	Thu Sep 21 11:45:40 2006 +0000
@@ -1,3 +1,11 @@
+2006-09-21  Mikael Hallendal  <micke@imendio.com>
+
+	* loudmouth/lm-connection.c: (_lm_connection_succeeded),
+	(_lm_connection_failed_with_error), (connection_buffered_write_cb),
+	(connection_do_close):
+	- Check that we find a resource before trying to destroy it.
+	- Fixes warning described in LM-50.
+
 2006-09-21  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-connection.c: (connection_connect_cb):

--- a/loudmouth/lm-connection.c	Thu Sep 21 11:31:39 2006 +0000
+++ b/loudmouth/lm-connection.c	Thu Sep 21 11:45:40 2006 +0000
@@ -341,8 +341,13 @@
 	connection = connect_data->connection;
 	
 	if (connection->io_watch_connect != 0) {
-		g_source_destroy (g_main_context_find_source_by_id(connection->context,
-								   connection->io_watch_connect));
+		GSource *source;
+
+		source = g_main_context_find_source_by_id (connection->context,
+							   connection->io_watch_connect);
+		if (source) {
+			g_source_destroy (source);
+		}
 		connection->io_watch_connect = 0;
 	}
 
@@ -467,8 +472,14 @@
 	connect_data->current_addr = connect_data->current_addr->ai_next;
 	
 	if (connection->io_watch_connect != 0) {
-		g_source_destroy (g_main_context_find_source_by_id(connection->context,
-								   connection->io_watch_connect));
+		GSource *source;
+
+		source = g_main_context_find_source_by_id (connection->context,
+							   connection->io_watch_connect);
+		if (source) {
+			g_source_destroy (source);
+		}
+
 		connection->io_watch_connect = 0;
 	}
 
@@ -775,8 +786,14 @@
 		lm_verbose ("Output buffer is empty, going back to normal output\n");
 
 		if (connection->io_watch_out != 0) {
-			g_source_destroy (g_main_context_find_source_by_id (
-						  connection->context, connection->io_watch_out));
+			GSource *source;
+
+			source = g_main_context_find_source_by_id (connection->context, 
+								   connection->io_watch_out);
+			if (source) {
+				g_source_destroy (source);
+			}
+
 			connection->io_watch_out = 0;
 		}
 
@@ -924,36 +941,62 @@
 static void
 connection_do_close (LmConnection *connection)
 {
+	GSource *source;
+
 	connection_stop_keep_alive (connection);
 
 	if (connection->io_channel) {
 		if (connection->io_watch_in != 0) {
-			g_source_destroy (g_main_context_find_source_by_id (
-						  connection->context, connection->io_watch_in));
+			source = g_main_context_find_source_by_id (connection->context,
+								   connection->io_watch_in);
+			if (source) {
+				g_source_destroy (source);
+			}
+			
 			connection->io_watch_in = 0;
 		}
 
 		if (connection->io_watch_err != 0) {
-			g_source_destroy (g_main_context_find_source_by_id (
-						  connection->context, connection->io_watch_err));
+			source = g_main_context_find_source_by_id (connection->context, 
+								   connection->io_watch_err);
+			if (source) {
+				g_source_destroy (source);
+			}
+
 			connection->io_watch_err = 0;
 		}
 
 		if (connection->io_watch_hup != 0) {
-			g_source_destroy (g_main_context_find_source_by_id (
-						  connection->context, connection->io_watch_hup));
+			source = g_main_context_find_source_by_id (connection->context, 
+								   connection->io_watch_hup);
+
+			if (source) {
+				g_source_destroy (source);
+			}
+			
 			connection->io_watch_hup = 0;
 		}
 
 		if (connection->io_watch_out != 0) {
-			g_source_destroy (g_main_context_find_source_by_id (
-				connection->context, connection->io_watch_out));
+			source = g_main_context_find_source_by_id (connection->context, 
+								   connection->io_watch_out);
+
+			if (source) {
+				g_source_destroy (source);
+			}
+
 			connection->io_watch_out = 0;
 		}
 
 		if (connection->io_watch_connect != 0) {
-			g_source_destroy (g_main_context_find_source_by_id(connection->context,
-									   connection->io_watch_connect));
+			
+			source = g_main_context_find_source_by_id (connection->context,
+								   connection->io_watch_connect);
+
+			if (source) {
+				g_source_destroy (source);
+			}
+			
 			connection->io_watch_connect = 0;
 		}