aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/component-factory.c7
-rw-r--r--mail/mail-display.c8
3 files changed, 14 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ef8fd20b02..3c2a38f0ec 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,8 +1,14 @@
2002-06-28 Jeffrey Stedfast <fejj@ximian.com>
+ * component-factory.c (mail_load_storages): Don't skip over
+ disabled accounts - put them in the folder tree too.
+
+2002-06-28 Jeffrey Stedfast <fejj@ximian.com>
+
Fixes bug #27055.
- * mail-accounts.c (account_add_finished): Unref the main accounts widget.
+ * mail-accounts.c (account_add_finished): Unref the main accounts
+ widget.
(account_add_clicked): Ref the main accounts widget.
(account_edit_finished): Unref the main accounts widget.
(account_edit_clicked): Ref the main accounts widget.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 3b14bba8af..b514bedcb5 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -1292,10 +1292,9 @@ add_storage (const char *name, const char *uri, CamelService *store,
switch (res) {
case EVOLUTION_STORAGE_OK:
- evolution_storage_has_subfolders (storage, "/",
- _("Connecting..."));
+ evolution_storage_has_subfolders (storage, "/", _("Connecting..."));
mail_hash_storage (store, storage);
- mail_note_store((CamelStore *)store, storage, CORBA_OBJECT_NIL, NULL, NULL);
+ mail_note_store ((CamelStore *) store, storage, CORBA_OBJECT_NIL, NULL, NULL);
/* falllll */
case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED:
case EVOLUTION_STORAGE_ERROR_EXISTS:
@@ -1420,7 +1419,7 @@ mail_load_storages (GNOME_Evolution_Shell shell, const GSList *sources, gboolean
name = NULL;
}
- if (service == NULL || service->url == NULL || service->url[0] == '\0' || !service->enabled)
+ if (service == NULL || service->url == NULL || service->url[0] == '\0')
continue;
mail_load_storage_by_uri (shell, service->url, name);
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 0debf65ed8..0832875605 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -35,10 +35,10 @@
#include <gtk/gtkinvisible.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-embedded.h>
-#include <gtkhtml/htmlengine.h> /* XXX */
-#include <gtkhtml/htmlobject.h> /* XXX */
-#include <gtkhtml/htmltext.h> /* XXX */
-#include <gtkhtml/htmlinterval.h> /* XXX */
+#include <gtkhtml/htmlengine.h>
+#include <gtkhtml/htmlobject.h>
+#include <gtkhtml/htmltext.h>
+#include <gtkhtml/htmlinterval.h>
#include <gtkhtml/gtkhtml-stream.h>
#include "e-util/e-html-utils.h"