aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-13 18:28:29 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-13 19:08:56 +0800
commit2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f (patch)
treeb3550fbb097e032b740f3df94806315fc3e590d8
parent4ec913aeb99b71c85da47e47490954a22465babc (diff)
downloadgsoc2013-empathy-2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f.tar.gz
gsoc2013-empathy-2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f.tar.zst
gsoc2013-empathy-2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f.zip
Call xmlCleanupParser() only once when exiting (#600693)
This function should only be called when exiting the application as it cleans up the memory allocated by the library itself. Thanks to Lennart for pointing this out.
-rw-r--r--libempathy-gtk/empathy-plist.c2
-rw-r--r--libempathy/empathy-chatroom-manager.c1
-rw-r--r--libempathy/empathy-contact-groups.c1
-rw-r--r--libempathy/empathy-irc-network-manager.c1
-rw-r--r--src/empathy.c1
5 files changed, 1 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index 4cc392bec..73d31466a 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 56295fe5a..bfb85f53f 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 7244c1622..726824ea4 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 0b5bcc855..97d19a0eb 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 ffb22a8eb..4baf5b8f7 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;
}