aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/component-factory.c8
-rw-r--r--mail/mail-accounts.c3
3 files changed, 11 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9e28c45e47..fd912a3a09 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2002-06-10 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-accounts.c (account_able_clicked): Comment out the code to
+ add/remove the store to the folder-tree when it gets
+ enabled/disabled.
+
* mail-callbacks.c (mail_generate_reply): If we are doing
Reply-to-All, do not include any of the user's email accounts in
the To: field. If, after this, the To: field is empty - then
diff --git a/mail/component-factory.c b/mail/component-factory.c
index df4a08c9ae..07dcba7c32 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -1246,7 +1246,7 @@ storage_connect (EvolutionStorage *storage,
const char *path,
CamelStore *store)
{
- mail_note_store (CAMEL_STORE(store), storage, CORBA_OBJECT_NIL,
+ mail_note_store (CAMEL_STORE (store), storage, CORBA_OBJECT_NIL,
storage_connected, storage);
}
@@ -1324,7 +1324,7 @@ mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const ch
* see if this belongs in the shell's folder list. If so, add
* it.
*/
-
+
prov = camel_session_get_provider (session, uri, &ex);
if (prov == NULL) {
/* FIXME: real error dialog */
@@ -1333,11 +1333,11 @@ mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const ch
camel_exception_clear (&ex);
return;
}
-
+
if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) ||
(prov->flags & CAMEL_PROVIDER_IS_EXTERNAL))
return;
-
+
store = camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
if (store == NULL) {
/* FIXME: real error dialog */
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 19e27ff142..7805e47715 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -316,12 +316,15 @@ account_able_clicked (GtkButton *button, gpointer user_data)
account->source->enabled = !account->source->enabled;
+#if 0
+ /* if the account got disabled, remove it from the folder-tree, otherwise add it to the folder-tree */
if (account->source && account->source->url) {
if (account->source->enabled)
mail_load_storage_by_uri (prefs->shell, account->source->url, account->name);
else
mail_remove_storage_by_uri (account->source->url);
}
+#endif
#if USE_ETABLE