commit 0f9e5e0dd310d6ee7413775e3c8e853eafee5dfa
parent f282d5cb7a2d60d660f5b53b36691b539d2a2c11
Author: Oliver Lowe <o@olowe.co>
Date: Tue, 12 Aug 2025 22:04:40 +1000
Remove more references to plugins
No plugins any more.
Diffstat:
8 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
@@ -104,8 +104,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"render_html", "0", &tmp_prefs.render_html, P_ENUM,
NULL, NULL, NULL},
- {"invoke_plugin_on_html", "0", &tmp_prefs.invoke_plugin_on_html, P_ENUM,
- NULL, NULL, NULL},
{"promote_html_part", "0", &tmp_prefs.promote_html_part, P_ENUM,
NULL, NULL, NULL},
{"skip_on_goto_unread_or_new", "FALSE", &tmp_prefs.skip_on_goto_unread_or_new, P_BOOL,
@@ -232,7 +230,6 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
prefs->offlinesync_days = 0;
prefs->remove_old_bodies = FALSE;
prefs->render_html = HTML_RENDER_DEFAULT;
- prefs->invoke_plugin_on_html = INVOKE_PLUGIN_ON_HTML_DEFAULT;
prefs->promote_html_part = HTML_PROMOTE_DEFAULT;
prefs->skip_on_goto_unread_or_new = FALSE;
@@ -292,7 +289,6 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
tmp_prefs.offlinesync_days = src->prefs->offlinesync_days;
tmp_prefs.remove_old_bodies = src->prefs->remove_old_bodies;
tmp_prefs.render_html = src->prefs->render_html;
- tmp_prefs.invoke_plugin_on_html = src->prefs->invoke_plugin_on_html;
tmp_prefs.promote_html_part = src->prefs->promote_html_part;
tmp_prefs.skip_on_goto_unread_or_new = src->prefs->skip_on_goto_unread_or_new;
diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
@@ -61,7 +61,6 @@ struct _FolderItemPrefs {
int offlinesync_days;
int remove_old_bodies;
HTMLRenderType render_html;
- InvokePluginOnHTMLType invoke_plugin_on_html;
HTMLPromoteType promote_html_part;
gboolean skip_on_goto_unread_or_new;
diff --git a/src/main.c b/src/main.c
@@ -1085,11 +1085,7 @@ int main(int argc, char *argv[])
"\"Rebuild folder tree\" on the mailbox parent "
"folder's context menu to try to fix it."));
} else {
- alertpanel_error(_("Claws Mail has detected a configured "
- "mailbox, but could not load it. It is "
- "probably provided by an out-of-date "
- "external plugin. Please reinstall the "
- "plugin and try again."));
+ alertpanel_error("Could not load configured mailbox.");
exit_claws(mainwin);
exit(1);
}
diff --git a/src/messageview.c b/src/messageview.c
@@ -1505,11 +1505,6 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
if (!mimeview_show_part(messageview->mimeview, mimeinfo))
mimeview_select_mimepart_icon(messageview->mimeview, root);
goto done;
- } else if ((msginfo->folder->prefs->invoke_plugin_on_html == INVOKE_PLUGIN_ON_HTML_ALWAYS ||
- (msginfo->folder->prefs->invoke_plugin_on_html == INVOKE_PLUGIN_ON_HTML_DEFAULT &&
- prefs_common.invoke_plugin_on_html))) {
- mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
- goto done;
}
}
if (!all_headers && mimeinfo &&
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -692,8 +692,6 @@ static PrefParam param[] = {
P_BOOL, NULL, NULL, NULL},
{"render_html", "TRUE", &prefs_common.render_html, P_BOOL,
NULL, NULL, NULL},
- {"invoke_plugin_on_html", "FALSE", &prefs_common.invoke_plugin_on_html, P_BOOL,
- NULL, NULL, NULL},
{"promote_html_part", "FALSE", &prefs_common.promote_html_part, P_BOOL,
NULL, NULL, NULL},
{"line_space", "2", &prefs_common.line_space, P_INT,
@@ -997,11 +995,6 @@ static PrefParam param[] = {
{"addressbookeditgroupwin_height", "340", &prefs_common.addressbookeditgroupwin_height, P_INT,
NULL, NULL, NULL},
- {"pluginswin_width", "-1", &prefs_common.pluginswin_width, P_INT,
- NULL, NULL, NULL},
- {"pluginswin_height", "-1", &prefs_common.pluginswin_height, P_INT,
- NULL, NULL, NULL},
-
{"prefswin_width", "600", &prefs_common.prefswin_width, P_INT,
NULL, NULL, NULL},
{"prefswin_height", "-1", &prefs_common.prefswin_height, P_INT,
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -359,7 +359,6 @@ struct _PrefsCommon
gboolean save_xface;
gint line_space;
gboolean render_html;
- gboolean invoke_plugin_on_html;
gboolean promote_html_part;
gboolean textview_cursor_visible;
gboolean enable_smooth_scroll;
@@ -513,8 +512,6 @@ struct _PrefsCommon
gint addressbookeditpersonwin_height;
gint addressbookeditgroupwin_width;
gint addressbookeditgroupwin_height;
- gint pluginswin_width;
- gint pluginswin_height;
gint prefswin_width;
gint prefswin_height;
gint folderitemwin_width;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -91,7 +91,6 @@ struct _FolderItemGeneralPage
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
GtkWidget *render_html;
- GtkWidget *invoke_plugin_on_html;
GtkWidget *promote_html_part;
/* apply to sub folders */
@@ -104,7 +103,6 @@ struct _FolderItemGeneralPage
GtkWidget *skip_on_goto_unread_or_new_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
GtkWidget *render_html_rec_checkbtn;
- GtkWidget *invoke_plugin_on_html_rec_checkbtn;
GtkWidget *promote_html_part_rec_checkbtn;
GdkRGBA folder_color;
@@ -266,10 +264,8 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
GtkWidget *render_html;
- GtkWidget *invoke_plugin_on_html;
GtkWidget *promote_html_part;
GtkListStore *render_html_menu;
- GtkListStore *invoke_plugin_on_html_menu;
GtkListStore *promote_html_part_menu;
GtkWidget *simplify_subject_rec_checkbtn;
@@ -282,7 +278,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWidget *skip_on_goto_unread_or_new_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
GtkWidget *render_html_rec_checkbtn;
- GtkWidget *invoke_plugin_on_html_rec_checkbtn;
GtkWidget *promote_html_part_rec_checkbtn;
gint wreq1, wreq2;
@@ -551,34 +546,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
rowcount++;
- /* Render HTML-only messages with plugin if possible? */
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW_2);
- gtk_box_set_spacing(GTK_BOX(hbox), 8);
- gtk_grid_attach(GTK_GRID(table), hbox, 0, rowcount, 1, 1);
-
- label = gtk_label_new(_("Render HTML-only messages with plugin if possible"));
- gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
- invoke_plugin_on_html = gtkut_sc_combobox_create (NULL, FALSE);
- gtk_box_pack_start (GTK_BOX(hbox), invoke_plugin_on_html, FALSE, FALSE, 0);
-
- invoke_plugin_on_html_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
- GTK_COMBO_BOX(invoke_plugin_on_html)));
- COMBOBOX_ADD (invoke_plugin_on_html_menu, _("Default"), INVOKE_PLUGIN_ON_HTML_DEFAULT);
- COMBOBOX_ADD (invoke_plugin_on_html_menu, _("No"), INVOKE_PLUGIN_ON_HTML_NEVER);
- COMBOBOX_ADD (invoke_plugin_on_html_menu, _("Yes"), INVOKE_PLUGIN_ON_HTML_ALWAYS);
-
- combobox_select_by_data(GTK_COMBO_BOX(invoke_plugin_on_html),
- item->prefs->invoke_plugin_on_html);
-
- CLAWS_SET_TIP(hbox,
- _("\"Default\" will follow global preference (found in '/Configuration/Preferences/Message View/Text Options')"));
-
- invoke_plugin_on_html_rec_checkbtn = gtk_check_button_new();
- gtk_grid_attach(GTK_GRID(table), invoke_plugin_on_html_rec_checkbtn, 2, rowcount, 1, 1);
-
- rowcount++;
-
/* Select HTML part by default? */
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW_2);
gtk_box_set_spacing(GTK_BOX(hbox), 8);
@@ -738,7 +705,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
page->label_end_offlinesync = label_end_offlinesync;
page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
page->render_html = render_html;
- page->invoke_plugin_on_html = invoke_plugin_on_html;
page->promote_html_part = promote_html_part;
page->simplify_subject_rec_checkbtn = simplify_subject_rec_checkbtn;
@@ -751,7 +717,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
page->skip_on_goto_unread_or_new_rec_checkbtn = skip_on_goto_unread_or_new_rec_checkbtn;
page->offlinesync_rec_checkbtn = offlinesync_rec_checkbtn;
page->render_html_rec_checkbtn = render_html_rec_checkbtn;
- page->invoke_plugin_on_html_rec_checkbtn = invoke_plugin_on_html_rec_checkbtn;
page->promote_html_part_rec_checkbtn = promote_html_part_rec_checkbtn;
page->page.widget = table;
@@ -777,7 +742,6 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
SpecialFolderItemType type = F_NORMAL;
FolderView *folderview = mainwindow_get_mainwindow()->folderview;
HTMLRenderType render_html = HTML_RENDER_DEFAULT;
- InvokePluginOnHTMLType invoke_plugin_on_html = INVOKE_PLUGIN_ON_HTML_DEFAULT;
HTMLPromoteType promote_html_part = HTML_PROMOTE_DEFAULT;
if (folder->path == NULL)
@@ -799,11 +763,6 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->render_html_rec_checkbtn)))
prefs->render_html = render_html;
- invoke_plugin_on_html =
- combobox_get_active_data(GTK_COMBO_BOX(page->invoke_plugin_on_html));
- if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->invoke_plugin_on_html_rec_checkbtn)))
- prefs->invoke_plugin_on_html = invoke_plugin_on_html;
-
promote_html_part =
combobox_get_active_data(GTK_COMBO_BOX(page->promote_html_part));
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn)))
@@ -900,7 +859,6 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->skip_on_goto_unread_or_new_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->render_html_rec_checkbtn)) ||
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->invoke_plugin_on_html_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn))
))
return TRUE;
diff --git a/src/prefs_message.c b/src/prefs_message.c
@@ -52,7 +52,6 @@ typedef struct _MessagePage
GtkWidget *checkbtn_savexface;
GtkWidget *checkbtn_html;
- GtkWidget *checkbtn_html_plugin;
GtkWidget *checkbtn_promote_html_part;
GtkWidget *spinbtn_linespc;
@@ -89,7 +88,6 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *button_edit_disphdr;
GtkWidget *checkbtn_html;
- GtkWidget *checkbtn_html_plugin;
GtkWidget *checkbtn_promote_html_part;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
@@ -156,9 +154,6 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(vbox2, checkbtn_html,
_("Render HTML messages as text"));
- PACK_CHECK_BUTTON(vbox2, checkbtn_html_plugin,
- _("Render HTML-only messages with plugin if possible"));
-
PACK_CHECK_BUTTON(vbox2, checkbtn_promote_html_part,
_("Select the HTML part of multipart/alternative messages"));
@@ -264,8 +259,6 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.display_header);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_html),
prefs_common.render_html);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_html_plugin),
- prefs_common.invoke_plugin_on_html);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_promote_html_part),
prefs_common.promote_html_part);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_smoothscroll),
@@ -289,7 +282,6 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_message->checkbtn_savexface = checkbtn_savexface;
prefs_message->checkbtn_disphdr = checkbtn_disphdr;
prefs_message->checkbtn_html = checkbtn_html;
- prefs_message->checkbtn_html_plugin = checkbtn_html_plugin;
prefs_message->checkbtn_promote_html_part = checkbtn_promote_html_part;
prefs_message->spinbtn_linespc = spinbtn_linespc;
prefs_message->checkbtn_smoothscroll = checkbtn_smoothscroll;
@@ -316,8 +308,6 @@ static void prefs_message_save(PrefsPage *_page)
GTK_TOGGLE_BUTTON(page->checkbtn_disphdr));
prefs_common.render_html = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_html));
- prefs_common.invoke_plugin_on_html = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_html_plugin));
prefs_common.promote_html_part = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_promote_html_part));
prefs_common.enable_smooth_scroll = gtk_toggle_button_get_active(
