commit 11cdedccf39449396462b62ad48b55be01bd055d
parent e99cc993548bbf79cffd009dde4e15116a3faa33
Author: Oliver Lowe <o@olowe.co>
Date: Sat, 30 Aug 2025 16:57:41 +1000
Remove more nntp config
Diffstat:
15 files changed, 51 insertions(+), 607 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -172,7 +172,6 @@ claws_mailinclude_HEADERS = \
mh_gtk.h \
mimeview.h \
msgcache.h \
- news.h \
noticeview.h \
oauth2.h \
password.h \
diff --git a/src/account.c b/src/account.c
@@ -249,7 +249,7 @@ GList *account_find_all_from_address(GList *ac_list, const gchar *address)
for (cur = account_list; cur != NULL; cur = cur->next) {
ac = (PrefsAccount *)cur->data;
- if (ac->protocol != A_NNTP && ac->address &&
+ if (ac->address &&
strcasestr(address, ac->address) != NULL)
ac_list = g_list_append(ac_list, ac);
}
@@ -305,7 +305,7 @@ PrefsAccount *account_find_from_address(const gchar *address, gboolean newsgroup
for (cur = account_list; cur != NULL; cur = cur->next) {
ac = (PrefsAccount *)cur->data;
- if ((ac->protocol != A_NNTP || newsgroups_ok) && ac->address &&
+ if ((newsgroups_ok) && ac->address &&
g_ascii_strcasecmp(address, ac->address) == 0)
return ac;
}
@@ -418,16 +418,9 @@ void account_add(void)
account_list_view_set();
- if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
+ if (ac_prefs->protocol == A_IMAP4) {
Folder *folder;
-
- if (ac_prefs->protocol == A_IMAP4) {
- folder = folder_new(folder_get_class_from_string("imap"), ac_prefs->account_name,
- ac_prefs->recv_server);
- } else {
- folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
- ac_prefs->nntp_server);
- }
+ folder = folder_new(folder_get_class_from_string("imap"), ac_prefs->account_name, ac_prefs->recv_server);
if (folder == NULL) {
alertpanel_error(_("Can't create folder."));
return;
@@ -435,8 +428,7 @@ void account_add(void)
folder->account = ac_prefs;
ac_prefs->folder = folder;
folder_add(folder);
- if (ac_prefs->protocol == A_IMAP4)
- folder->klass->create_tree(folder);
+ folder->klass->create_tree(folder);
folderview_set_all();
folder_write_list();
}
@@ -526,26 +518,15 @@ void account_set_missing_folder(void)
for (cur = account_list; cur != NULL; cur = cur->next) {
ap = (PrefsAccount *)cur->data;
- if ((ap->protocol == A_IMAP4 || ap->protocol == A_NNTP) &&
- !ap->folder) {
- Folder *folder;
-
- if (ap->protocol == A_IMAP4) {
- folder = folder_new(folder_get_class_from_string("imap"), ap->account_name,
- ap->recv_server);
- } else {
- folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
- ap->nntp_server);
- }
+ if ((ap->protocol == A_IMAP4) && !ap->folder) {
+ Folder *folder = folder_new(folder_get_class_from_string("imap"), ap->account_name, ap->recv_server);
if (folder == NULL)
return;
folder->account = ap;
ap->folder = folder;
folder_add(folder);
- if (ap->protocol == A_IMAP4)
- folder->klass->create_tree(folder);
+ folder->klass->create_tree(folder);
folder_write_list();
-
}
}
}
@@ -901,7 +882,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
if (ac_prefs == NULL)
return;
- if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
+ if (ac_prefs->protocol == A_IMAP4) {
alertpanel_error(_("Accounts with remote folders cannot be copied."));
return;
}
@@ -920,9 +901,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(protocol);
ACP_FDUP(recv_server);
ACP_FDUP(smtp_server);
- ACP_FDUP(nntp_server);
- ACP_FASSIGN(use_nntp_auth);
- ACP_FASSIGN(use_nntp_auth_onconnect);
ACP_FDUP(userid);
ACP_FDUP(passwd);
@@ -932,7 +910,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(ssl_pop);
ACP_FASSIGN(ssl_imap);
- ACP_FASSIGN(ssl_nntp);
ACP_FASSIGN(ssl_smtp);
ACP_FASSIGN(use_nonblocking_ssl);
ACP_FASSIGN(use_tls_sni);
@@ -1023,8 +1000,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(popport);
ACP_FASSIGN(set_imapport);
ACP_FASSIGN(imapport);
- ACP_FASSIGN(set_nntpport);
- ACP_FASSIGN(nntpport);
ACP_FASSIGN(set_domain);
ACP_FDUP(domain);
ACP_FASSIGN(mark_crosspost_read);
@@ -1443,7 +1418,6 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
GtkTreeIter iter;
gboolean is_get_all = (ac_prefs->protocol == A_POP3 ||
ac_prefs->protocol == A_IMAP4 ||
- ac_prefs->protocol == A_NNTP ||
ac_prefs->protocol == A_LOCAL) &&
ac_prefs->recv_at_getall;
gchar *protocol, *server;
@@ -1459,21 +1433,16 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
"IMAP (TLS)" :
ac_prefs->ssl_imap == SSL_STARTTLS ?
"IMAP (STARTTLS)" : "IMAP") :
- ac_prefs->protocol == A_NNTP ?
- (ac_prefs->ssl_nntp == SSL_TUNNEL ?
- "NNTP (TLS)" : "NNTP") :
ac_prefs->protocol == A_LOCAL ? "Local" :
ac_prefs->protocol == A_NONE ? "SMTP" : "-";
#else
protocol = ac_prefs->protocol == A_POP3 ? "POP" :
ac_prefs->protocol == A_IMAP4 ? "IMAP" :
ac_prefs->protocol == A_LOCAL ? "Local" :
- ac_prefs->protocol == A_NNTP ? "NNTP" :
ac_prefs->protocol == A_NONE ? "SMTP" : "-";
#endif
- server= ac_prefs->protocol == A_NNTP ? ac_prefs->nntp_server :
- ac_prefs->protocol == A_LOCAL ? "-" :
+ server= ac_prefs->protocol == A_LOCAL ? "-" :
ac_prefs->protocol == A_NONE ? ac_prefs->smtp_server :
ac_prefs->recv_server;
@@ -1725,7 +1694,6 @@ static void account_get_all_toggled(GtkCellRendererToggle *widget,
/* check if the account has a selectable get all checkbox anyway... */
if (!(ac->protocol == A_POP3 ||
ac->protocol == A_IMAP4 ||
- ac->protocol == A_NNTP ||
ac->protocol == A_LOCAL))
return;
diff --git a/src/compose.c b/src/compose.c
@@ -67,7 +67,6 @@
#include "stock_pixmap.h"
#include "send_message.h"
#include "imap.h"
-#include "news.h"
#include "customheader.h"
#include "prefs_common.h"
#include "prefs_account.h"
@@ -909,13 +908,11 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_place_cursor(textbuf, &iter);
- if (account->protocol != A_NNTP) {
- if (mailto && *mailto != '\0') {
- mfield = compose_entries_set(compose, mailto, COMPOSE_TO);
- } else {
- compose_set_folder_prefs(compose, item, TRUE);
- }
- }
+ if (mailto && *mailto != '\0')
+ mfield = compose_entries_set(compose, mailto, COMPOSE_TO);
+ else
+ compose_set_folder_prefs(compose, item, TRUE);
+
compose_add_field_list( compose, listAddress );
if (item && item->prefs && item->prefs->compose_with_format) {
@@ -3075,7 +3072,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
default_reply_to = msginfo->folder &&
msginfo->folder->prefs->enable_default_reply_to;
- if (compose->account->protocol != A_NNTP) {
+ if (1) {
compose_set_folder_prefs(compose, msginfo->folder, FALSE);
if (reply_to_ml && !default_reply_to) {
@@ -3152,44 +3149,11 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
}
}
}
- } else {
- if (to_sender || (compose->followup_to &&
- !strncmp(compose->followup_to, "poster", 6)))
- compose_entry_append
- (compose,
- (compose->replyto ? compose->replyto :
- msginfo->from ? msginfo->from : ""),
- COMPOSE_TO, PREF_NONE);
-
- else if (followup_and_reply_to || to_all) {
- compose_entry_append
- (compose,
- (compose->replyto ? compose->replyto :
- msginfo->from ? msginfo->from : ""),
- COMPOSE_TO, PREF_NONE);
-
- compose_entry_append
- (compose,
- compose->followup_to ? compose->followup_to :
- compose->newsgroups ? compose->newsgroups : "",
- COMPOSE_NEWSGROUPS, PREF_NONE);
-
- compose_entry_append
- (compose,
- msginfo->cc ? msginfo->cc : "",
- COMPOSE_CC, PREF_NONE);
- }
- else
- compose_entry_append
- (compose,
- compose->followup_to ? compose->followup_to :
- compose->newsgroups ? compose->newsgroups : "",
- COMPOSE_NEWSGROUPS, PREF_NONE);
}
compose_reply_set_subject(compose, msginfo);
if (to_ml && compose->ml_post) return;
- if (!to_all || compose->account->protocol == A_NNTP) return;
+ if (!to_all) return;
if (compose->replyto) {
Xstrdup_a(replyto, compose->replyto, return);
@@ -4609,11 +4573,11 @@ compose_current_mail_account(void)
{
PrefsAccount *ac;
- if (cur_account && cur_account->protocol != A_NNTP)
+ if (cur_account)
ac = cur_account;
else {
ac = account_get_default();
- if (!ac || ac->protocol == A_NNTP) {
+ if (!ac) {
alertpanel_error(_("Account for sending mail is not specified.\n"
"Please select a mail account before sending."));
return NULL;
@@ -4749,7 +4713,7 @@ gboolean compose_check_for_valid_recipient(Compose *compose) {
slist_free_strings_full(compose->newsgroup_list);
compose->newsgroup_list = NULL;
- /* search header entries for to and newsgroup entries */
+ /* search header entries for to */
for (list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
@@ -4764,12 +4728,6 @@ gboolean compose_check_for_valid_recipient(Compose *compose) {
recipient_found = TRUE;
}
}
- for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
- if (!g_ascii_strcasecmp(header, prefs_common_translated_header_name(*strptr))) {
- compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
- recipient_found = TRUE;
- }
- }
}
g_free(header);
g_free(entry);
@@ -5774,7 +5732,7 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
FILE *fp;
GSList *cur;
gint num;
- PrefsAccount *mailac = NULL, *newsac = NULL;
+ PrefsAccount *mailac = NULL;
gboolean err = FALSE;
debug_print("queueing message...\n");
@@ -5794,7 +5752,7 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
if (compose->to_list) {
mailac = compose->account;
- if (!mailac && cur_account && cur_account->protocol != A_NNTP)
+ if (!mailac && cur_account)
mailac = cur_account;
else if (!mailac && !(mailac = compose_current_mail_account())) {
alertpanel_error(_("No account for sending mails available!"));
@@ -5802,15 +5760,6 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
}
}
- if (compose->newsgroup_list) {
- if (compose->account->protocol == A_NNTP)
- newsac = compose->account;
- else {
- alertpanel_error(_("Selected account isn't NNTP: Posting is impossible."));
- return COMPOSE_QUEUE_ERROR_NO_MSG;
- }
- }
-
/* write queue header */
tmp = g_strdup_printf("%s%cqueue.%p%08x", get_tmp_dir(),
G_DIR_SEPARATOR, compose, (guint) rand());
@@ -5845,10 +5794,7 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
err |= (fprintf(fp, "SSV:%s\n", mailac->smtp_server) < 0);
else
err |= (fprintf(fp, "SSV:\n") < 0);
- if (newsac)
- err |= (fprintf(fp, "NSV:%s\n", newsac->nntp_server) < 0);
- else
- err |= (fprintf(fp, "NSV:\n") < 0);
+ err |= (fprintf(fp, "NSV:\n") < 0);
err |= (fprintf(fp, "SSH:\n") < 0);
/* write recipient list */
if (compose->to_list) {
@@ -5869,9 +5815,6 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
/* account IDs */
if (mailac)
err |= (fprintf(fp, "MAID:%d\n", mailac->account_id) < 0);
- if (newsac)
- err |= (fprintf(fp, "NAID:%d\n", newsac->account_id) < 0);
-
if (compose->privacy_system != NULL) {
err |= (fprintf(fp, "X-Claws-Privacy-System:%s\n", compose->privacy_system) < 0);
@@ -6400,14 +6343,6 @@ static gchar *compose_get_header(Compose *compose)
/* Cc */
compose_add_headerfield_from_headerlist(compose, header, "Cc", ", ");
- /* Bcc */
- /*
- * If this account is a NNTP account remove Bcc header from
- * message body since it otherwise will be publicly shown
- */
- if (compose->account->protocol != A_NNTP)
- compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
-
/* Subject */
str = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
@@ -6766,9 +6701,6 @@ static void compose_create_header_entry(Compose *compose)
}
if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
- case A_NNTP:
- header = prefs_common_translated_header_name("Newsgroups:");
- break;
default:
header = prefs_common_translated_header_name("To:");
break;
@@ -7605,12 +7537,7 @@ static Compose *compose_create(PrefsAccount *account,
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO, PREF_ACCOUNT);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode", compose->mode == COMPOSE_REPLY);
- if (account->protocol != A_NNTP)
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))),
- prefs_common_translated_header_name("To:"));
- else
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))),
- prefs_common_translated_header_name("Newsgroups:"));
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))), prefs_common_translated_header_name("To:"));
addressbook_set_target_compose(compose);
@@ -8940,9 +8867,7 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
}
g_slist_free(saved_list);
- combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
- (ac->protocol == A_NNTP) ?
- COMPOSE_NEWSGROUPS : COMPOSE_TO);
+ combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),COMPOSE_TO);
}
/* Set message save folder */
@@ -10937,23 +10862,6 @@ void compose_check_for_email_account(Compose *compose)
if (!compose)
return;
-
- if (compose->account && compose->account->protocol == A_NNTP) {
- ac = account_get_cur_account();
- if (ac->protocol == A_NNTP) {
- list = account_get_list();
-
- for( ; list != NULL ; list = g_list_next(list)) {
- curr = (PrefsAccount *) list->data;
- if (curr->protocol != A_NNTP) {
- ac = curr;
- break;
- }
- }
- }
- combobox_select_by_data(GTK_COMBO_BOX(compose->account_combo),
- ac->account_id);
- }
}
void compose_reply_to_address(MessageView *msgview, MsgInfo *msginfo,
diff --git a/src/folder.c b/src/folder.c
@@ -37,7 +37,6 @@
#include "session.h"
#include "inc.h"
#include "imap.h"
-#include "news.h"
#include "mh.h"
#include "utils.h"
#include "xml.h"
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -214,6 +214,7 @@ static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
{
GtkWidget *scrolledwin;
+ debug_print("prefswindow_build_page %s\n", page->path);
if (!page->page_open) {
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwin);
@@ -222,7 +223,6 @@ static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
gtk_container_add(GTK_CONTAINER(scrolledwin), page->widget);
-
gtk_container_add(GTK_CONTAINER(prefswindow->notebook), scrolledwin);
page->widget = scrolledwin;
@@ -233,11 +233,9 @@ static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
static GSList *prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_pages)
{
GSList *cur;
-
prefs_pages = g_slist_reverse(prefs_pages);
for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
PrefsPage *page = (PrefsPage *) cur->data;
-
prefswindow_build_page(prefswindow, page);
}
return g_slist_reverse(prefs_pages);
@@ -266,8 +264,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
find_name.found = FALSE;
find_name.name = page->path[i];
- /* find node to attach to
- * FIXME: we search the entire tree, so this is suboptimal... */
+ /* find node to attach to */
gtk_tree_model_foreach(GTK_TREE_MODEL(store),
(GtkTreeModelForeachFunc) find_node_by_name,
&find_name);
diff --git a/src/inc.c b/src/inc.c
@@ -243,7 +243,6 @@ static gint inc_account_mail_real(MainWindow *mainwin, PrefsAccount *account)
switch (account->protocol) {
case A_IMAP4:
- case A_NNTP:
/* Melvin: bug [14]
* FIXME: it should return foldeview_check_new() value.
* TODO: do it when bug [19] is fixed (IMAP folder sets
@@ -361,7 +360,6 @@ void inc_account_list_mail(MainWindow *mainwin, GList *account_list, gboolean au
break;
case A_IMAP4:
- case A_NNTP:
new_msgs += folderview_check_new(FOLDER(account->folder));
break;
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -423,10 +423,6 @@ static void mw_compose_mail_cb (GtkAction *gaction, gpointer data)
{
compose_mail_cb(data, 0, NULL);
}
-static void mw_compose_news_cb (GtkAction *gaction, gpointer data)
-{
- compose_news_cb(data, 0, NULL);
-}
/* make sure to keep the tables below in sync with the default_menurc[] in prefs_other.c */
static GtkActionEntry mainwin_entries[] =
@@ -568,7 +564,6 @@ static GtkActionEntry mainwin_entries[] =
{"Message/---", NULL, "---", NULL, NULL, NULL },
{"Message/ComposeEmail", NULL, N_("Write a_n email message"), "<control>M", NULL, G_CALLBACK(mw_compose_mail_cb) },
- {"Message/ComposeNews", NULL, N_("Write a news message"), NULL, NULL, G_CALLBACK(mw_compose_news_cb) },
{"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(main_window_reply_cb) }, /* COMPOSE_REPLY */
{"Message/ReplyTo", NULL, N_("Repl_y to"), NULL, NULL, NULL },
@@ -1208,7 +1203,6 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeEmail", "Message/ComposeEmail", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeNews", "Message/ComposeNews", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
@@ -2333,13 +2327,6 @@ SensitiveCondMask main_window_get_current_state(MainWindow *mainwin)
}
}
- for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
- if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
- UPDATE_STATE(M_HAVE_NEWS_ACCOUNT);
- break;
- }
- }
-
if (procmsg_spam_can_learn() &&
(mainwin->summaryview->folder_item &&
mainwin->summaryview->folder_item->folder->klass->type != F_UNKNOWN &&
@@ -2472,7 +2459,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
SET_SENSITIVE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
SET_SENSITIVE("Menu/Message/CancelSending", M_SEND_ACTIVE);
SET_SENSITIVE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
- SET_SENSITIVE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
SET_SENSITIVE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
diff --git a/src/messageview.c b/src/messageview.c
@@ -2145,15 +2145,8 @@ static void compose_cb(GtkAction *action, gpointer data)
if (messageview->msginfo)
item = messageview->msginfo->folder;
-
- if (item) {
+ if (item)
ac = account_find_from_item(item);
- if (ac && ac->protocol == A_NNTP &&
- FOLDER_TYPE(item->folder) == F_NEWS) {
- compose_new(ac, item->path, NULL);
- return;
- }
- }
compose_new(ac, NULL, NULL);
}
diff --git a/src/news.h b/src/news.h
@@ -1,38 +0,0 @@
-/*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __NEWS_H__
-#define __NEWS_H__
-
-#include <glib.h>
-#include <stdio.h>
-
-typedef struct _NewsGroupInfo NewsGroupInfo;
-
-#include "folder.h"
-
-struct _NewsGroupInfo
-{
- gchar *name;
- guint first;
- guint last;
- gchar type;
-};
-
-#endif /* __NEWS_H__ */
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -123,14 +123,10 @@ typedef struct BasicPage
gpointer *protocol_optmenu;
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
- GtkWidget *nntpserv_label;
GtkWidget *localmbox_label;
GtkWidget *mailcmd_label;
GtkWidget *recvserv_entry;
GtkWidget *smtpserv_entry;
- GtkWidget *nntpserv_entry;
- GtkWidget *nntpauth_checkbtn;
- GtkWidget *nntpauth_onconnect_checkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_checkbtn;
GtkWidget *mailcmd_entry;
@@ -176,11 +172,6 @@ typedef struct ReceivePage
GtkWidget *low_bandwidth_checkbtn;
GtkWidget *imap_batch_size_spinbtn;
- GtkWidget *frame_maxarticle;
- GtkWidget *maxarticle_label;
- GtkWidget *maxarticle_spinbtn;
- GtkAdjustment *maxarticle_spinbtn_adj;
-
GtkWidget *autochk_checkbtn;
GtkWidget *autochk_use_default_checkbtn;
struct AutocheckWidgets *autochk_widgets;
@@ -252,9 +243,9 @@ typedef struct ComposePage
typedef struct TemplatesPage
{
- PrefsPage page;
+ PrefsPage page;
- GtkWidget *vbox;
+ GtkWidget *vbox;
GtkWidget *checkbtn_compose_with_format;
GtkWidget *compose_subject_format;
@@ -296,10 +287,6 @@ typedef struct SSLPage
GtkWidget *imap_ssltunnel_radiobtn;
GtkWidget *imap_starttls_radiobtn;
- GtkWidget *nntp_frame;
- GtkWidget *nntp_nossl_radiobtn;
- GtkWidget *nntp_ssltunnel_radiobtn;
-
GtkWidget *send_frame;
GtkWidget *smtp_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_radiobtn;
@@ -327,9 +314,6 @@ typedef struct AdvancedPage
GtkWidget *imapport_hbox;
GtkWidget *imapport_checkbtn;
GtkWidget *imapport_spinbtn;
- GtkWidget *nntpport_hbox;
- GtkWidget *nntpport_checkbtn;
- GtkWidget *nntpport_spinbtn;
GtkWidget *domain_checkbtn;
GtkWidget *domain_entry;
@@ -371,7 +355,6 @@ struct BasicProtocol {
static char *protocol_names[] = {
N_("POP"),
N_("IMAP"),
- N_("News (NNTP)"),
N_("Local mbox file"),
N_("None (SMTP only)")
};
@@ -415,7 +398,6 @@ static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam);
static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
-static void prefs_account_nntpauth_toggled(GtkToggleButton *button, gpointer user_data);
static void prefs_account_mailcmd_toggled(GtkToggleButton *button, gpointer user_data);
static void prefs_account_showpwd_toggled(GtkEntry *entry, gpointer user_data);
@@ -449,9 +431,6 @@ static PrefParam basic_param[] = {
{"smtp_server", NULL, &tmp_ac_prefs.smtp_server, P_STRING,
&basic_page.smtpserv_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING,
- &basic_page.nntpserv_entry, prefs_set_data_from_entry, prefs_set_entry},
-
{"local_mbox", "/var/mail", &tmp_ac_prefs.local_mbox, P_STRING,
&basic_page.localmbox_entry, prefs_set_data_from_entry, prefs_set_entry},
@@ -461,14 +440,6 @@ static PrefParam basic_param[] = {
{"mail_command", DEFAULT_SENDMAIL_CMD, &tmp_ac_prefs.mail_command, P_STRING,
&basic_page.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
- &basic_page.nntpauth_checkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
- {"use_nntp_auth_onconnect", "FALSE", &tmp_ac_prefs.use_nntp_auth_onconnect, P_BOOL,
- &basic_page.nntpauth_onconnect_checkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
{"user_id", NULL, &tmp_ac_prefs.userid, P_STRING,
&basic_page.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
@@ -514,10 +485,6 @@ static PrefParam receive_param[] = {
&receive_page.recvatgetall_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"max_news_articles", "300", &tmp_ac_prefs.max_articles, P_INT,
- &receive_page.maxarticle_spinbtn,
- prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
{"inbox", "#mh/Mailbox/inbox", &tmp_ac_prefs.inbox, P_STRING,
&receive_page.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
@@ -768,11 +735,6 @@ static PrefParam ssl_param[] = {
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
- {"ssl_nntp", "1", &tmp_ac_prefs.ssl_nntp, P_ENUM,
- &ssl_page.nntp_nossl_radiobtn,
- prefs_account_enum_set_data_from_radiobtn,
- prefs_account_enum_set_radiobtn},
-
{"ssl_smtp", "1", &tmp_ac_prefs.ssl_smtp, P_ENUM,
&ssl_page.smtp_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
@@ -803,9 +765,6 @@ static PrefParam ssl_param[] = {
{"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
NULL, NULL, NULL},
- {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
- NULL, NULL, NULL},
-
{"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
NULL, NULL, NULL},
@@ -853,14 +812,6 @@ static PrefParam advanced_param[] = {
&advanced_page.imapport_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
- {"set_nntpport", "FALSE", &tmp_ac_prefs.set_nntpport, P_BOOL,
- &advanced_page.nntpport_checkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
- {"nntp_port", "119", &tmp_ac_prefs.nntpport, P_USHORT,
- &advanced_page.nntpport_spinbtn,
- prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
{"set_domain", "FALSE", &tmp_ac_prefs.set_domain, P_BOOL,
&advanced_page.domain_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
@@ -1023,14 +974,10 @@ static void basic_create_widget_func(PrefsPage * _page,
GtkWidget *serv_table;
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
- GtkWidget *nntpserv_label;
GtkWidget *localmbox_label;
GtkWidget *mailcmd_label;
GtkWidget *recvserv_entry;
GtkWidget *smtpserv_entry;
- GtkWidget *nntpserv_entry;
- GtkWidget *nntpauth_checkbtn;
- GtkWidget *nntpauth_onconnect_checkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_checkbtn;
GtkWidget *mailcmd_entry;
@@ -1185,24 +1132,6 @@ static void basic_create_widget_func(PrefsPage * _page,
gtk_grid_set_column_spacing(GTK_GRID(serv_table), 8);
gtk_box_pack_start (GTK_BOX (vbox2), serv_table, FALSE, FALSE, 0);
- nntpserv_entry = gtk_entry_new ();
- gtk_widget_show (nntpserv_entry);
- gtk_grid_attach(GTK_GRID(serv_table), nntpserv_entry, 1, 0, 2, 1);
- gtk_widget_set_hexpand(nntpserv_entry, TRUE);
- gtk_widget_set_halign(nntpserv_entry, GTK_ALIGN_FILL);
-
- nntpauth_checkbtn = gtk_check_button_new_with_label
- (_("This server requires authentication"));
- gtk_widget_show (nntpauth_checkbtn);
-
- gtk_grid_attach(GTK_GRID(serv_table), nntpauth_checkbtn, 0, 6, 2, 1);
-
- nntpauth_onconnect_checkbtn = gtk_check_button_new_with_label
- (_("Authenticate on connect"));
- gtk_widget_show (nntpauth_onconnect_checkbtn);
-
- gtk_grid_attach(GTK_GRID(serv_table), nntpauth_onconnect_checkbtn, 2, 6, 1, 1);
-
recvserv_entry = gtk_entry_new ();
gtk_widget_show (recvserv_entry);
gtk_grid_attach(GTK_GRID(serv_table), recvserv_entry, 1, 2, 2, 1);
@@ -1251,11 +1180,6 @@ static void basic_create_widget_func(PrefsPage * _page,
g_signal_connect(pass_entry, "icon-press",
G_CALLBACK(prefs_account_showpwd_toggled), NULL);
- nntpserv_label = gtk_label_new (_("News server"));
- gtk_widget_show (nntpserv_label);
- gtk_label_set_xalign(GTK_LABEL (nntpserv_label), 1.0);
- gtk_grid_attach(GTK_GRID(serv_table), nntpserv_label, 0, 0, 1, 1);
-
recvserv_label = gtk_label_new (_("Server for receiving"));
gtk_widget_show (recvserv_label);
gtk_label_set_xalign(GTK_LABEL (recvserv_label), 1.0);
@@ -1295,12 +1219,6 @@ static void basic_create_widget_func(PrefsPage * _page,
gtk_label_set_xalign(GTK_LABEL (pass_label), 1.0);
gtk_grid_attach(GTK_GRID(serv_table), pass_label, 0, 8, 1, 1);
- SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_label);
- SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, pass_label);
- SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_entry);
- SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, pass_entry);
- SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, nntpauth_onconnect_checkbtn);
-
page->acname_entry = acname_entry;
page->default_checkbtn = default_checkbtn;
@@ -1315,10 +1233,6 @@ static void basic_create_widget_func(PrefsPage * _page,
page->recvserv_entry = recvserv_entry;
page->smtpserv_label = smtpserv_label;
page->smtpserv_entry = smtpserv_entry;
- page->nntpserv_label = nntpserv_label;
- page->nntpserv_entry = nntpserv_entry;
- page->nntpauth_checkbtn = nntpauth_checkbtn;
- page->nntpauth_onconnect_checkbtn = nntpauth_onconnect_checkbtn;
page->localmbox_label = localmbox_label;
page->localmbox_entry = localmbox_entry;
page->mailcmd_checkbtn = mailcmd_checkbtn;
@@ -1401,10 +1315,7 @@ static void receive_create_widget_func(PrefsPage * _page,
GtkTreeIter iter;
GtkWidget *recvatgetall_checkbtn;
- GtkWidget *frame, *frame2;
- GtkWidget *maxarticle_label;
- GtkWidget *maxarticle_spinbtn;
- GtkAdjustment *maxarticle_spinbtn_adj;
+ GtkWidget *frame;
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
@@ -1535,30 +1446,6 @@ static void receive_create_widget_func(PrefsPage * _page,
G_CALLBACK (prefs_account_select_folder_cb),
inbox_entry);
- vbox2 = gtkut_get_options_frame(vbox1, &frame2, _("NNTP"));
-
- hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
-
- maxarticle_label = gtk_label_new
- (_("Maximum number of articles to download"));
- gtk_widget_show (maxarticle_label);
- gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
-
- maxarticle_spinbtn_adj =
- GTK_ADJUSTMENT(gtk_adjustment_new (300, 0, 10000, 10, 100, 0));
- maxarticle_spinbtn = gtk_spin_button_new
- (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
- gtk_widget_show (maxarticle_spinbtn);
- CLAWS_SET_TIP(maxarticle_spinbtn,
- _("unlimited if 0 is specified"));
- gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_spinbtn,
- FALSE, FALSE, 0);
- gtk_widget_set_size_request (maxarticle_spinbtn, 64, -1);
- gtk_spin_button_set_numeric
- (GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
-
vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
@@ -1731,10 +1618,6 @@ static void receive_create_widget_func(PrefsPage * _page,
page->recvatgetall_checkbtn = recvatgetall_checkbtn;
- page->frame_maxarticle = frame2;
- page->maxarticle_spinbtn = maxarticle_spinbtn;
- page->maxarticle_spinbtn_adj = maxarticle_spinbtn_adj;
-
page->autochk_checkbtn = autochk_checkbtn;
page->autochk_widgets = autochk_widgets;
page->autochk_use_default_checkbtn = autochk_use_default_checkbtn;
@@ -2047,7 +1930,6 @@ static void oauth2_create_widget_func(PrefsPage * _page,
Oauth2Info *oa2;
for (cur = oauth2_providers_list; cur != NULL; cur = cur->next) {
oa2 = (Oauth2Info *)cur->data;
- debug_print("Building menu Oauth2 name: %s number: %i\n", oa2->oa2_name, j);
COMBOBOX_ADD (menu, oa2->oa2_name, j);
j++;
}
@@ -2198,7 +2080,6 @@ static void oauth2_create_widget_func(PrefsPage * _page,
g_free(buf);
}
}
-
}
#endif
@@ -2596,18 +2477,6 @@ static void imap_ssltunnel_toggled(GtkToggleButton *button,
active ? 993 : 143);
}
-static void nntp_ssltunnel_toggled(GtkToggleButton *button,
- gpointer data)
-{
- gboolean active = gtk_toggle_button_get_active(button);
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
- advanced_page.nntpport_checkbtn)) == TRUE)
- return;
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.nntpport_spinbtn),
- active ? 563 : 119);
-}
-
static void smtp_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
@@ -2641,11 +2510,6 @@ static void ssl_create_widget_func(PrefsPage * _page,
GtkWidget *imap_ssltunnel_radiobtn;
GtkWidget *imap_starttls_radiobtn;
- GtkWidget *nntp_frame;
- GtkWidget *vbox4;
- GtkWidget *nntp_nossl_radiobtn;
- GtkWidget *nntp_ssltunnel_radiobtn;
-
GtkWidget *send_frame;
GtkWidget *vbox5;
GtkWidget *smtp_nossl_radiobtn;
@@ -2698,22 +2562,6 @@ static void ssl_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled",
G_CALLBACK(imap_ssltunnel_toggled), NULL);
- vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
-
- nntp_nossl_radiobtn =
- gtk_radio_button_new_with_label (NULL, _("Don't use TLS"));
- gtk_widget_show (nntp_nossl_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
- FALSE, FALSE, 0);
- g_object_set_data (G_OBJECT (nntp_nossl_radiobtn),
- MENU_VAL_ID,
- GINT_TO_POINTER (SSL_NONE));
-
- CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
- _("Use TLS"), SSL_TUNNEL);
- g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
- G_CALLBACK(nntp_ssltunnel_toggled), NULL);
-
vbox5 = gtkut_get_options_frame(vbox1, &send_frame, _("Send (SMTP)"));
CREATE_RADIO_BUTTONS(vbox5,
@@ -2841,10 +2689,6 @@ static void ssl_create_widget_func(PrefsPage * _page,
page->imap_ssltunnel_radiobtn = imap_ssltunnel_radiobtn;
page->imap_starttls_radiobtn = imap_starttls_radiobtn;
- page->nntp_frame = nntp_frame;
- page->nntp_nossl_radiobtn = nntp_nossl_radiobtn;
- page->nntp_ssltunnel_radiobtn = nntp_ssltunnel_radiobtn;
-
page->send_frame = send_frame;
page->smtp_nossl_radiobtn = smtp_nossl_radiobtn;
page->smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
@@ -2908,9 +2752,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
GtkWidget *hbox_imapport;
GtkWidget *checkbtn_imapport;
GtkWidget *spinbtn_imapport;
- GtkWidget *hbox_nntpport;
- GtkWidget *checkbtn_nntpport;
- GtkWidget *spinbtn_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
gchar *tip_domain;
@@ -2971,13 +2812,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (checkbtn_imapport, spinbtn_imapport);
gtk_size_group_add_widget(size_group, checkbtn_imapport);
- PACK_HBOX (hbox_nntpport);
- PACK_CHECK_BUTTON (hbox_nntpport, checkbtn_nntpport,
- _("NNTP port"));
- PACK_PORT_SPINBTN (hbox_nntpport, spinbtn_nntpport);
- SET_TOGGLE_SENSITIVITY (checkbtn_nntpport, spinbtn_nntpport);
- gtk_size_group_add_widget(size_group, checkbtn_nntpport);
-
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name"));
gtk_size_group_add_widget(size_group, checkbtn_domain);
@@ -3057,9 +2891,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
page->imapport_hbox = hbox_imapport;
page->imapport_checkbtn = checkbtn_imapport;
page->imapport_spinbtn = spinbtn_imapport;
- page->nntpport_hbox = hbox_nntpport;
- page->nntpport_checkbtn = checkbtn_nntpport;
- page->nntpport_spinbtn = spinbtn_nntpport;
page->domain_checkbtn = checkbtn_domain;
page->domain_entry = entry_domain;
page->tunnelcmd_checkbtn = checkbtn_tunnelcmd;
@@ -3154,11 +2985,6 @@ static gint prefs_basic_apply(void)
alertpanel_error(_("IMAP server is not entered."));
return -1;
}
- if (protocol == A_NNTP &&
- *gtk_entry_get_text(GTK_ENTRY(basic_page.nntpserv_entry)) == '\0') {
- alertpanel_error(_("NNTP server is not entered."));
- return -1;
- }
if (protocol == A_LOCAL &&
*gtk_entry_get_text(GTK_ENTRY(basic_page.localmbox_entry)) == '\0') {
@@ -3172,9 +2998,8 @@ static gint prefs_basic_apply(void)
return -1;
}
- if (protocol == A_IMAP4 || protocol == A_NNTP)
- old_id = g_strdup_printf("#%s/%s",
- protocol == A_IMAP4 ? "imap":"news",
+ if (protocol == A_IMAP4)
+ old_id = g_strdup_printf("#imap/%s",
tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
if (strchr(gtk_entry_get_text(GTK_ENTRY(basic_page.uid_entry)), '\n') != NULL) {
@@ -3204,10 +3029,8 @@ static gint prefs_basic_apply(void)
passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
#endif
- if (protocol == A_IMAP4 || protocol == A_NNTP) {
- new_id = g_strdup_printf("#%s/%s",
- protocol == A_IMAP4 ? "imap":"news",
- tmp_ac_prefs.account_name);
+ if (protocol == A_IMAP4) {
+ new_id = g_strdup_printf("#imap/%s", tmp_ac_prefs.account_name);
if (old_id)
g_free(old_id);
if (new_id)
@@ -4192,8 +4015,6 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
g_strstrip(ac_prefs->recv_server);
if (ac_prefs->smtp_server)
g_strstrip(ac_prefs->smtp_server);
- if (ac_prefs->nntp_server)
- g_strstrip(ac_prefs->nntp_server);
return ac_prefs;
}
@@ -4834,92 +4655,13 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
switch(protocol) {
- case A_NNTP:
- gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
- gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
- gtk_widget_show(send_page.msgid_checkbtn);
- gtk_widget_show(send_page.xmailer_checkbtn);
- gtk_widget_show(basic_page.nntpserv_label);
- gtk_widget_show(basic_page.nntpserv_entry);
- gtk_grid_set_row_spacing(GTK_GRID(basic_page.serv_table), VSPACING_NARROW);
-
- gtk_widget_set_sensitive(basic_page.nntpauth_checkbtn, TRUE);
- gtk_widget_show(basic_page.nntpauth_checkbtn);
-
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, TRUE);
- gtk_widget_show(basic_page.nntpauth_onconnect_checkbtn);
-
- gtk_widget_hide(basic_page.recvserv_label);
- gtk_widget_hide(basic_page.recvserv_entry);
- gtk_widget_show(basic_page.smtpserv_label);
- gtk_widget_show(basic_page.smtpserv_entry);
- gtk_widget_hide(basic_page.localmbox_label);
- gtk_widget_hide(basic_page.localmbox_entry);
- gtk_widget_hide(basic_page.mailcmd_label);
- gtk_widget_hide(basic_page.mailcmd_entry);
- gtk_widget_hide(basic_page.mailcmd_checkbtn);
- gtk_widget_show(basic_page.uid_label);
- gtk_widget_show(basic_page.pass_label);
- gtk_widget_show(basic_page.uid_entry);
- gtk_widget_show(basic_page.pass_entry);
-
- gtk_widget_set_sensitive(basic_page.uid_label, TRUE);
- gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
- gtk_widget_set_sensitive(basic_page.uid_entry, TRUE);
- gtk_widget_set_sensitive(basic_page.pass_entry, TRUE);
-
- /* update userid/passwd sensitive state */
-
- prefs_account_nntpauth_toggled
- (GTK_TOGGLE_BUTTON(basic_page.nntpauth_checkbtn), NULL);
- gtk_widget_hide(receive_page.pop3_frame);
- gtk_widget_hide(receive_page.imap_frame);
- gtk_widget_hide(receive_page.local_frame);
- gtk_widget_show(receive_page.autochk_frame);
- gtk_widget_show(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
- /* update pop_before_smtp sensitivity */
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn), FALSE);
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn, FALSE);
-
- if (!tmp_ac_prefs.account_name) {
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
- FALSE);
- }
-
-#ifdef USE_GNUTLS
- gtk_widget_hide(ssl_page.pop_frame);
- gtk_widget_hide(ssl_page.imap_frame);
- gtk_widget_show(ssl_page.nntp_frame);
- gtk_widget_show(ssl_page.send_frame);
-#endif
- gtk_widget_hide(advanced_page.popport_hbox);
- gtk_widget_hide(advanced_page.imapport_hbox);
- gtk_widget_show(advanced_page.nntpport_hbox);
- gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
- gtk_widget_hide(advanced_page.tunnelcmd_entry);
- gtk_widget_hide(receive_page.imapdir_label);
- gtk_widget_hide(receive_page.imapdir_entry);
- gtk_widget_hide(receive_page.subsonly_checkbtn);
- gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
- gtk_widget_hide(receive_page.imap_batch_size_spinbtn);
- break;
case A_LOCAL:
gtk_widget_show(send_page.msgid_checkbtn);
gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
- gtk_widget_hide(basic_page.nntpserv_label);
- gtk_widget_hide(basic_page.nntpserv_entry);
- gtk_widget_set_sensitive(basic_page.nntpauth_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_checkbtn);
gtk_grid_set_row_spacing(GTK_GRID(basic_page.serv_table), VSPACING_NARROW);
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_onconnect_checkbtn);
gtk_widget_hide(basic_page.recvserv_label);
gtk_widget_hide(basic_page.recvserv_entry);
gtk_widget_show(basic_page.smtpserv_label);
@@ -4942,7 +4684,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.imap_frame);
gtk_widget_show(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
- gtk_widget_hide(receive_page.frame_maxarticle);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic_page.mailcmd_checkbtn), NULL);
@@ -4962,12 +4703,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
- gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_show(ssl_page.send_frame);
#endif
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
- gtk_widget_hide(advanced_page.nntpport_hbox);
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
gtk_widget_hide(receive_page.imapdir_label);
@@ -4983,14 +4722,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
gtk_widget_show(send_page.xmailer_checkbtn);
- gtk_widget_hide(basic_page.nntpserv_label);
- gtk_widget_hide(basic_page.nntpserv_entry);
gtk_grid_set_row_spacing(GTK_GRID(basic_page.serv_table), VSPACING_NARROW);
- gtk_widget_set_sensitive(basic_page.nntpauth_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_checkbtn);
-
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_onconnect_checkbtn);
gtk_widget_set_sensitive(basic_page.recvserv_label, TRUE);
gtk_widget_set_sensitive(basic_page.recvserv_entry, TRUE);
@@ -5016,7 +4748,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_show(receive_page.imap_frame);
gtk_widget_hide(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
- gtk_widget_hide(receive_page.frame_maxarticle);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_label, TRUE);
@@ -5036,12 +4767,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_show(ssl_page.imap_frame);
- gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_show(ssl_page.send_frame);
#endif
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_show(advanced_page.imapport_hbox);
- gtk_widget_hide(advanced_page.nntpport_hbox);
gtk_widget_show(advanced_page.tunnelcmd_checkbtn);
gtk_widget_show(advanced_page.tunnelcmd_entry);
gtk_widget_show(receive_page.imapdir_label);
@@ -5055,14 +4784,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
- gtk_widget_hide(basic_page.nntpserv_label);
- gtk_widget_hide(basic_page.nntpserv_entry);
gtk_grid_set_row_spacing(GTK_GRID(basic_page.serv_table), VSPACING_NARROW);
- gtk_widget_set_sensitive(basic_page.nntpauth_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_checkbtn);
-
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_onconnect_checkbtn);
gtk_widget_set_sensitive(basic_page.recvserv_label, FALSE);
gtk_widget_set_sensitive(basic_page.recvserv_entry, FALSE);
@@ -5089,7 +4811,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.imap_frame);
gtk_widget_hide(receive_page.local_frame);
gtk_widget_hide(receive_page.autochk_frame);
- gtk_widget_hide(receive_page.frame_maxarticle);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, FALSE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
@@ -5105,12 +4826,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
- gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_show(ssl_page.send_frame);
#endif
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
- gtk_widget_hide(advanced_page.nntpport_hbox);
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
gtk_widget_hide(receive_page.imapdir_label);
@@ -5126,14 +4845,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
- gtk_widget_hide(basic_page.nntpserv_label);
- gtk_widget_hide(basic_page.nntpserv_entry);
gtk_grid_set_row_spacing(GTK_GRID(basic_page.serv_table), VSPACING_NARROW);
- gtk_widget_set_sensitive(basic_page.nntpauth_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_checkbtn);
-
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, FALSE);
- gtk_widget_hide(basic_page.nntpauth_onconnect_checkbtn);
gtk_widget_set_sensitive(basic_page.recvserv_label, TRUE);
gtk_widget_set_sensitive(basic_page.recvserv_entry, TRUE);
@@ -5160,7 +4872,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.imap_frame);
gtk_widget_hide(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
- gtk_widget_hide(receive_page.frame_maxarticle);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
@@ -5179,12 +4890,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
#ifdef USE_GNUTLS
gtk_widget_show(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
- gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_show(ssl_page.send_frame);
#endif
gtk_widget_show(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
- gtk_widget_hide(advanced_page.nntpport_hbox);
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
gtk_widget_hide(receive_page.imapdir_label);
@@ -5198,21 +4907,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_queue_resize(basic_page.serv_frame);
}
-static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
- gpointer user_data)
-{
- gboolean auth;
-
- if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
- return;
- auth = gtk_toggle_button_get_active (button);
- gtk_widget_set_sensitive(basic_page.uid_label, auth);
- gtk_widget_set_sensitive(basic_page.pass_label, auth);
- gtk_widget_set_sensitive(basic_page.uid_entry, auth);
- gtk_widget_set_sensitive(basic_page.pass_entry, auth);
- gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, auth);
-}
-
static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
gpointer user_data)
{
diff --git a/src/prefs_account.h b/src/prefs_account.h
@@ -29,7 +29,6 @@ typedef struct _PrefsAccount PrefsAccount;
typedef enum {
A_POP3,
A_IMAP4,
- A_NNTP,
A_LOCAL,
A_NONE, /* SMTP only */
NUM_RECV_PROTOCOLS
@@ -69,9 +68,6 @@ struct _PrefsAccount
RecvProtocol protocol;
gchar *recv_server;
gchar *smtp_server;
- gchar *nntp_server;
- gboolean use_nntp_auth;
- gboolean use_nntp_auth_onconnect;
gchar *userid;
gchar *passwd;
gchar *session_passwd;
@@ -82,7 +78,6 @@ struct _PrefsAccount
SSLType ssl_pop;
SSLType ssl_imap;
- SSLType ssl_nntp;
SSLType ssl_smtp;
gchar *out_ssl_client_cert_file;
@@ -173,8 +168,6 @@ struct _PrefsAccount
gushort popport;
gboolean set_imapport;
gushort imapport;
- gboolean set_nntpport;
- gushort nntpport;
gboolean set_domain;
gchar *domain;
gboolean set_gnutls_priority;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -948,7 +948,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
gtk_grid_attach(GTK_GRID(table), label, 2, rowcount, 1, 1);
rowcount++;
- if (item_protocol(item) != A_NNTP) {
+ if (item_protocol(item)) {
/* Save Copy to Folder */
checkbtn_save_copy_to_folder = gtk_check_button_new_with_label
(_("Save copy of outgoing messages to this folder instead of Sent"));
@@ -1124,14 +1124,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
account_list = account_get_list();
for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
ac_prefs = (PrefsAccount *)cur_ac->data;
- if (item->folder->account &&
- ( (item_protocol(item) == A_NNTP && ac_prefs->protocol != A_NNTP)
- ||(item_protocol(item) != A_NNTP && ac_prefs->protocol == A_NNTP)))
- continue;
-
- if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
- continue;
-
COMBOBOX_ADD_ESCAPED (optmenu_default_account_menu,
ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
ac_prefs->account_id);
@@ -1295,7 +1287,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
cm_return_if_fail(prefs != NULL);
- if (item_protocol(folder) != A_NNTP) {
+ if (item_protocol(folder)) {
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
prefs->request_return_receipt =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
@@ -1398,7 +1390,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
/* optimise by not continuing if none of the 'apply to sub folders'
check boxes are selected - and optimise the checking by only doing
it once */
- if ((node == page->item->node) && item_protocol(item) != A_NNTP &&
+ if ((node == page->item->node) &&
!(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_from_rec_checkbtn)) ||
@@ -1412,7 +1404,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))
))
return TRUE;
- else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
+ else if ((node == page->item->node) &&
!(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -38,7 +38,6 @@
#include "prefs_common.h"
#include "account.h"
#include "alertpanel.h"
-#include "news.h"
#include "hooks.h"
#include "msgcache.h"
#include "mainwindow.h"
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -216,7 +216,6 @@ struct {
{ "A_RECEIVE_CUR", N_("Receive Mail from current Account") },
{ "A_SEND_QUEUED", N_("Send Queued Messages") },
{ "A_COMPOSE_EMAIL", N_("Write Email") },
- { "A_COMPOSE_NEWS", N_("Write News") },
{ "A_REPLY_MESSAGE", N_("Reply to Message") },
{ "A_REPLY_SENDER", N_("Reply to Sender") },
{ "A_REPLY_ALL", N_("Reply to All") },
@@ -914,19 +913,11 @@ static void activate_compose_button (Toolbar *toolbar,
if ((!toolbar->compose_mail_btn))
return;
- if (type == COMPOSEBUTTON_NEWS) {
- gtk_tool_button_set_icon_widget(
- GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
- toolbar->compose_news_icon);
- CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write News message"));
- gtk_widget_show(toolbar->compose_news_icon);
- } else {
- gtk_tool_button_set_icon_widget(
- GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
- toolbar->compose_mail_icon);
- CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write Email"));
- gtk_widget_show(toolbar->compose_mail_icon);
- }
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
+ toolbar->compose_mail_icon);
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write Email"));
+ gtk_widget_show(toolbar->compose_mail_icon);
toolbar->compose_btn_type = type;
}
@@ -1236,15 +1227,11 @@ static void toolbar_compose_cb(GtkWidget *widget, gpointer data)
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
mainwin = (MainWindow*)toolbar_item->parent;
- if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS)
- compose_news_cb(mainwin, 0, NULL);
- else
- compose_mail_cb(mainwin, 0, NULL);
+ compose_mail_cb(mainwin, 0, NULL);
break;
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
- compose_new_with_folderitem(NULL,
- msgview->msginfo->folder, NULL);
+ compose_new_with_folderitem(NULL, msgview->msginfo->folder, NULL);
break;
default:
debug_print("toolbar event not supported\n");
@@ -2921,16 +2908,13 @@ void compose_mail_cb(gpointer data, guint action, GtkWidget *widget)
if (item) {
ac = account_find_from_item(item);
- if (ac && ac->protocol != A_NNTP && ac->protocol != A_IMAP4) {
+ if (ac && ac->protocol != A_IMAP4) {
compose_new_with_folderitem(ac, item, NULL); /* CLAWS */
return;
}
}
- /*
- * CLAWS - use current account
- */
- if (cur_account && (cur_account->protocol != A_NNTP)) {
+ if (cur_account) {
compose_new_with_folderitem(cur_account, item, NULL);
return;
}
@@ -2941,36 +2925,12 @@ void compose_mail_cb(gpointer data, guint action, GtkWidget *widget)
list = account_get_list();
for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
ac = (PrefsAccount *) cur->data;
- if (ac->protocol != A_NNTP) {
- compose_new_with_folderitem(ac, item, NULL);
- return;
- }
+ compose_new_with_folderitem(ac, item, NULL);
+ return;
}
}
void compose_news_cb(gpointer data, guint action, GtkWidget *widget)
{
- MainWindow *mainwin = (MainWindow*)data;
- PrefsAccount * ac = NULL;
- GList * list;
- GList * cur;
-
- if (mainwin->summaryview->folder_item) {
- ac = mainwin->summaryview->folder_item->folder->account;
- if (ac && ac->protocol == A_NNTP) {
- compose_new_with_folderitem(ac,
- mainwin->summaryview->folder_item, NULL);
- return;
- }
- }
-
- list = account_get_list();
- for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
- ac = (PrefsAccount *) cur->data;
- if (ac->protocol == A_NNTP) {
- compose_new_with_folderitem(ac,
- mainwin->summaryview->folder_item, NULL);
- return;
- }
- }
+ fprintf(stderr, "TODO(otl): remove this\n");
}
diff --git a/src/toolbar.h b/src/toolbar.h
@@ -253,10 +253,6 @@ void send_queue_cb (gpointer data,
void compose_mail_cb (gpointer data,
guint action,
GtkWidget *widget);
-void compose_news_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-/* END */
void toolbar_toggle (guint action,
gpointer data);
