Bug 677995 - Asks password for disabled mail account

Remove mail_folder_cache_service_added() and rely instead on
mail_folder_cache_service_enabled()/disabled().  Despite the function
names the folder cache doesn't actually care about enabled status, it
simply maintains a set of CamelStores to monitor.  We should refactor
the folder cache API to better reflect that.

EMailAccountStore always immediately follows a "service-added" signal
emission with either a "service-enabled" or "service-disabled" emission,
which will add or remove the service from the folder cache.

3 files changed, 1 insertions, 20 deletions

diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 6ce4e2d1ca..2c832f501b 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -1784,17 +1784,6 @@ mail_folder_cache_get_remote_folder_uris (MailFolderCache *self,
 }
 
 void
-mail_folder_cache_service_added (MailFolderCache *cache,
-                                 CamelService *service)
-{
-	g_return_if_fail (MAIL_IS_FOLDER_CACHE (cache));
-	g_return_if_fail (CAMEL_IS_SERVICE (service));
-
-	mail_folder_cache_note_store (
-		cache, CAMEL_STORE (service), NULL, NULL, NULL);
-}
-
-void
 mail_folder_cache_service_removed (MailFolderCache *cache,
                                    CamelService *service)
 {
diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h
index 5f464a6bd0..cc3fc898bc 100644
--- a/libemail-engine/mail-folder-cache.h
+++ b/libemail-engine/mail-folder-cache.h
@@ -138,8 +138,6 @@ void		mail_folder_cache_get_local_folder_uris
 void		mail_folder_cache_get_remote_folder_uris
 						(MailFolderCache *cache,
 						 GQueue *out_queue);
-void		mail_folder_cache_service_added (MailFolderCache *cache,
-						 CamelService *service);
 void		mail_folder_cache_service_removed
 						(MailFolderCache *cache,
 						 CamelService *service);
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index aabb13e516..e22ed99274 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -483,13 +483,7 @@ static void
 mail_account_store_service_added (EMailAccountStore *store,
                                   CamelService *service)
 {
-	EMailSession *session;
-	MailFolderCache *cache;
-
-	session = e_mail_account_store_get_session (store);
-	cache = e_mail_session_get_folder_cache (session);
-
-	mail_folder_cache_service_added (cache, service);
+	/* Placeholder so subclasses can safely chain up. */
 }
 
 static void