rpms/loudmouth/devel loudmouth-stream-error.patch, NONE, 1.1 loudmouth.spec, 1.33, 1.34

[Owen Taylor (otaylor)]

Author: otaylor

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

Modified Files:
	loudmouth.spec 
Added Files:
	loudmouth-stream-error.patch 
Log Message:
Add back stream-error patch, it wasn't fixed in the 1.3 branch

loudmouth-stream-error.patch:

--- NEW FILE loudmouth-stream-error.patch ---
diff -up loudmouth-1.3.3/loudmouth/lm-connection.c.error-node loudmouth-1.3.3/loudmouth/lm-connection.c
--- loudmouth-1.3.3/loudmouth/lm-connection.c.error-node	2008-01-30 17:15:30.000000000 -0500
+++ loudmouth-1.3.3/loudmouth/lm-connection.c	2008-01-30 17:20:23.000000000 -0500
@@ -787,10 +787,8 @@ connection_stream_error (LmConnection *c
 	g_return_if_fail (connection != NULL);
 	g_return_if_fail (m != NULL);
 
-	node = m->node;
-
 	/* Resource conflict */
-	node = lm_message_node_get_child (node, "conflict");
+	node = lm_message_node_get_child (m->node, "conflict");
 	if (node) {
 		lm_verbose ("Stream error: Conflict (resource connected elsewhere)\n");
 		reason = LM_DISCONNECT_REASON_RESOURCE_CONFLICT;
@@ -798,7 +796,7 @@ connection_stream_error (LmConnection *c
 	}
 
 	/* XML is crack */
-	node = lm_message_node_get_child (node, "xml-not-well-formed");
+	node = lm_message_node_get_child (m->node, "xml-not-well-formed");
 	if (node) {
 		lm_verbose ("Stream error: XML not well formed\n");
 		reason = LM_DISCONNECT_REASON_INVALID_XML;


Index: loudmouth.spec
===================================================================
RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- loudmouth.spec	19 Jan 2008 00:26:00 -0000	1.33
+++ loudmouth.spec	30 Jan 2008 22:38:56 -0000	1.34
@@ -2,13 +2,17 @@
 
 Name:           loudmouth
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?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
+# http://developer.imendio.com/issues/browse/LM-104
+Patch0:         %{name}-stream-error.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -47,6 +51,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .stream-error
+
 %build
 %configure --enable-gtk-doc	\
 	   --enable-static=no	\
@@ -90,6 +96,9 @@
 
 
 %changelog
+* Wed Jan 30 2008 Owen Taylor <otaylor at redhat.com> - 1.3.3-2
+- Add back stream-error patch, it wasn't fixed in the 1.3 branch
+
 * Fri Jan 18 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.3.3-1
 - Update to 1.3.3.
 - Drop reconnect-failure patch.