evolution r36273 - trunk/mail

[msuman svn gnome org]

Author: msuman
Date: Mon Sep  8 03:25:41 2008
New Revision: 36273
URL: http://svn.gnome.org/viewvc/evolution?rev=36273&view=rev

Log:
Milan Crha  <mcrha redhat com> Fix for bug #328216 (Bad signature prompt for self-signed pop3 servers).

Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-component.c
   trunk/mail/mail-send-recv.c
   trunk/mail/mail-send-recv.h

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Mon Sep  8 03:25:41 2008
@@ -490,8 +490,6 @@
 
 	g_free (priv->base_directory);
 
-	mail_async_event_destroy (priv->async_event);
-
 	g_hash_table_destroy (priv->store_hash);
 
 	if (mail_async_event_destroy (priv->async_event) == -1) {
@@ -505,8 +503,6 @@
 	g_object_unref (priv->logger);
 	g_free (priv);
 
-	mail_session_shutdown ();
-
 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
@@ -902,7 +898,11 @@
 		/* Falls through */
 	case MC_QUIT_THREADS:
 		/* should we keep cancelling? */
-		return !mail_msg_active((unsigned int)-1);
+		if (mail_msg_active((unsigned int)-1))
+			return FALSE;
+
+		mail_session_shutdown ();
+		return TRUE;
 	}
 
 	return TRUE;
@@ -1301,7 +1301,7 @@
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) store_hash_free);
 
-	mail_autoreceive_init();
+	mail_autoreceive_init (session);
 
 	priv->mail_sync_in_progress = 0;
 	if (g_getenv("CAMEL_FLUSH_CHANGES"))

Modified: trunk/mail/mail-send-recv.c
==============================================================================
--- trunk/mail/mail-send-recv.c	(original)
+++ trunk/mail/mail-send-recv.c	Mon Sep  8 03:25:41 2008
@@ -1061,7 +1061,7 @@
 /* call to setup initial, and after changes are made to the config */
 /* FIXME: Need a cleanup funciton for when object is deactivated */
 void
-mail_autoreceive_init(void)
+mail_autoreceive_init (CamelSession *session)
 {
 	EAccountList *accounts;
 	EIterator *iter;
@@ -1079,7 +1079,7 @@
 	for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter))
 		auto_account_added(accounts, (EAccount *)e_iterator_get(iter), NULL);
 
-	camel_object_hook_event(mail_component_peek_session(NULL), "online", auto_online, NULL);
+	camel_object_hook_event (session, "online", auto_online, NULL);
 }
 
 /* we setup the download info's in a hashtable, if we later need to build the gui, we insert

Modified: trunk/mail/mail-send-recv.h
==============================================================================
--- trunk/mail/mail-send-recv.h	(original)
+++ trunk/mail/mail-send-recv.h	Mon Sep  8 03:25:41 2008
@@ -31,13 +31,15 @@
 #pragma }
 #endif /* __cplusplus */
 
+struct _CamelSession;
+
 /* send/receive all uri's */
 GtkWidget *mail_send_receive(void);
 /* receive a single uri */
 void mail_receive_uri(const char *uri, int keep);
 void mail_send (void);
 /* setup auto receive stuff */
-void mail_autoreceive_init(void);
+void mail_autoreceive_init (struct _CamelSession *session);
 
 #ifdef __cplusplus
 }