rpms/empathy/devel xmlCleanupParser.patch, NONE, 1.1 empathy.spec, 1.89, 1.90

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6507

Modified Files:
	empathy.spec 
Added Files:
	xmlCleanupParser.patch 
Log Message:
* Wed Jan 13 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.29.5.1-2
- Add patch to fix crasher due to misuse of xmlCleanParser. (#532307)


xmlCleanupParser.patch:
 libempathy-gtk/empathy-plist.c           |    2 --
 libempathy/empathy-chatroom-manager.c    |    1 -
 libempathy/empathy-contact-groups.c      |    1 -
 libempathy/empathy-irc-network-manager.c |    1 -
 src/empathy.c                            |    1 +
 5 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE xmlCleanupParser.patch ---
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index 4cc392b..73d3146 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -294,7 +294,6 @@ empathy_plist_parse_from_file (const char *filename)
 	parsed_doc = empathy_plist_parse (root_element);
 
 	xmlFreeDoc (doc);
-	xmlCleanupParser ();
 
 	return parsed_doc;
 }
@@ -329,7 +328,6 @@ empathy_plist_parse_from_memory (const char *data, gsize len)
 	parsed_doc = empathy_plist_parse (root_element);
 
 	xmlFreeDoc (doc);
-	xmlCleanupParser ();
 
 	return parsed_doc;
 }
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 56295fe..bfb85f5 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -127,7 +127,6 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager)
 	xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
 	xmlFreeDoc (doc);
 
-	xmlCleanupParser ();
 	xmlMemoryDump ();
 
 	return TRUE;
diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index 7244c16..726824e 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -221,7 +221,6 @@ contact_groups_file_save (void)
 	xmlSaveFormatFileEnc (file, doc, "utf-8", 1);
 	xmlFreeDoc (doc);
 
-	xmlCleanupParser ();
 	xmlMemoryDump ();
 
 	g_free (file);
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 0b5bcc8..97d19a0 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -719,7 +719,6 @@ irc_network_manager_file_save (EmpathyIrcNetworkManager *self)
   xmlSaveFormatFileEnc (priv->user_file, doc, "utf-8", 1);
   xmlFreeDoc (doc);
 
-  xmlCleanupParser ();
   xmlMemoryDump ();
 
   priv->have_to_save = FALSE;
diff --git a/src/empathy.c b/src/empathy.c
index ffb22a8..4baf5b8 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -1065,6 +1065,7 @@ main (int argc, char *argv[])
   g_object_unref (unique_app);
 
   notify_uninit ();
+  xmlCleanupParser ();
 
   return EXIT_SUCCESS;
 }


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- empathy.spec	12 Jan 2010 14:19:20 -0000	1.89
+++ empathy.spec	13 Jan 2010 14:12:12 -0000	1.90
@@ -12,7 +12,7 @@
 
 Name:		empathy
 Version:	2.29.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -25,6 +25,10 @@ Source1:	%{name}-README.ConnectionManage
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch1:		presence-icons.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=600693
+Patch2:		xmlCleanupParser.patch
+
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -88,6 +92,7 @@ It is built on top of the Telepathy fram
 %prep
 %setup -q
 %patch1 -p1 -b .presence-icons
+%patch2 -p1 -b .xmlcleanupparser
 # force these to be regenerated
 rm data/empathy.desktop
 rm data/empathy.schemas
@@ -168,6 +173,9 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Wed Jan 13 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.29.5.1-2
+- Add patch to fix crasher due to misuse of xmlCleanParser. (#532307)
+
 * Tue Jan 12 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.29.5.1-1
 - Update to 2.29.5.1.