Argh!!! Dont free the async op data here, the async op is still running

2001-10-30    <NotZed@Ximian.com>

        * subscribe-dialog.c (fe_cancel_op_foreach): Argh!!! Dont free the
        async op data here, the async op is still running and will access
        it!  Just try to cancel it and mark it as cancelled (id == -1)
        (fe_done_subscribing): Only remove outselves from the hash table
        if we're not cancelled.  The handle should always be set here,
        since this code runs in the gui thread.

        * message-list.c (on_cursor_activated_idle): If nothing
        selected/cursor not activated, then select no message.

        * mail-folder-cache.c (update_1folder): Make the trash count
        optional on EVOLUTION_COUNT_TRASH, becuase some lusers are just
        too stupid to understand what its for.

        * component-factory.c (storage_xfer_folder): Return slightly
        better error codes for copying folders, since its not implemented
        yet.

        * mail-vfolder.c, mail-local.c, mail-folder-cache.c,
        message-list.c component-factory.c, mail-ops.c,
        subscribe-dialog.c, mail-session.c: d() out some debug printfs,
        w() out some warnings.

        * folder-browser-ui.c (folder_browser_ui_add_message): Fix typo,
        Resent->Resend.

svn path=/trunk/; revision=14412

1 files changed, 4 insertions, 3 deletions

diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 9f5b3235bb..201e8a5e13 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -50,7 +50,8 @@
 #include "mail-mt.h"
 #include "mail-folder-cache.h"
 
-#define d(x) x
+#define w(x)
+#define d(x) 
 
 /* used for both just filtering a folder + uid's, and for filtering a whole folder */
 /* used both for fetching mail, and for filtering mail */
@@ -1106,8 +1107,8 @@ get_folderinfo_got (struct _mail_msg *mm)
 		char *url;
 		
 		url = camel_service_get_url (CAMEL_SERVICE (m->store));
-		g_warning ("Error getting folder info from store at %s: %s",
-			   url, camel_exception_get_description (&mm->ex));
+		w(g_warning ("Error getting folder info from store at %s: %s",
+			     url, camel_exception_get_description (&mm->ex)));
 		g_free (url);
 	}