diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-25 22:49:58 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-25 22:49:58 +0800 |
| commit | 17d13191decae2957d0b24f4d014de46828f5157 (patch) | |
| tree | 25d3928b22f7213c8ba26e19586cd6eb32f3b9a7 /mail/mail-account-gui.c | |
| parent | 7a0f761f14926e2b4454e05829ae4a27d9160a34 (diff) | |
| download | gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar.gz gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar.bz2 gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar.lz gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar.xz gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.tar.zst gsoc2013-evolution-17d13191decae2957d0b24f4d014de46828f5157.zip | |
Redo this to not use the CORBA interfaces in the local case (in
* mail-config-druid.c: Redo this to not use the CORBA interfaces
in the local case (in preparation for redoing the CORBA
interfaces).
(mail_config_druid_new): Remove unused "shell" arg
* mail-account-gui.c (mail_account_gui_transport_complete): Don't
crash if there's no transport selected at all.
(mail_account_gui_new): Don't try to set cc_addrs/bcc_addrs if
they're NULL.
* mail-accounts.c (account_add_clicked): Don't need to pass shell
to mail_config_druid_new.
* mail-callbacks.c (configure_mail): Don't need to pass shell to
mail_config_druid_new.
svn path=/trunk/; revision=20051
Diffstat (limited to 'mail/mail-account-gui.c')
| -rw-r--r-- | mail/mail-account-gui.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 12840630db..abedd1886f 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -333,6 +333,12 @@ mail_account_gui_auto_detect_extra_conf (MailAccountGui *gui) gboolean mail_account_gui_transport_complete (MailAccountGui *gui, GtkWidget **incomplete) { + if (!gui->transport.provider) { + if (incomplete) + *incomplete = GTK_WIDGET (gui->transport.type); + return FALSE; + } + /* If it's both source and transport, there's nothing extra to * configure on the transport page. */ @@ -1517,13 +1523,15 @@ mail_account_gui_new (EAccount *account, MailAccountsTab *dialog) gui->always_cc = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "always_cc")); gtk_toggle_button_set_active (gui->always_cc, account->always_cc); gui->cc_addrs = GTK_ENTRY (glade_xml_get_widget (gui->xml, "cc_addrs")); - gtk_entry_set_text (gui->cc_addrs, account->cc_addrs); + if (account->cc_addrs) + gtk_entry_set_text (gui->cc_addrs, account->cc_addrs); /* Always Bcc */ gui->always_bcc = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "always_bcc")); gtk_toggle_button_set_active (gui->always_bcc, account->always_bcc); gui->bcc_addrs = GTK_ENTRY (glade_xml_get_widget (gui->xml, "bcc_addrs")); - gtk_entry_set_text (gui->bcc_addrs, account->bcc_addrs); + if (account->bcc_addrs) + gtk_entry_set_text (gui->bcc_addrs, account->bcc_addrs); /* Security */ gui->pgp_key = GTK_ENTRY (glade_xml_get_widget (gui->xml, "pgp_key")); |