rpms/loudmouth/F-8 loudmouth-reconnect-failure.patch, NONE, 1.1 loudmouth.spec, 1.29, 1.30

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/loudmouth/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10006

Modified Files:
	loudmouth.spec 
Added Files:
	loudmouth-reconnect-failure.patch 
Log Message:
* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-4
- Add reconnect-failure patch. Thanks to Robert McQueen.


loudmouth-reconnect-failure.patch:

--- NEW FILE loudmouth-reconnect-failure.patch ---
diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
index 74ed958..fe08b68 100644
--- a/loudmouth/lm-connection.c
+++ b/loudmouth/lm-connection.c
@@ -355,11 +355,13 @@ _lm_connection_succeeded (LmConnectData *connect_data)
 
 	connection = connect_data->connection;
 	
+	g_assert (connection->io_watch_connect != 0);
 	if (connection->io_watch_connect != 0) {
 		GSource *source;
 
 		source = g_main_context_find_source_by_id (connection->context,
 							   connection->io_watch_connect);
+		g_assert (source != NULL);
 		if (source) {
 			g_source_destroy (source);
 		}
@@ -493,11 +495,13 @@ _lm_connection_failed_with_error (LmConnectData *connect_data, int error)
 	
 	connect_data->current_addr = connect_data->current_addr->ai_next;
 	
+	g_assert (connection->io_watch_connect != 0);
 	if (connection->io_watch_connect != 0) {
 		GSource *source;
 
 		source = g_main_context_find_source_by_id (connection->context,
 							   connection->io_watch_connect);
+		g_assert (source != NULL);
 		if (source) {
 			g_source_destroy (source);
 		}
@@ -560,7 +564,6 @@ connection_connect_cb (GIOChannel   *source,
 
 			_lm_connection_failed_with_error (connect_data, err);
 
-			connection->io_watch_connect = 0;
 			return FALSE;
 		}
 	}
@@ -590,7 +593,6 @@ connection_connect_cb (GIOChannel   *source,
 				_lm_sock_close (connect_data->fd);
 				_lm_connection_failed_with_error (connect_data, err);
 
-				connection->io_watch_connect = 0;
 				return FALSE;
 			}
 		} 


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/F-8/loudmouth.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- loudmouth.spec	21 Aug 2007 17:16:57 -0000	1.29
+++ loudmouth.spec	13 Nov 2007 01:48:41 -0000	1.30
@@ -2,13 +2,14 @@
 
 Name:           loudmouth
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.imendio.com/projects/loudmouth
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-reconnect-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -46,7 +47,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .reconnect
 
 %build
 %configure --enable-gtk-doc	\
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-4
+- Add reconnect-failure patch. Thanks to Robert McQueen.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-3
 - Rebuild.