aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-02-25 03:38:57 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-02-25 03:38:57 +0800
commitf154a49a01a23a189d6eef3a3668ce01395c9e08 (patch)
tree818b4cc283620bd204ae61a192b8d819ab055bfe
parent9e43f181475e9783cf0c25732ef04ac60c3a2a40 (diff)
downloadgsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar.gz
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar.bz2
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar.lz
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar.xz
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.tar.zst
gsoc2013-evolution-f154a49a01a23a189d6eef3a3668ce01395c9e08.zip
Make sure m->config_service is non-NULL before using
2003-02-24 Jeffrey Stedfast <fejj@ximian.com> * mail-session.c (request_password): Make sure m->config_service is non-NULL before using m->config_service->save_passwd since PGP stuff will not have a config_service. Fixes bug #38149. * mail-account-gui.c (mail_account_gui_save): s/e_account_list_changed/e_account_list_change - otherwise we get an undefined symbol and we crash :-) svn path=/trunk/; revision=20043
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-account-gui.c2
-rw-r--r--mail/mail-session.c5
3 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 73451207f3..ba49d37224 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2003-02-24 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-session.c (request_password): Make sure m->config_service
+ is non-NULL before using m->config_service->save_passwd since PGP
+ stuff will not have a config_service. Fixes bug #38149.
+
+ * mail-account-gui.c (mail_account_gui_save):
+ s/e_account_list_changed/e_account_list_change - otherwise we get
+ an undefined symbol and we crash :-)
+
* mail-composer-prefs.c (mail_composer_prefs_new_signature): Don't
always append "[script]" to the signature name. Also cleaned up
some memory leakage.
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index bb458adebf..12840630db 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1975,7 +1975,7 @@ mail_account_gui_save (MailAccountGui *gui)
if (is_new) {
mail_config_add_account (account);
} else {
- e_account_list_changed(mail_config_get_accounts (), account);
+ e_account_list_change (mail_config_get_accounts (), account);
}
/* if the account provider is something we can stick
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 16e7fc6d1b..8da4d0e415 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -279,9 +279,10 @@ request_password (struct _pass_msg *m)
}
if (m->service_url == NULL || m->service != NULL) {
- m->check = gtk_check_button_new_with_mnemonic (m->service_url? _("_Remember this password") :
+ m->check = gtk_check_button_new_with_mnemonic (m->service_url ? _("_Remember this password") :
_("_Remember this password for the remainder of this session"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (m->check), m->config_service->save_passwd);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (m->check),
+ m->config_service ? m->config_service->save_passwd : FALSE);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), m->check, TRUE, FALSE, 0);
gtk_widget_show (m->check);
}