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

1 files changed, 8 insertions, 1 deletions

diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 885c6e0339..88d61204e8 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -38,6 +38,7 @@
 #include "mail/em-folder-selector.h"
 #include "mail/mail-component.h"
 #include "e-util/e-error.h"
+#include "e-util/e-util-private.h"
 
 #define d(x)
 
@@ -600,6 +601,7 @@ get_widget(FilterRule *fr, RuleContext *rc)
 	GtkTreeIter iter;
 	GladeXML *gui;
 	int i;
+	char *gladefile;
 	
         widget = FILTER_RULE_CLASS(parent_class)->get_widget(fr, rc);
 	
@@ -607,7 +609,12 @@ get_widget(FilterRule *fr, RuleContext *rc)
 	data->rc = rc;
 	data->vr = vr;
 	
-	gui = glade_xml_new(EVOLUTION_GLADEDIR "/mail-dialogs.glade", "vfolder_source_frame", NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "mail-dialogs.glade",
+				      NULL);
+	gui = glade_xml_new(gladefile, "vfolder_source_frame", NULL);
+	g_free (gladefile);
+
         frame = glade_xml_get_widget(gui, "vfolder_source_frame");
 	
 	g_object_set_data_full((GObject *)frame, "data", data, g_free);