From 448d624c00f0c4e12917a4d31babd10555b2e8a4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Sun, 18 Dec 2005 08:24:26 +0000
Subject: em-folder-browser.c em-folder-view.c em-format-html.c

2005-12-18  Tor Lillqvist  <tml@novell.com>

	* em-folder-browser.c
	* em-folder-view.c
	* em-format-html.c
	* em-format-html-display.c
	* em-mailer-prefs.c
	* em-message-browser.c
	* em-migrate.c
	* em-subscribe-editor.c
	* em-sync-stream.c
	* em-utils.c
	* em-vfolder-editor.c
	* em-vfolder-rule.c
	* mail-autofilter.c
	* mail-component.c
	* mail-config.c
	* mail-folder-cache.c: Use gstdio wrappers. Construct pathnames of
	glade, xml, etspec and png files at run-time. Use
	g_filename_{to,from}_uri().

	* em-folder-browser.c (emfb_init)
	* em-folder-view.c (emfv_finalise)
	* em-message-browser.c (emmb_init): As EMFolderView::ui_files now
	always is a list of filenames constructed with g_build_filename(),
	use g_free() on each list entry before calling g_slist_free() on
	the list.

	* em-folder-tree-model.c (em_folder_tree_model_load_state): Use
	e_xml_parse_file().

	* em-migrate.c: Bypass all the code for upgrading from 1.x on Win32.
	(emm_setup_initial): Use GDir instead of dirent.

	* em-sync-stream.c
	* mail-folder-cache.c: Use pthread_equal() to compare pthread_t
	values.

	* em-vfs-stream.c: No EINPROGRESS or ELOOP on Win32.

svn path=/trunk/; revision=30854
---
 mail/em-folder-tree-model.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mail/em-folder-tree-model.c')

diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 44b318b44c..7cc83be033 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -34,9 +34,10 @@
 
 #include <libxml/parser.h>
 
+#include <libedataserver/e-xml-utils.h>
+
 #include <e-util/e-mktemp.h>
 
-#include <e-util/e-xml-utils.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <camel/camel-file-utils.h>
@@ -323,12 +324,11 @@ static void
 em_folder_tree_model_load_state (EMFolderTreeModel *model, const char *filename)
 {
 	xmlNodePtr root, node;
-	struct stat st;
 	
 	if (model->state)
 		xmlFreeDoc (model->state);
 	
-	if (stat (filename, &st) == 0 && (model->state = xmlParseFile (filename)))
+	if ((model->state = e_xml_parse_file (filename)))
 		return;
 	
 	/* setup some defaults - expand "Local Folders" and "Search Folders" */
-- 
cgit