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, 3 insertions, 3 deletions

diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index d6fae3a8d7..2b18f782d9 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -263,7 +263,7 @@ stream_write (CamelStream *stream, const char *buffer, size_t n)
 	if (emss->cancel)
 		return -1;
 
-	if (pthread_self() == mail_gui_thread) {
+	if (pthread_equal(pthread_self(), mail_gui_thread)) {
 		EMSS_CLASS(emss)->sync_write(stream, buffer, n);
 #ifdef LOG_STREAM
 		if (p->logfd)
@@ -293,7 +293,7 @@ stream_flush(CamelStream *stream)
 	if (emss->cancel)
 		return -1;
 
-	if (pthread_self() == mail_gui_thread)
+	if (pthread_equal(pthread_self(), mail_gui_thread))
 		return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream);
 	else
 		sync_op(emss, EMSS_FLUSH, NULL, 0);
@@ -311,7 +311,7 @@ stream_close(CamelStream *stream)
 
 	d(printf("%p: closing stream\n", stream));
 
-	if (pthread_self() == mail_gui_thread) {
+	if (pthread_equal(pthread_self(), mail_gui_thread)) {
 #ifdef LOG_STREAM
 		if (emss->priv->logfd) {
 			fclose(emss->priv->logfd);