rpms/loudmouth/devel loudmouth-1.2.2-stream-error.patch, NONE, 1.1 loudmouth.spec, 1.25, 1.26

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/loudmouth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629

Modified Files:
	loudmouth.spec 
Added Files:
	loudmouth-1.2.2-stream-error.patch 
Log Message:
* Wed May 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-3
- Add patch to fix stream error.


loudmouth-1.2.2-stream-error.patch:

--- NEW FILE loudmouth-1.2.2-stream-error.patch ---
--- loudmouth-1.2.2/loudmouth/lm-connection.c.stream-error	2007-05-16 13:15:21.000000000 -0400
+++ loudmouth-1.2.2/loudmouth/lm-connection.c	2007-05-16 13:17:58.000000000 -0400
@@ -285,7 +285,7 @@
 	}
 	else if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM_ERROR) {
 		connection_stream_error (connection, m);
-		goto out;
+		goto run_global_handlers;
 	}
 	
 	id = lm_message_node_get_attribute (m->node, "id");
@@ -304,6 +304,7 @@
 		goto out;
 	}
 
+run_global_handlers:
 	for (l = connection->handlers[lm_message_get_type (m)]; 
 	     l && result == LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; 
 	     l = l->next) {
@@ -1461,7 +1462,7 @@
 static void
 connection_stream_error (LmConnection *connection, LmMessage *m)
 {
-	LmMessageNode *node;
+	LmMessageNode *node, *child;
 
 	g_return_if_fail (connection != NULL);
 	g_return_if_fail (m != NULL);
@@ -1469,16 +1470,16 @@
 	node = m->node;
 
 	/* Resource conflict */
-	node = lm_message_node_get_child (node, "conflict");
-	if (node) {
+	child = lm_message_node_get_child (node, "conflict");
+	if (child) {
 		lm_verbose ("Stream error: Conflict (resource connected elsewhere)\n");
 		connection->disconnect_reason = LM_DISCONNECT_REASON_RESOURCE_CONFLICT;
 		return;
 	}
 
 	/* XML is crack */
-	node = lm_message_node_get_child (node, "xml-not-well-formed");
-	if (node) {
+	child = lm_message_node_get_child (node, "xml-not-well-formed");
+	if (child) {
 		lm_verbose ("Stream error: XML not well formed\n");
 		connection->disconnect_reason = LM_DISCONNECT_REASON_INVALID_XML;
 		return;


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- loudmouth.spec	15 May 2007 17:50:55 -0000	1.25
+++ loudmouth.spec	16 May 2007 20:25:36 -0000	1.26
@@ -2,13 +2,14 @@
 
 Name:           loudmouth
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
 License:        LGPL
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -46,6 +47,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .stream-error
 
 
 %build
@@ -91,6 +93,9 @@
 
 
 %changelog
+* Wed May 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-3
+- Add patch to fix stream error.
+
 * Tue May 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-2
 - Drop BR on libtasn1-devel.