commit fa053203cd6f04304e0836ae3451ed970b0c1266
parent 1e6765c2e89918bca4d329dc0c632288cd4cb73e
Author: Oliver Lowe <o@olowe.co>
Date: Sun, 31 Aug 2025 13:02:50 +1000
Delete even more leftover newsreader stuff
Diffstat:
5 files changed, 7 insertions(+), 96 deletions(-)
diff --git a/src/common/defs.h b/src/common/defs.h
@@ -72,7 +72,6 @@
#define TEMPLATE_DIR "templates"
#define TMP_DIR "tmp"
#define UIDL_DIR "uidl"
-#define NEWSGROUP_LIST ".newsgroup_list"
#define ADDRESS_BOOK "addressbook.xml"
#define ADDRBOOK_DIR "addrbook"
#define MANUAL_HTML_INDEX "claws-mail-manual.html"
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -758,40 +758,7 @@ GSList *references_list_append(GSList *msgid_list, const gchar *str)
list = references_list_prepend(NULL, str);
list = g_slist_reverse(list);
- msgid_list = g_slist_concat(msgid_list, list);
-
- return msgid_list;
-}
-
-GSList *newsgroup_list_append(GSList *group_list, const gchar *str)
-{
- gchar *work;
- gchar *workp;
-
- if (!str) return group_list;
-
- Xstrdup_a(work, str, return group_list);
-
- workp = work;
-
- while (workp && *workp) {
- gchar *p, *next;
-
- if ((p = strchr_with_skip_quote(workp, '"', ','))) {
- *p = '\0';
- next = p + 1;
- } else
- next = NULL;
-
- g_strstrip(workp);
- if (*workp)
- group_list = g_slist_append(group_list,
- g_strdup(workp));
-
- workp = next;
- }
-
- return group_list;
+ return g_slist_concat(msgid_list, list);
}
GList *add_history(GList *list, const gchar *str)
@@ -1069,34 +1036,6 @@ gchar **strsplit_with_quote(const gchar *str, const gchar *delim,
return str_array;
}
-gchar *get_abbrev_newsgroup_name(const gchar *group, gint len)
-{
- gchar *abbrev_group;
- gchar *ap;
- const gchar *p = group;
- const gchar *last;
-
- cm_return_val_if_fail(group != NULL, NULL);
-
- last = group + strlen(group);
- abbrev_group = ap = g_malloc(strlen(group) + 1);
-
- while (*p) {
- while (*p == '.')
- *ap++ = *p++;
- if ((ap - abbrev_group) + (last - p) > len && strchr(p, '.')) {
- *ap++ = *p++;
- while (*p != '.') p++;
- } else {
- strcpy(ap, p);
- return abbrev_group;
- }
- }
-
- *ap = '\0';
- return abbrev_group;
-}
-
gchar *trim_string(const gchar *str, gint len)
{
const gchar *p = str;
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -341,8 +341,6 @@ GSList *references_list_prepend (GSList *msgid_list,
const gchar *str);
GSList *references_list_append (GSList *msgid_list,
const gchar *str);
-GSList *newsgroup_list_append (GSList *group_list,
- const gchar *str);
GList *add_history (GList *list,
const gchar *str);
@@ -367,8 +365,6 @@ gchar **strsplit_with_quote (const gchar *str,
const gchar *delim,
gint max_tokens);
-gchar *get_abbrev_newsgroup_name (const gchar *group,
- gint len);
gchar *trim_string (const gchar *str,
gint len);
diff --git a/src/compose.c b/src/compose.c
@@ -4555,13 +4555,9 @@ gboolean compose_check_for_valid_recipient(Compose *compose) {
GSList *list;
gchar **strptr;
- /* free to and newsgroup list */
- slist_free_strings_full(compose->to_list);
+ slist_free_strings_full(compose->to_list);
compose->to_list = NULL;
- slist_free_strings_full(compose->newsgroup_list);
- compose->newsgroup_list = NULL;
-
/* search header entries for to */
for (list = compose->header_list; list; list = list->next) {
gchar *header;
@@ -5594,9 +5590,9 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
return COMPOSE_QUEUE_ERROR_NO_MSG;
}
- if (!compose->to_list && !compose->newsgroup_list) {
- g_warning("can't get recipient list");
- return COMPOSE_QUEUE_ERROR_NO_MSG;
+ if (!compose->to_list) {
+ g_warning("can't get recipient list");
+ return COMPOSE_QUEUE_ERROR_NO_MSG;
}
if (compose->to_list) {
@@ -5653,14 +5649,6 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
err |= (fprintf(fp, ",<%s>", (gchar *)cur->data) < 0);
err |= (fprintf(fp, "\n") < 0);
}
- /* write newsgroup list */
- if (compose->newsgroup_list) {
- err |= (fprintf(fp, "NG:") < 0);
- err |= (fprintf(fp, "%s", (gchar *)compose->newsgroup_list->data) < 0);
- for (cur = compose->newsgroup_list->next; cur != NULL; cur = cur->next)
- err |= (fprintf(fp, ",%s", (gchar *)cur->data) < 0);
- err |= (fprintf(fp, "\n") < 0);
- }
/* account IDs */
if (mailac)
err |= (fprintf(fp, "MAID:%d\n", mailac->account_id) < 0);
@@ -6239,20 +6227,12 @@ static gchar *compose_get_header(Compose *compose)
/* Program version and system info */
if (compose->account->gen_xmailer &&
- g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
- !compose->newsgroup_list) {
+ g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
g_string_append_printf(header, "X-Mailer: %s (GTK %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
}
- if (compose->account->gen_xmailer &&
- g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
- g_string_append_printf(header, "X-Newsreader: %s (GTK %d.%d.%d; %s)\n",
- prog_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- TARGET_ALIAS);
- }
/* custom headers */
if (compose->account->add_customhdr) {
@@ -7353,7 +7333,6 @@ static Compose *compose_create(PrefsAccount *account,
compose->modified = FALSE;
compose->to_list = NULL;
- compose->newsgroup_list = NULL;
compose->undostruct = undostruct;
@@ -7780,13 +7759,12 @@ static void compose_destroy(Compose *compose)
address_completion_end(compose->window);
slist_free_strings_full(compose->to_list);
- slist_free_strings_full(compose->newsgroup_list);
slist_free_strings_full(compose->header_list);
slist_free_strings_full(extra_headers);
extra_headers = NULL;
- compose->header_list = compose->newsgroup_list = compose->to_list = NULL;
+ compose->header_list = compose->to_list = NULL;
g_hash_table_destroy(compose->email_hashtable);
diff --git a/src/compose.h b/src/compose.h
@@ -202,7 +202,6 @@ struct _Compose
gboolean batch;
GSList *to_list;
- GSList *newsgroup_list;
PrefsAccount *account;
FolderItem *folder;
