rpms/loudmouth/F-7 loudmouth-reconnect-failure.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 loudmouth.spec, 1.27, 1.28 sources, 1.11, 1.12 loudmouth-1.2.2-stream-error.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	.cvsignore loudmouth.spec sources 
Added Files:
	loudmouth-reconnect-failure.patch 
Removed Files:
	loudmouth-1.2.2-stream-error.patch 
Log Message:
* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-1
- Add reconnect-failure patch. Thanks to Robert McQueen.
- Update to 1.2.3.
- Drop stream-error patch. fixed upstream.


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 May 2007 17:08:20 -0000	1.11
+++ .cvsignore	13 Nov 2007 02:24:24 -0000	1.12
@@ -1 +1 @@
-loudmouth-1.2.2.tar.bz2
+loudmouth-1.2.3.tar.bz2


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/F-7/loudmouth.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- loudmouth.spec	5 Aug 2007 22:01:04 -0000	1.27
+++ loudmouth.spec	13 Nov 2007 02:24:24 -0000	1.28
@@ -1,15 +1,15 @@
 %define with_ssl 1
 
 Name:           loudmouth
-Version:        1.2.2
-Release:        4%{?dist}
+Version:        1.2.3
+Release:        1%{?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}-%{version}-stream-error.patch
+Patch0:		%{name}-reconnect-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -47,8 +47,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .stream-error
-
+%patch0 -p1 -b .reconnect
 
 %build
 %configure --enable-gtk-doc	\
@@ -93,6 +92,11 @@
 
 
 %changelog
+* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-1
+- Add reconnect-failure patch. Thanks to Robert McQueen.
+- Update to 1.2.3.
+- Drop stream-error patch. fixed upstream.
+
 * Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-4
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 May 2007 17:08:20 -0000	1.11
+++ sources	13 Nov 2007 02:24:24 -0000	1.12
@@ -1 +1 @@
-0bdd62dcbca0dfc8b46de6806c0cc3ca  loudmouth-1.2.2.tar.bz2
+7e25b0e13498dcb671d60d0cd62091b8  loudmouth-1.2.3.tar.bz2


--- loudmouth-1.2.2-stream-error.patch DELETED ---