diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8f71d14ba3..bedc49a42d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-01-16 Chris Toshok <toshok@helixcode.com> + + * component-factory.c (owner_set_cb): only load the news storage + if ENABLE_NNTP. + + * mail-accounts.c (construct): if !ENABLE_NNTP, remove the news + page from the dialog. + 2001-01-16 Radek Doulik <rodo@helixcode.com> * mail-format.c (mail_generate_reply): use diff --git a/mail/component-factory.c b/mail/component-factory.c index 9e990c4d53..a88d303215 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -190,8 +190,10 @@ owner_set_cb (EvolutionShellComponent *shell_component, accounts = mail_config_get_accounts (); mail_load_storages (corba_shell, accounts, TRUE); +#ifdef ENABLE_NNTP news = mail_config_get_news (); mail_load_storages (corba_shell, news, FALSE); +#endif mail_local_storage_startup (shell_client, evolution_dir); diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 29353fea63..a5baecdc2f 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -361,6 +361,7 @@ construct (MailAccountsDialog *dialog) gtk_signal_connect (GTK_OBJECT (dialog->mail_default), "clicked", GTK_SIGNAL_FUNC (mail_default), dialog); +#if defined (ENABLE_NNTP) dialog->news_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts")); gtk_signal_connect (GTK_OBJECT (dialog->news_accounts), "select-row", GTK_SIGNAL_FUNC (news_select), dialog); @@ -375,6 +376,10 @@ construct (MailAccountsDialog *dialog) dialog->news_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsDelete")); gtk_signal_connect (GTK_OBJECT (dialog->news_delete), "clicked", GTK_SIGNAL_FUNC (news_delete), dialog); +#else + /* remove the news tab since we don't support nntp */ + gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), 1); +#endif /* now to fill in the clists */ dialog->accounts_row = -1; |