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-subscribe-editor.c b/mail/em-subscribe-editor.c
index 205776e858..51dd4a2404 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -37,6 +37,7 @@
 #include "camel/camel-store.h"
 #include "camel/camel-session.h"
 #include "e-util/e-account-list.h"
+#include "e-util/e-util-private.h"
 
 #include "em-subscribe-editor.h"
 
@@ -835,11 +836,17 @@ GtkDialog *em_subscribe_editor_new(void)
 	EIterator *iter;
 	GladeXML *xml;
 	GtkWidget *menu, *w;
+	char *gladefile;
 
 	se = g_malloc0(sizeof(*se));
 	e_dlist_init(&se->stores);
 
-	xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "subscribe_dialog", NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "mail-dialogs.glade",
+				      NULL);
+	xml = glade_xml_new (gladefile, "subscribe_dialog", NULL);
+	g_free (gladefile);
+
 	if (xml == NULL) {
 		/* ?? */
 		return NULL;