aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-account-editor.c10
-rw-r--r--mail/mail-account-gui.c4
3 files changed, 14 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7304237d0a..383dccaa59 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-27 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-account-editor.c (switch_page): Lets do some NULL checking
+ here. First, make sure the gsrc isn't NULL and also make sure that
+ account->source isn't NULL either.
+
+ * mail-account-gui.c (mail_account_gui_setup): If there isn't a
+ source_proto, make sure we select "None" as the source type.
+
2001-03-27 Dan Winship <danw@ximian.com>
* mail-config-druid.c (construct): set the initial druid button
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 5765e40cd3..279304d956 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -139,17 +139,15 @@ switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
MailAccountEditor *editor = user_data;
MailConfigService *source = editor->gui->account->source;
MailAccountGuiService *gsrc = &editor->gui->source;
- char *url;
+ char *url = NULL;
if (page_num != 2)
return;
- if (gsrc->provider && !strncmp (gsrc->provider->protocol, source->url,
- strlen (gsrc->provider->protocol)))
+ if (gsrc && gsrc->provider && source->url &&
+ !strncmp (gsrc->provider->protocol, source->url, strlen (source->url)))
url = source->url;
- else
- url = NULL;
-
+
mail_account_gui_build_extra_conf (editor->gui, url);
}
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 7ada3d75f3..198db8c11d 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -128,8 +128,6 @@ mail_account_gui_management_complete (MailAccountGui *gui)
}
-
-
static void
service_authtype_changed (GtkWidget *widget, gpointer user_data)
{
@@ -901,7 +899,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top)
gtk_widget_show (item);
- if (!fstore) {
+ if (!fstore || !source_proto) {
fstore = item;
hstore = si;
}