summaryrefslogtreecommitdiff
path: root/mail/claws-mail/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/claws-mail/patches')
-rw-r--r--mail/claws-mail/patches/patch-ad122
-rw-r--r--mail/claws-mail/patches/patch-ae11
-rw-r--r--mail/claws-mail/patches/patch-af11
3 files changed, 136 insertions, 8 deletions
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index 2a71ab21eff..79259165856 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,11 +1,60 @@
-$NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
-
---- src/toolbar.c.orig 2007-12-26 22:40:51.000000000 -0500
-+++ src/toolbar.c 2007-12-26 22:41:12.000000000 -0500
-@@ -518,10 +518,8 @@
+--- src/toolbar.c.orig 2008-06-30 10:36:22.000000000 -0400
++++ src/toolbar.c 2008-06-30 10:37:19.000000000 -0400
+@@ -164,10 +164,8 @@
+ gpointer data);
+ static void toolbar_addrbook_cb (GtkWidget *widget,
+ gpointer data);
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb (GtkWidget *widget,
+ gpointer data);
+-#endif
+ static void toolbar_cancel_inc_cb (GtkWidget *widget,
+ gpointer data);
+
+@@ -208,9 +206,7 @@
+ { "A_LINEWRAP_CURRENT", N_("Wrap long lines of current paragraph") },
+ { "A_LINEWRAP_ALL", N_("Wrap all long lines") },
+ { "A_ADDRBOOK", N_("Address book") },
+-#ifdef USE_ASPELL
+ { "A_CHECK_SPELLING", N_("Check spelling") },
+-#endif
+ { "A_CLAWS_ACTIONS", N_("Claws Mail Actions Feature") },
+ { "A_CANCEL_INC", N_("Cancel receiving") },
+ { "A_CLOSE", N_("Close window") },
+@@ -346,9 +342,7 @@
+ A_INSERT, A_ATTACH, A_SIG,
+ A_EXTEDITOR, A_LINEWRAP_CURRENT,
+ A_LINEWRAP_ALL, A_ADDRBOOK,
+-#ifdef USE_ASPELL
+ A_CHECK_SPELLING,
+-#endif
+ A_CLOSE };
+
+ for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++)
+@@ -449,9 +443,7 @@
+ case A_ADDRBOOK: return _("Address");
+ case A_CANCEL_INC: return _("Stop");
+ case A_EXECUTE: return _("Execute");
+- #ifdef USE_ASPELL
+ case A_CHECK_SPELLING: return _("Check spelling");
+- #endif
+ default: return "";
+ }
+ }
+@@ -492,9 +484,7 @@
+ case A_ADDRBOOK: return STOCK_PIXMAP_ADDRESS_BOOK;
+ case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
+ case A_EXECUTE: return STOCK_PIXMAP_EXEC;
+- #ifdef USE_ASPELL
+ case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
+- #endif
+ default: return -1;
+ }
+ }
+@@ -523,10 +513,8 @@
{ A_SEPARATOR},
{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
#endif
@@ -13,10 +62,10 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
{ A_SEPARATOR},
{ A_GOTO_NEXT}
};
-@@ -617,10 +615,8 @@
+@@ -622,10 +610,8 @@
{ A_SEPARATOR},
{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
#endif
@@ -24,3 +73,60 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
{ A_GOTO_NEXT}
};
+@@ -1585,12 +1571,10 @@
+ compose_toolbar_cb(A_LINEWRAP_ALL, data);
+ }
+
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
+ {
+ compose_toolbar_cb(A_CHECK_SPELLING, data);
+ }
+-#endif
+ /*
+ * Execute actions from toolbar
+ */
+@@ -1715,9 +1699,7 @@
+ { A_LINEWRAP_CURRENT, toolbar_linewrap_current_cb },
+ { A_LINEWRAP_ALL, toolbar_linewrap_all_cb },
+ { A_ADDRBOOK, toolbar_addrbook_cb },
+-#ifdef USE_ASPELL
+ { A_CHECK_SPELLING, toolbar_check_spelling_cb },
+-#endif
+ { A_CLAWS_ACTIONS, toolbar_actions_execute_cb },
+ { A_CANCEL_INC, toolbar_cancel_inc_cb }
+ };
+@@ -2059,12 +2041,10 @@
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
+ toolbar_data->addrbook_btn = item;
+ break;
+-#ifdef USE_ASPELL
+ case A_CHECK_SPELLING:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
+ toolbar_data->spellcheck_btn = item;
+ break;
+-#endif
+
+ case A_CLAWS_ACTIONS:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
+@@ -2417,10 +2397,8 @@
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
+ if (compose->toolbar->addrbook_btn)
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
+-#ifdef USE_ASPELL
+ if (compose->toolbar->spellcheck_btn)
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
+-#endif
+ for (; items != NULL; items = g_slist_next(items)) {
+ ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
+ GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
+@@ -2463,9 +2441,7 @@
+ toolbar->linewrap_current_btn = NULL;
+ toolbar->linewrap_all_btn = NULL;
+ toolbar->addrbook_btn = NULL;
+-#ifdef USE_ASPELL
+ toolbar->spellcheck_btn = NULL;
+-#endif
+
+ toolbar_destroy(toolbar);
+ }
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
new file mode 100644
index 00000000000..4d5c9c3d03e
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ae
@@ -0,0 +1,11 @@
+--- ./src/common/utils.c.orig 2008-07-01 15:11:18.000000000 -0400
++++ ./src/common/utils.c 2008-07-01 15:11:43.000000000 -0400
+@@ -5078,7 +5078,7 @@
+ if (prefs_common_get_use_shred()) {
+ if (found_shred == -1) {
+ /* init */
+- args[0] = g_find_program_in_path("shred");
++ args[0] = g_find_program_in_path("claws-mail-shred");
+ debug_print("found shred: %s\n", args[0]);
+ found_shred = (args[0] != NULL) ? 1:0;
+ args[1] = "-f";
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
new file mode 100644
index 00000000000..200d4faf240
--- /dev/null
+++ b/mail/claws-mail/patches/patch-af
@@ -0,0 +1,11 @@
+--- src/prefs_other.c.orig 2008-07-01 15:08:42.000000000 -0400
++++ src/prefs_other.c 2008-07-01 15:09:51.000000000 -0400
+@@ -590,7 +590,7 @@
+ PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
+ _("Ask about account specific filtering rules when "
+ "filtering manually"));
+- shred_binary = g_find_program_in_path("shred");
++ shred_binary = g_find_program_in_path("claws-mail-shred");
+ if (shred_binary) {
+ PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
+ _("Use secure file deletion if possible"));
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 07:51:51 +0000