added a 'domain' argument, and rearragned arguments to be prettier and

2004-05-21  Not Zed  <NotZed@Ximian.com>

        * camel-session.c (camel_session_get_password): added a 'domain'
        argument, and rearragned arguments to be prettier and more
        consistent.  Fixed all callers.
        (camel_session_forget_password): added a domain argument.  Fixed
        all callers.

        ** See #58376.

        * camel-folder.c (set_message_flags): if system flags change, then
        don't trigger a folder changed event.

        * camel-folder-summary.h (CAMEL_MESSAGE_SYSTEM_MASK): added this
        to indicate which flags are internal/apps not interested in.

        * camel-folder.c (filter_free): rearrange and use some helpers.
        (folder_changed): if we're frozen, dont go firing off threads to
        do any processing on each change, wait until we're called
        unfrozen.  Slight code rearragnement.
        (filter_filter): add progress to junk learn/unlearn, and separate
        them.

svn path=/trunk/; revision=26029

6 files changed, 14 insertions, 14 deletions

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index b669398697..9c70245227 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1264,7 +1264,7 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 	while (!authenticated) {
 		if (errbuf) {
 			/* We need to un-cache the password before prompting again */
-			camel_session_forget_password (session, service, "password", ex);
+			camel_session_forget_password (session, service, NULL, "password", ex);
 			g_free (service->url->passwd);
 			service->url->passwd = NULL;
 		}
@@ -1278,8 +1278,8 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 						  service->url->user,
 						  service->url->host);
 			service->url->passwd =
-				camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET,
-							    service, "password", ex);
+				camel_session_get_password (session, service, NULL,
+							    prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
 			g_free (prompt);
 			g_free (errbuf);
 			errbuf = NULL;
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 75d45830bf..85ae32407a 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -420,7 +420,7 @@ imap4_try_authenticate (CamelService *service, gboolean reprompt, const char *er
 					  service->url->user,
 					  service->url->host);
 		
-		service->url->passwd = camel_session_get_password (session, prompt, flags, service, "password", ex);
+		service->url->passwd = camel_session_get_password (session, service, NULL, prompt, "password", flags, ex);
 		
 		g_free (prompt);
 		
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c
index 2332a09648..6ae79cae2e 100644
--- a/camel/providers/imapp/camel-imapp-store.c
+++ b/camel/providers/imapp/camel-imapp-store.c
@@ -346,8 +346,8 @@ store_get_pass(CamelIMAPPStore *store)
 					  ((CamelService *)store)->url->user,
 					  ((CamelService *)store)->url->host);
 		((CamelService *)store)->url->passwd = camel_session_get_password(camel_service_get_session((CamelService *)store),
-										  prompt, CAMEL_SESSION_PASSWORD_SECRET,
-										  (CamelService*)store, "password", &ex);
+										  (CamelService *)store, NULL,
+										  prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, &ex);
 		g_free (prompt);
 		if (camel_exception_is_set(&ex))
 			camel_exception_throw_ex(&ex);
@@ -418,7 +418,7 @@ imap_connect (CamelService *service, CamelException *ex)
 				switch (e->id) {
 				case CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE:
 					store->login_error = g_strdup_printf("%s\n\n", e->desc);
-					camel_session_forget_password(service->session, service, "password", ex);
+					camel_session_forget_password(service->session, service, NULL, "password", ex);
 					camel_url_set_passwd(service->url, NULL);
 					break;
 				default:
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 3b04f95052..d43fc13ca9 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1001,8 +1001,8 @@ camel_nntp_try_authenticate (CamelNNTPStore *store)
 		camel_exception_init (&ex);
 		
 		service->url->passwd =
-			camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET,
-						    service, "password", &ex);
+			camel_session_get_password (session, service, NULL,
+						    prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, &ex);
 		camel_exception_clear (&ex);
 		g_free (prompt);
 		
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 5f4defaec1..685bf49f3c 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -481,8 +481,8 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err
 					  errmsg ? errmsg : "",
 					  service->url->user,
 					  service->url->host);
-		service->url->passwd = camel_session_get_password (camel_service_get_session (service),
-								   prompt, flags, service, "password", ex);
+		service->url->passwd = camel_session_get_password (camel_service_get_session (service), service, NULL,
+								   prompt, "password", flags, ex);
 		g_free (prompt);
 		if (!service->url->passwd)
 			return FALSE;
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 7c1cb97ec0..18583e6839 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -503,7 +503,7 @@ smtp_connect (CamelService *service, CamelException *ex)
 		while (!authenticated) {
 			if (errbuf) {
 				/* We need to un-cache the password before prompting again */
-				camel_session_forget_password (session, service, "password", NULL);
+				camel_session_forget_password (session, service, NULL, "password", NULL);
 				g_free (service->url->passwd);
 				service->url->passwd = NULL;
 			}
@@ -515,8 +515,8 @@ smtp_connect (CamelService *service, CamelException *ex)
 							  errbuf ? errbuf : "", service->url->user,
 							  service->url->host);
 				
-				service->url->passwd = camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET,
-										   service, "password", ex);
+				service->url->passwd = camel_session_get_password (session, service, NULL,
+										   prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
 				
 				g_free (prompt);
 				g_free (errbuf);