diff options
author | Tor Lillqvist <tml@novell.com> | 2005-12-17 20:07:31 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-17 20:07:31 +0800 |
commit | eea1c3e8d6351725a3879f2ef48c38bde07f1faa (patch) | |
tree | f44470c16c0edba9ce660adf4f43d8a9332cb803 /addressbook/printing | |
parent | afa42c2e1ce90b49561a9aa7cb75b692a2cdcd7c (diff) | |
download | gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar.gz gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar.bz2 gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar.lz gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar.xz gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.tar.zst gsoc2013-evolution-eea1c3e8d6351725a3879f2ef48c38bde07f1faa.zip |
gui/widgets/gal-view-minicard.c Use libedataserver's e_xml_parse_file()
2005-12-17 Tor Lillqvist <tml@novell.com>
* gui/widgets/gal-view-minicard.c
* printing/e-contact-print.c: Use libedataserver's
e_xml_parse_file() and e_xml_save_file() instead of calling libxml
functions directly, as they don't understand the GLib file
name encoding (UTF-8) on Win32.
svn path=/trunk/; revision=30800
Diffstat (limited to 'addressbook/printing')
-rw-r--r-- | addressbook/printing/e-contact-print.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index a662185838..e233aed5c4 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -20,13 +20,14 @@ */ #include <config.h> -#include "e-contact-print.h" #include <ctype.h> #include <sys/types.h> #include <stdlib.h> #include <string.h> + #include <glib.h> + #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> @@ -42,9 +43,14 @@ #include <libgnomeprintui/gnome-print-job-preview.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <e-util/e-util.h> -#include <e-util/e-util-private.h> -#include <e-util/e-print.h> + +#include <libedataserver/e-xml-utils.h> + +#include "e-util/e-print.h" +#include "e-util/e-util.h" +#include "e-util/e-util-private.h" + +#include "e-contact-print.h" #define SCALE 5 #define HYPHEN_PIXELS 20 @@ -769,7 +775,7 @@ e_contact_build_style(EContactPrintStyle *style, GnomePrintConfig *config) style->right_footer = g_strdup(""); style->reverse_on_even_pages = FALSE; filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps"); - styledoc = xmlParseFile(filename); + styledoc = e_xml_parse_file (filename); g_free(filename); if (styledoc) { xmlNodePtr stylenode = xmlDocGetRootElement(styledoc); |