From e89c27826741334b35d8952c769f66d11eaedce8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 18 Dec 2005 04:33:29 +0000 Subject: Use libedataserver's e_xml_parse_file() instead of xmlParseFile() 2005-12-17 Tor Lillqvist * e-config-upgrade.c: Use libedataserver's e_xml_parse_file() instead of xmlParseFile() directly. * e-shell.c * e-shell-importer.c: Use GLib API when applicable. * e-shell-importer.c * e-shell-window.c: Construct pathname of glade file at run-time. * e-shell-window-commands.c: Include e-util-private.h for Win32 redefinition of EVOLUTION_DATADIR. * main.c: No SIGSEGV handling on Win32. (main): Drop unused evolution_directory variable. svn path=/trunk/; revision=30849 --- shell/e-config-upgrade.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'shell/e-config-upgrade.c') diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 8fb6674a3a..d71f12ad09 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -22,17 +22,22 @@ * */ +#include + #include #include - #include #include #include + #include #include +#include + #include "e-util/e-bconf-map.h" + #include "e-config-upgrade.h" /* ********************************************************************** */ @@ -129,15 +134,12 @@ e_gconf_map_list_t remap_list[] = { int e_config_upgrade(int major, int minor, int revision) { - xmlDocPtr config_doc = NULL; + xmlDocPtr config_doc; char *conf_file; - struct stat st; int res = 0; - conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL); - if (lstat (conf_file, &st) == 0 && S_ISREG (st.st_mode)) - config_doc = xmlParseFile (conf_file); + config_doc = e_xml_parse_file (conf_file); g_free (conf_file); if (config_doc && major <=1 && minor < 3) { -- cgit v1.2.3