aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-send-recv.c28
2 files changed, 30 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 374c06e971..a05e92e649 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-01-23 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-send-recv.c (build_dialogue): Make sure the source->url is
+ not NULL (which is perfectly valid).
+
* openpgp-utils.c:
* mail-crypto.c: A few minor tweaks.
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 0762733bf2..88dabcae55 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1,3 +1,24 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Michael Zucchi <NotZed@ximian.com>
+ *
+ * Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
#include <stdio.h>
#include <string.h>
@@ -170,7 +191,12 @@ static struct _send_data *build_dialogue(GSList *sources, CamelFolder *outbox, c
row = 0;
while (sources) {
MailConfigService *source = sources->data;
-
+
+ if (!source->url) {
+ sources = sources->next;
+ continue;
+ }
+
info = g_malloc0(sizeof(*info));
/* imap is handled differently */
if (!strncmp(source->url, "imap:", 5))