aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-01 04:06:38 +0800
committerDan Winship <danw@src.gnome.org>2000-08-01 04:06:38 +0800
commitd740e83295b6e6e72707b5d41dd61a984b56b549 (patch)
treec7a36be2035f6f0b65601c270c3ff78c21cda675
parent3ef60c2537f654d15bed4347dbc12076be3064fc (diff)
downloadgsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar.gz
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar.bz2
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar.lz
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar.xz
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.tar.zst
gsoc2013-evolution-d740e83295b6e6e72707b5d41dd61a984b56b549.zip
Fix a NULL-pointer strcmp noticed by peterw.
* mail-config.c (service_page_set_url): Fix a NULL-pointer strcmp noticed by peterw. svn path=/trunk/; revision=4429
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-config.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9619a906fa..e42dc3daf1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-31 Dan Winship <danw@helixcode.com>
+
+ * mail-config.c (service_page_set_url): Fix a NULL-pointer strcmp
+ noticed by peterw.
+
2000-07-31 Not Zed <NotZed@HelixCode.com>
* mail-vfolder.h: Header for vfolder functions.
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 39e4f14190..d6773b7fb8 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -922,7 +922,8 @@ service_page_set_url (MailDialogServicePage *page, MailConfigService *service)
authtype = gtk_object_get_data (GTK_OBJECT (item),
"authtype");
- if (!strcmp (authtype->authproto, url->authmech))
+ if ((!url->authmech && !*authtype->authproto) ||
+ (url->authmech && !strcmp (authtype->authproto, url->authmech))
service_page_item_auth_activate (item, spitem);
gtk_option_menu_set_history (GTK_OPTION_MENU (spitem->auth_optionmenu), i);
}