diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-18 12:33:29 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-18 12:33:29 +0800 |
| commit | e89c27826741334b35d8952c769f66d11eaedce8 (patch) | |
| tree | e64b437a818686edcb8457691ea369f4f7719e0b /shell/e-config-upgrade.c | |
| parent | f3e001990b61a336c1f30c5bae8065c15e320aec (diff) | |
| download | gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.gz gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.zst gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.zip | |
Use libedataserver's e_xml_parse_file() instead of xmlParseFile()
2005-12-17 Tor Lillqvist <tml@novell.com>
* 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
Diffstat (limited to 'shell/e-config-upgrade.c')
| -rw-r--r-- | shell/e-config-upgrade.c | 14 |
1 files changed, 8 insertions, 6 deletions
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 <config.h> + #include <sys/types.h> #include <sys/stat.h> - #include <stdio.h> #include <ctype.h> #include <glib.h> + #include <gconf/gconf.h> #include <gconf/gconf-client.h> +#include <libedataserver/e-xml-utils.h> + #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) { |