--- a/ChangeLog	Mon Nov 13 22:55:10 2006 +0000
+++ b/ChangeLog	Fri Nov 17 00:22:12 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-17  Mikael Hallendal  <micke@imendio.com>
+
+	* loudmouth/lm-connection.h:
+	- Removed a typo slash, reported by Dafydd Harries.
+	* loudmouth/lm-parser.c: (parser_error_cb), (lm_parser_parse):
+	- Don't free the parser in the parser callback.
+	- Patch from Sjoerd Simons.
+
 2006-11-14  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-connection.c:

--- a/loudmouth/lm-connection.h	Mon Nov 13 22:55:10 2006 +0000
+++ b/loudmouth/lm-connection.h	Fri Nov 17 00:22:12 2006 +0000
@@ -22,7 +22,7 @@
 #define __LM_CONNECTION_H__
 
 #if !defined (LM_INSIDE_LOUDMOUTH_H) && !defined (LM_COMPILATION)
-#error "Only <loudmouth/loudmouth.h> can be included directly, this file may di\sappear or change contents."
+#error "Only <loudmouth/loudmouth.h> can be included directly, this file may disappear or change contents."
 #endif
 
 #include <loudmouth/lm-message.h>

--- a/loudmouth/lm-parser.c	Mon Nov 13 22:55:10 2006 +0000
+++ b/loudmouth/lm-parser.c	Fri Nov 17 00:22:12 2006 +0000
@@ -197,14 +197,10 @@
 		 GError              *error,
 		 gpointer             user_data)
 {
-	LmParser     *parser;
-	
 	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (error != NULL);
 	
-	parser = LM_PARSER (user_data);
-
-	g_markup_parse_context_free (parser->context);
-	parser->context = NULL;
+	g_warning ("Parsing failed: %s\n", error->message);
 }
 
 LmParser *
@@ -256,7 +252,8 @@
         if (g_markup_parse_context_parse (parser->context, string, 
                                           (gssize)strlen (string), NULL)) {
         } else {
-                g_warning ("Parsing failed\n");
+		g_markup_parse_context_free (parser->context);
+		parser->context = NULL;
         }
 }