aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-17 23:56:16 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-17 23:56:16 +0800
commit491a3a63436f2cc1f46f4da598b6d5e3e9af1011 (patch)
tree3f002527b6cfa87cef25becf71098e551fb45f72
parent656e89904ca9fb3fc6feba9c3f4d423b7df39e98 (diff)
downloadgsoc2013-evolution-491a3a63436f2cc1f46f4da598b6d5e3e9af1011.tar.gz
gsoc2013-evolution-491a3a63436f2cc1f46f4da598b6d5e3e9af1011.tar.zst
gsoc2013-evolution-491a3a63436f2cc1f46f4da598b6d5e3e9af1011.zip
Use e_xml_parse_file() and e_xml_save_file() instead of using libxml
2005-12-17 Tor Lillqvist <tml@novell.com> * e-pilot-map.c: Use e_xml_parse_file() and e_xml_save_file() instead of using libxml directly. svn path=/trunk/; revision=30824
-rw-r--r--e-util/ChangeLog5
-rw-r--r--e-util/e-pilot-map.c11
2 files changed, 10 insertions, 6 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 85ab8d4434..4ffd84412b 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -9,8 +9,9 @@
* e-mktemp.c: Use GLib API where applicable for portability.
* e-error.c
- * e-folder-map.c: Use e_xml_parse_file() instead of using libxml
- directly.
+ * e-folder-map.c
+ * e-pilot-map.c: Use e_xml_parse_file() and e_xml_save_file()
+ instead of using libxml directly.
* e-util-private.h (fsync)
* e-util.c: Don't bother with a Win32 implementation of fsync() as
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index e155657732..533c2f3de7 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -20,13 +20,16 @@
* Boston, MA 02111-1307, USA.
*/
-#include "e-pilot-map.h"
-
-#include <string.h> /* memset(), strcmp() */
+#include <string.h>
#include <stdlib.h>
+
#include <glib.h>
#include <libxml/parser.h>
+#include <libedataserver/e-xml-utils.h>
+
+#include "e-pilot-map.h"
+
typedef struct
{
char *uid;
@@ -402,7 +405,7 @@ e_pilot_map_write (const char *filename, EPilotMap *map)
/* Write the file */
xmlSetDocCompressMode (doc, 0);
- ret = xmlSaveFile (filename, doc);
+ ret = e_xml_save_file (filename, doc);
if (ret < 0) {
g_warning ("Pilot map file '%s' could not be saved\n", filename);
return -1;