commit 1e6765c2e89918bca4d329dc0c632288cd4cb73e
parent 1c5b33db2fbb18d1a1eb71cbaeff55f13dd67640
Author: Oliver Lowe <o@olowe.co>
Date: Sun, 31 Aug 2025 12:19:43 +1000
Delete leftover return receipt preferences
Diffstat:
7 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -7352,8 +7352,6 @@ static Compose *compose_create(PrefsAccount *account,
compose->modified = FALSE;
- compose->return_receipt = FALSE;
-
compose->to_list = NULL;
compose->newsgroup_list = NULL;
diff --git a/src/compose.h b/src/compose.h
@@ -199,8 +199,6 @@ struct _Compose
gboolean sending;
- gboolean return_receipt;
-
gboolean batch;
GSList *to_list;
diff --git a/src/folder.c b/src/folder.c
@@ -368,7 +368,6 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
item->hide_read_threads = prefs_common.folder_default_hide_read_threads;
item->hide_read_msgs = prefs_common.folder_default_hide_read_msgs;
item->hide_del_msgs = prefs_common.folder_default_hide_del_msgs;
- item->ret_rcpt = FALSE;
item->opened = FALSE;
item->node = g_node_new(item);
item->folder = NULL;
@@ -587,8 +586,6 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
item->hide_del_msgs = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "hidereadthreads"))
item->hide_read_threads = *attr->value == '1' ? TRUE : FALSE;
- else if (!strcmp(attr->name, "reqretrcpt"))
- item->ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "sort_key")) {
if (!strcmp(attr->value, "none"))
item->sort_key = SORT_BY_NONE;
@@ -674,8 +671,6 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
xml_tag_add_attr(tag, xml_attr_new("hidedelmsgs", item->hide_del_msgs ? "1" : "0"));
xml_tag_add_attr(tag, xml_attr_new("hidereadthreads", item->hide_read_threads ? "1" : "0"));
- if (item->ret_rcpt)
- xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
if (item->sort_key != SORT_BY_NONE) {
xml_tag_add_attr(tag, xml_attr_new("sort_key", sort_key_str[item->sort_key]));
@@ -3161,7 +3156,6 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
new_item->collapsed = src->collapsed;
new_item->thread_collapsed = src->thread_collapsed;
new_item->threaded = src->threaded;
- new_item->ret_rcpt = src->ret_rcpt;
new_item->hide_read_msgs = src->hide_read_msgs;
new_item->hide_del_msgs = src->hide_del_msgs;
new_item->hide_read_threads = src->hide_read_threads;
@@ -4233,7 +4227,6 @@ static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *ppta
item->collapsed = pp->collapsed;
item->thread_collapsed = pp->thread_collapsed;
item->threaded = pp->threaded;
- item->ret_rcpt = pp->ret_rcpt;
item->hide_read_msgs = pp->hide_read_msgs;
item->hide_del_msgs = pp->hide_del_msgs;
item->hide_read_threads = pp->hide_read_threads;
@@ -4263,7 +4256,6 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
pp->collapsed = item->collapsed;
pp->thread_collapsed = item->thread_collapsed;
pp->threaded = item->threaded;
- pp->ret_rcpt = item->ret_rcpt;
pp->hide_read_msgs = item->hide_read_msgs;
pp->hide_del_msgs = item->hide_del_msgs;
pp->hide_read_threads = item->hide_read_threads;
diff --git a/src/folder.h b/src/folder.h
@@ -750,7 +750,6 @@ struct _FolderItem
guint thread_collapsed : 1; /* collapsed item */
guint threaded : 1; /* threaded folder view */
guint hide_read_msgs : 1; /* hide read messages */
- guint ret_rcpt : 1; /* return receipt */
guint search_match : 1;
guint hide_del_msgs : 1; /* hide deleted messages */
guint hide_read_threads : 1; /* hide threads with only read messages */
@@ -791,7 +790,6 @@ struct _PersistPrefs
guint thread_collapsed : 1;
guint threaded : 1;
guint hide_read_msgs : 1; /* CLAWS */
- guint ret_rcpt : 1; /* CLAWS */
guint hide_del_msgs : 1; /* CLAWS */
guint hide_read_threads : 1;
};
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
@@ -229,7 +229,6 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
tmp_prefs.processing = tmp_prop_list;
- tmp_prefs.request_return_receipt = src->prefs->request_return_receipt;
tmp_prefs.enable_default_from = src->prefs->enable_default_from;
tmp_prefs.default_from = g_strdup(src->prefs->default_from);
tmp_prefs.enable_default_to = src->prefs->enable_default_to;
@@ -259,7 +258,6 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
dest->collapsed = src->collapsed;
dest->thread_collapsed = src->thread_collapsed;
dest->threaded = src->threaded;
- dest->ret_rcpt = src->ret_rcpt;
dest->hide_read_msgs = src->hide_read_msgs;
dest->hide_del_msgs = src->hide_del_msgs;
dest->hide_read_threads = src->hide_read_threads;
diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
@@ -59,7 +59,6 @@ struct _FolderItemPrefs {
HTMLRenderType render_html;
gboolean skip_on_goto_unread_or_new;
- gboolean request_return_receipt;
gboolean enable_default_from;
gchar *default_from;
gboolean enable_default_to;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -105,7 +105,6 @@ struct _FolderItemComposePage
GtkWidget *window;
GtkWidget *table;
GtkWidget *no_save_warning;
- GtkWidget *checkbtn_request_return_receipt;
GtkWidget *checkbtn_save_copy_to_folder;
GtkWidget *checkbtn_default_from;
GtkWidget *entry_default_from;
@@ -125,7 +124,6 @@ struct _FolderItemComposePage
GtkWidget *always_encrypt;
/* apply to sub folders */
- GtkWidget *request_return_receipt_rec_checkbtn;
GtkWidget *save_copy_to_folder_rec_checkbtn;
GtkWidget *default_from_rec_checkbtn;
GtkWidget *default_to_rec_checkbtn;
@@ -767,7 +765,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
GtkWidget *label;
GtkWidget *no_save_warning = NULL;
- GtkWidget *checkbtn_request_return_receipt = NULL;
GtkWidget *checkbtn_save_copy_to_folder = NULL;
GtkWidget *checkbtn_default_from = NULL;
GtkWidget *entry_default_from = NULL;
@@ -789,7 +786,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
GtkListStore *always_sign_menu;
GtkWidget *always_encrypt;
GtkListStore *always_encrypt_menu;
- GtkWidget *request_return_receipt_rec_checkbtn = NULL;
GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
GtkWidget *default_from_rec_checkbtn = NULL;
GtkWidget *default_to_rec_checkbtn = NULL;
@@ -1095,7 +1091,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
page->window = GTK_WIDGET(window);
page->table = table;
page->no_save_warning = no_save_warning;
- page->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
page->checkbtn_save_copy_to_folder = checkbtn_save_copy_to_folder;
page->checkbtn_default_from = checkbtn_default_from;
page->entry_default_from = entry_default_from;
@@ -1114,7 +1109,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
page->always_sign = always_sign;
page->always_encrypt = always_encrypt;
- page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
page->save_copy_to_folder_rec_checkbtn = save_copy_to_folder_rec_checkbtn;
page->default_from_rec_checkbtn = default_from_rec_checkbtn;
page->default_to_rec_checkbtn = default_to_rec_checkbtn;
@@ -1167,13 +1161,6 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
cm_return_if_fail(prefs != NULL);
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));
- /* MIGRATION */
- folder->ret_rcpt = prefs->request_return_receipt;
- }
-
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn))) {
prefs->save_copy_to_folder =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
@@ -1225,7 +1212,6 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
}
} else {
- prefs->request_return_receipt = FALSE;
prefs->save_copy_to_folder = FALSE;
prefs->enable_default_from = FALSE;
prefs->enable_default_to = FALSE;
@@ -1270,8 +1256,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
check boxes are selected - and optimise the checking by only doing
it once */
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->save_copy_to_folder_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_from_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
