diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest index 67b27fd..d530635 100644 --- a/mail-client/sylpheed/Manifest +++ b/mail-client/sylpheed/Manifest @@ -1,4 +1,5 @@ AUX sylpheed-3.7.0-fix-incompatible-pointer-type.patch 443 BLAKE2B 29a45b526c099bfb33ada451b3800e67fd05eb6f56ccde1cc68623513f03b4cf6e60ab87cc20a8cdf710c7c23dec64c103db8904b3415d94e2ca9714e2d1dcd3 SHA512 b48bce1f7021336a7ab5bd1c7efd98df6f782e351c887d60793c4cad490be4a34732b758fbd2a546497fcf7dda97f1b8fcad48bf2fe280ad9cc8401d4bd98e06 +AUX sylpheed-3.7.0-more-incomp-pt-type.patch 64871 BLAKE2B ae7fcd7a5d1e469d51e090f549ebe393d99c073ce779ebefa708c13db3aa858dac649b230e279cca60d549cb030c064e065773e43a8d90570b47bfbff71acae8 SHA512 9b82494e1f6f6bcb9960f3b36904e7b7ec19d0daf22fae92ba4cafaf6a6905441acb177f9cab4a13d4b56e5537be16eabd8dba9d1c2b11ee8ee2c168f6fea879 AUX sylpheed-CVE-2021-37746.patch 1284 BLAKE2B c0b17ed528a957c9a907c5cbf8ba3288ce989cd0f6da28571e92a210e36008a3c26bc52f0d6eeea6c6c922d1fb3c920a81aeeb2cae6b8f785edee780615d768c SHA512 dd3d00ee9bfaff6e1670ed312d90ddd016c28cee244eae35feb8acd922adf916fdf134663b497bd3541e2706a612f62a932bee11ff2629d4109d2994251e39a1 AUX sylpheed-debian-Specify-MACRO_DIRS-as-general.patch 506 BLAKE2B 0b1ec398cbdb6ea9c6b1b258d7c945b35f03c24838322d66ecacdf34e70014ec15fabe4ee3e3f4a8aafca64219115512ba0e32fb0f1829cb266e1a89ad413436 SHA512 c2540d4288af38102cac4e966c643b2271a40b743d2a1804890080c5e9cb1b8900a358c999c5db8c14c29e34677c22fef15c712a163c8afce33c7d2a6f484c9e AUX sylpheed-debian-address-book.patch 901 BLAKE2B 7f33a243da7b7d2eb355530417897eba180b7fd16dc29fa455b8e24519aa337353b4077ac96b5330620e409eed9b1df6c81642bb72375e88b4e9c86d47e32865 SHA512 ecaf23f5e8d83ad58b72b934204baab02617ced1b30788903a8cef10868b963899602d9ba8540eee1e82ef906ae89a66b4152c2509932bfadf1db551962e2764 @@ -12,5 +13,6 @@ AUX sylpheed-tls-1.3.patch 496 BLAKE2B faa07a14de7f8f0501a2de29fc98ebcda52138f6a DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4 DIST sylpheed-3.8.0beta1.tar.bz2 3812124 BLAKE2B 8397f9ea540d524921ed9a55869a7143c241cf91ccb1715a8e240e2a5b9d55a8341fe6cc602c9070d5fcaa8e6355fb592d9f793656c64deeba5e13799612f662 SHA512 e84032324aec491e3f41ed39486f87df533ca659202361aec728c99f517bb01506750f826711e4d4cf05f3755987ac40272e97ef22df63c7b8b55b17b47c0c6e EBUILD sylpheed-3.7.0-r5.ebuild 1697 BLAKE2B d4b08f51995c95ab9789b0d570a63ae9c244f600f4ec81f2984c89f2a60b714eb85e1f30c33d88ba073d5a08778d220d470d79c96743108e8e75e4891df590e6 SHA512 64f8b0ac7b0ed959b196385748a248148300fd6ae35ae33d1d088d04b53423e40e09b184ead9faa16e7095a1cbf788e42b52791ac7c07faa2dee03c152b6516e +EBUILD sylpheed-3.7.0-r6.ebuild 1743 BLAKE2B 69dbf1dab733a557c5053843d1673d0f320aed5ee9062d65cb0ef18be3c2db0b4361590e617ec773eda7dd448553f4882240f3df8280346f91f61116854d0cf6 SHA512 499975e7f322992391a97d9e153caee7ea1e8de5517bbf56494d29e3ff9e5ec5b8f01ac6707a406f27f7febb4a988073cd2a6876885026872d9424b945a9e5fa EBUILD sylpheed-3.8.0_beta1.ebuild 2148 BLAKE2B 3f3fb180124b1a7c0d5859404677e7555576fd575dcb970e3940a8fe9a831a71171725f7ef1c65d7ca0403a2bfc76992c60106a2a5fe8e5e71c119a010c6fe39 SHA512 9d50428f648b73802ea8dfb046349d795b7aaa6252da1c0c9f231636f8ced4911dd25b7d90bb40d7d24056197d0c8e14876cf083a3c2026d5bdcca42a55cc5e0 MISC metadata.xml 353 BLAKE2B fcf86ed5908d01a1bbc2ee5c0a20a9b378a72039814d5cdcc1a139c14cab31d4137d020449c705002e61b0fa9294d4f8e1abd09a71ca7adae37f6e298c881448 SHA512 44dac43e49c796178bad4884b9a57cd225e6e6e9f78e72eb01e34a2f68fd277bce050aa527284f9a638d8b05c2cda9fdbdc2af72d2efdeca5ebbd0e0b168fc71 diff --git a/mail-client/sylpheed/files/sylpheed-3.7.0-more-incomp-pt-type.patch b/mail-client/sylpheed/files/sylpheed-3.7.0-more-incomp-pt-type.patch new file mode 100644 index 0000000..f149e9e --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-3.7.0-more-incomp-pt-type.patch @@ -0,0 +1,1079 @@ +diff --git a/src/addressbook.c b/src/addressbook.c +index b013507..5a5124f 100644 +--- a/src/addressbook.c ++++ b/src/addressbook.c +@@ -411,47 +411,47 @@ static GtkTargetEntry addressbook_drag_types[] = + static GtkItemFactoryEntry addressbook_entries[] = + { + {N_("/_File"), NULL, NULL, 0, ""}, +- {N_("/_File/New _Book"), NULL, addressbook_new_book_cb, 0, NULL}, +- {N_("/_File/New _vCard"), NULL, addressbook_new_vcard_cb, 0, NULL}, ++ {N_("/_File/New _Book"), NULL, (void (*)(void)) addressbook_new_book_cb, 0, NULL}, ++ {N_("/_File/New _vCard"), NULL, (void (*)(void)) addressbook_new_vcard_cb, 0, NULL}, + #ifdef USE_JPILOT +- {N_("/_File/New _JPilot"), NULL, addressbook_new_jpilot_cb, 0, NULL}, ++ {N_("/_File/New _JPilot"), NULL, (void (*)(void)) addressbook_new_jpilot_cb, 0, NULL}, + #endif + #ifdef USE_LDAP +- {N_("/_File/New _LDAP Server"), NULL, addressbook_new_ldap_cb, 0, NULL}, ++ {N_("/_File/New _LDAP Server"), NULL, (void (*)(void)) addressbook_new_ldap_cb, 0, NULL}, + #endif + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL}, +- {N_("/_File/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL}, ++ {N_("/_File/_Edit"), NULL, (void (*)(void)) addressbook_treenode_edit_cb, 0, NULL}, ++ {N_("/_File/_Delete"), NULL, (void (*)(void)) addressbook_treenode_delete_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Save"), "S", addressbook_file_save_cb, 0, NULL}, +- {N_("/_File/_Close"), "W", close_cb, 0, NULL}, ++ {N_("/_File/_Save"), "S", (void (*)(void)) addressbook_file_save_cb, 0, NULL}, ++ {N_("/_File/_Close"), "W", (void (*)(void)) close_cb, 0, NULL}, + + {N_("/_Edit"), NULL, NULL, 0, ""}, +- {N_("/_Edit/_Copy"), "C", addressbook_copy_address_cb, 0, NULL}, +- {N_("/_Edit/_Paste"), "V", addressbook_paste_address_cb, 0, NULL}, ++ {N_("/_Edit/_Copy"), "C", (void (*)(void)) addressbook_copy_address_cb, 0, NULL}, ++ {N_("/_Edit/_Paste"), "V", (void (*)(void)) addressbook_paste_address_cb, 0, NULL}, + + {N_("/_Address"), NULL, NULL, 0, ""}, +- {N_("/_Address/New _Address"), "N", addressbook_new_address_cb, 0, NULL}, +- {N_("/_Address/New _Group"), "G", addressbook_new_group_cb, 0, NULL}, +- {N_("/_Address/New _Folder"), "F", addressbook_new_folder_cb, 0, NULL}, ++ {N_("/_Address/New _Address"), "N", (void (*)(void)) addressbook_new_address_cb, 0, NULL}, ++ {N_("/_Address/New _Group"), "G", (void (*)(void)) addressbook_new_group_cb, 0, NULL}, ++ {N_("/_Address/New _Folder"), "F", (void (*)(void)) addressbook_new_folder_cb, 0, NULL}, + {N_("/_Address/---"), NULL, NULL, 0, ""}, + {N_("/_Address/Add _to recipient"), +- "M", addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL}, ++ "M", (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL}, + {N_("/_Address/Add to _Cc"), +- NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL}, ++ NULL, (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL}, + {N_("/_Address/Add to _Bcc"), +- NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL}, ++ NULL, (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL}, + {N_("/_Address/---"), NULL, NULL, 0, ""}, +- {N_("/_Address/_Edit"), "Return", addressbook_edit_address_cb, 0, NULL}, +- {N_("/_Address/_Delete"), "Delete", addressbook_delete_address_cb, 0, NULL}, ++ {N_("/_Address/_Edit"), "Return", (void (*)(void)) addressbook_edit_address_cb, 0, NULL}, ++ {N_("/_Address/_Delete"), "Delete", (void (*)(void)) addressbook_delete_address_cb, 0, NULL}, + + {N_("/_Tools"), NULL, NULL, 0, ""}, +- {N_("/_Tools/Import _LDIF file"), NULL, addressbook_import_ldif_cb, 0, NULL}, +- {N_("/_Tools/Import _CSV file"), NULL, addressbook_import_csv_cb, 0, NULL}, ++ {N_("/_Tools/Import _LDIF file"), NULL, (void (*)(void)) addressbook_import_ldif_cb, 0, NULL}, ++ {N_("/_Tools/Import _CSV file"), NULL, (void (*)(void)) addressbook_import_csv_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/Export to C_SV file"), NULL, addressbook_export_csv_cb, 0, NULL}, ++ {N_("/_Tools/Export to C_SV file"), NULL, (void (*)(void)) addressbook_export_csv_cb, 0, NULL}, + {N_("/_Help"), NULL, NULL, 0, ""}, +- {N_("/_Help/_About"), NULL, about_show, 0, NULL} ++ {N_("/_Help/_About"), NULL, (void (*)(void)) about_show, 0, NULL} + }; + + /* New options to be added. */ +@@ -468,32 +468,32 @@ static GtkItemFactoryEntry addressbook_entries[] = + + static GtkItemFactoryEntry addressbook_tree_popup_entries[] = + { +- {N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL}, +- {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL}, +- {N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL}, ++ {N_("/New _Address"), NULL, (void (*)(void)) addressbook_new_address_cb, 0, NULL}, ++ {N_("/New _Group"), NULL, (void (*)(void)) addressbook_new_group_cb, 0, NULL}, ++ {N_("/New _Folder"), NULL, (void (*)(void)) addressbook_new_folder_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL}, +- {N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL} ++ {N_("/_Edit"), NULL, (void (*)(void)) addressbook_treenode_edit_cb, 0, NULL}, ++ {N_("/_Delete"), NULL, (void (*)(void)) addressbook_treenode_delete_cb, 0, NULL} + }; + + static GtkItemFactoryEntry addressbook_list_popup_entries[] = + { +- {N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL}, +- {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL}, +- {N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL}, ++ {N_("/New _Address"), NULL, (void (*)(void)) addressbook_new_address_cb, 0, NULL}, ++ {N_("/New _Group"), NULL, (void (*)(void)) addressbook_new_group_cb, 0, NULL}, ++ {N_("/New _Folder"), NULL, (void (*)(void)) addressbook_new_folder_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/Add _to recipient"), +- NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL}, ++ NULL, (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL}, + {N_("/Add t_o Cc"), +- NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL}, ++ NULL, (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL}, + {N_("/Add to _Bcc"), +- NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL}, ++ NULL, (void (*)(void)) addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL}, +- {N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL}, ++ {N_("/_Edit"), NULL, (void (*)(void)) addressbook_edit_address_cb, 0, NULL}, ++ {N_("/_Delete"), NULL, (void (*)(void)) addressbook_delete_address_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Copy"), NULL, addressbook_copy_address_cb, 0, NULL}, +- {N_("/_Paste"), NULL, addressbook_paste_address_cb, 0, NULL} ++ {N_("/_Copy"), NULL, (void (*)(void)) addressbook_copy_address_cb, 0, NULL}, ++ {N_("/_Paste"), NULL, (void (*)(void)) addressbook_paste_address_cb, 0, NULL} + }; + + +diff --git a/src/compose.c b/src/compose.c +index 0e5a032..9a74658 100644 +--- a/src/compose.c ++++ b/src/compose.c +@@ -570,74 +570,74 @@ static gboolean autosave_timeout (gpointer data); + + static GtkItemFactoryEntry compose_popup_entries[] = + { +- {N_("/_Open"), NULL, compose_attach_open_cb, 0, NULL}, ++ {N_("/_Open"), NULL, (void (*)(void)) compose_attach_open_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Add..."), NULL, compose_attach_cb, 0, NULL}, +- {N_("/_Remove"), NULL, compose_attach_remove_selected, 0, NULL}, ++ {N_("/_Add..."), NULL, (void (*)(void)) compose_attach_cb, 0, NULL}, ++ {N_("/_Remove"), NULL, (void (*)(void)) compose_attach_remove_selected, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Properties..."), NULL, compose_attach_property, 0, NULL} ++ {N_("/_Properties..."), NULL, (void (*)(void)) compose_attach_property, 0, NULL} + }; + + static GtkItemFactoryEntry compose_entries[] = + { + {N_("/_File"), NULL, NULL, 0, ""}, + {N_("/_File/_Send"), "E", +- compose_send_cb, 0, NULL}, ++ (void (*)(void)) compose_send_cb, 0, NULL}, + {N_("/_File/Send _later"), "S", +- compose_send_later_cb, 0, NULL}, ++ (void (*)(void)) compose_send_later_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, + {N_("/_File/Save to _draft folder"), +- "D", compose_draft_cb, 0, NULL}, ++ "D", (void (*)(void)) compose_draft_cb, 0, NULL}, + {N_("/_File/Save and _keep editing"), +- "S", compose_draft_cb, 1, NULL}, ++ "S", (void (*)(void)) compose_draft_cb, 1, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Attach file"), "M", compose_attach_cb, 0, NULL}, +- {N_("/_File/_Insert file"), "I", compose_insert_file_cb, 0, NULL}, ++ {N_("/_File/_Attach file"), "M", (void (*)(void)) compose_attach_cb, 0, NULL}, ++ {N_("/_File/_Insert file"), "I", (void (*)(void)) compose_insert_file_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/Insert si_gnature"), "G", compose_insert_sig_cb, 0, NULL}, +- {N_("/_File/A_ppend signature"), "G", compose_insert_sig_cb, 1, NULL}, ++ {N_("/_File/Insert si_gnature"), "G", (void (*)(void)) compose_insert_sig_cb, 0, NULL}, ++ {N_("/_File/A_ppend signature"), "G", (void (*)(void)) compose_insert_sig_cb, 1, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Close"), "W", compose_close_cb, 0, NULL}, ++ {N_("/_File/_Close"), "W", (void (*)(void)) compose_close_cb, 0, NULL}, + + {N_("/_Edit"), NULL, NULL, 0, ""}, +- {N_("/_Edit/_Undo"), "Z", compose_undo_cb, 0, NULL}, +- {N_("/_Edit/_Redo"), "Y", compose_redo_cb, 0, NULL}, ++ {N_("/_Edit/_Undo"), "Z", (void (*)(void)) compose_undo_cb, 0, NULL}, ++ {N_("/_Edit/_Redo"), "Y", (void (*)(void)) compose_redo_cb, 0, NULL}, + {N_("/_Edit/---"), NULL, NULL, 0, ""}, +- {N_("/_Edit/Cu_t"), "X", compose_cut_cb, 0, NULL}, +- {N_("/_Edit/_Copy"), "C", compose_copy_cb, 0, NULL}, +- {N_("/_Edit/_Paste"), "V", compose_paste_cb, 0, NULL}, ++ {N_("/_Edit/Cu_t"), "X", (void (*)(void)) compose_cut_cb, 0, NULL}, ++ {N_("/_Edit/_Copy"), "C", (void (*)(void)) compose_copy_cb, 0, NULL}, ++ {N_("/_Edit/_Paste"), "V", (void (*)(void)) compose_paste_cb, 0, NULL}, + {N_("/_Edit/Paste as _quotation"), +- NULL, compose_paste_as_quote_cb, 0, NULL}, +- {N_("/_Edit/Select _all"), "A", compose_allsel_cb, 0, NULL}, ++ NULL, (void (*)(void)) compose_paste_as_quote_cb, 0, NULL}, ++ {N_("/_Edit/Select _all"), "A", (void (*)(void)) compose_allsel_cb, 0, NULL}, + {N_("/_Edit/---"), NULL, NULL, 0, ""}, + {N_("/_Edit/_Wrap current paragraph"), +- "L", compose_wrap_cb, 0, NULL}, ++ "L", (void (*)(void)) compose_wrap_cb, 0, NULL}, + {N_("/_Edit/Wrap all long _lines"), +- "L", compose_wrap_cb, 1, NULL}, +- {N_("/_Edit/Aut_o wrapping"), "L", compose_toggle_autowrap_cb, 0, ""}, ++ "L", (void (*)(void)) compose_wrap_cb, 1, NULL}, ++ {N_("/_Edit/Aut_o wrapping"), "L", (void (*)(void)) compose_toggle_autowrap_cb, 0, ""}, + {N_("/_View"), NULL, NULL, 0, ""}, +- {N_("/_View/_To"), NULL, compose_toggle_to_cb , 0, ""}, +- {N_("/_View/_Cc"), NULL, compose_toggle_cc_cb , 0, ""}, +- {N_("/_View/_Bcc"), NULL, compose_toggle_bcc_cb , 0, ""}, +- {N_("/_View/_Reply-To"), NULL, compose_toggle_replyto_cb, 0, ""}, ++ {N_("/_View/_To"), NULL, (void (*)(void)) compose_toggle_to_cb , 0, ""}, ++ {N_("/_View/_Cc"), NULL, (void (*)(void)) compose_toggle_cc_cb , 0, ""}, ++ {N_("/_View/_Bcc"), NULL, (void (*)(void)) compose_toggle_bcc_cb , 0, ""}, ++ {N_("/_View/_Reply-To"), NULL, (void (*)(void)) compose_toggle_replyto_cb, 0, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Followup-To"), NULL, compose_toggle_followupto_cb, 0, ""}, ++ {N_("/_View/_Followup-To"), NULL, (void (*)(void)) compose_toggle_followupto_cb, 0, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/R_uler"), NULL, compose_toggle_ruler_cb, 0, ""}, ++ {N_("/_View/R_uler"), NULL, (void (*)(void)) compose_toggle_ruler_cb, 0, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Attachment"), NULL, compose_toggle_attach_cb, 0, ""}, ++ {N_("/_View/_Attachment"), NULL, (void (*)(void)) compose_toggle_attach_cb, 0, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, + {N_("/_View/Cu_stomize toolbar..."), +- NULL, compose_customize_toolbar_cb, 0, NULL}, ++ NULL, (void (*)(void)) compose_customize_toolbar_cb, 0, NULL}, + {N_("/_View/---"), NULL, NULL, 0, ""}, + + #define ENC_ACTION(action) \ +- NULL, compose_set_encoding_cb, action, \ ++ NULL, (void (*)(void)) compose_set_encoding_cb, action, \ + "/View/Character encoding/Automatic" + + {N_("/_View/Character _encoding"), NULL, NULL, 0, ""}, + {N_("/_View/Character _encoding/_Automatic"), +- NULL, compose_set_encoding_cb, C_AUTO, ""}, ++ NULL, (void (*)(void)) compose_set_encoding_cb, C_AUTO, ""}, + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, ""}, + + {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"), +@@ -716,31 +716,31 @@ static GtkItemFactoryEntry compose_entries[] = + ENC_ACTION(C_WINDOWS_874)}, + + {N_("/_Tools"), NULL, NULL, 0, ""}, +- {N_("/_Tools/_Address book"), "A", compose_address_cb , 0, NULL}, ++ {N_("/_Tools/_Address book"), "A", (void (*)(void)) compose_address_cb , 0, NULL}, + {N_("/_Tools/_Template"), NULL, NULL, 0, ""}, + #ifndef G_OS_WIN32 + {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, + #endif + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/Edit with e_xternal editor"), +- "X", compose_ext_editor_cb, 0, NULL}, ++ "X", (void (*)(void)) compose_ext_editor_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/Request _disposition notification"), NULL, compose_toggle_mdn_cb , 0, ""}, ++ {N_("/_Tools/Request _disposition notification"), NULL, (void (*)(void)) compose_toggle_mdn_cb , 0, ""}, + + #if USE_GPGME + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/PGP Si_gn"), NULL, compose_toggle_sign_cb , 0, ""}, +- {N_("/_Tools/PGP _Encrypt"), NULL, compose_toggle_encrypt_cb, 0, ""}, ++ {N_("/_Tools/PGP Si_gn"), NULL, (void (*)(void)) compose_toggle_sign_cb , 0, ""}, ++ {N_("/_Tools/PGP _Encrypt"), NULL, (void (*)(void)) compose_toggle_encrypt_cb, 0, ""}, + #endif /* USE_GPGME */ + + #if USE_GTKSPELL + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/_Check spell"), NULL, compose_toggle_spell_cb, 0, ""}, ++ {N_("/_Tools/_Check spell"), NULL, (void (*)(void)) compose_toggle_spell_cb, 0, ""}, + {N_("/_Tools/_Set spell language"), NULL, NULL, 0, ""}, + #endif /* USE_GTKSPELL */ + + {N_("/_Help"), NULL, NULL, 0, ""}, +- {N_("/_Help/_About"), NULL, about_show, 0, NULL} ++ {N_("/_Help/_About"), NULL, (void (*)(void)) about_show, 0, NULL} + }; + + enum +diff --git a/src/folderview.c b/src/folderview.c +index dc9582c..d095f8f 100644 +--- a/src/folderview.c ++++ b/src/folderview.c +@@ -251,74 +251,74 @@ static GtkTargetEntry folderview_drag_types[] = + + static GtkItemFactoryEntry folderview_mail_popup_entries[] = + { +- {N_("/Create _new folder..."), NULL, folderview_new_folder_cb, 0, NULL}, +- {N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL}, +- {N_("/_Move folder..."), NULL, folderview_move_folder_cb, 0, NULL}, +- {N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL}, ++ {N_("/Create _new folder..."), NULL, (void (*)(void)) folderview_new_folder_cb, 0, NULL}, ++ {N_("/_Rename folder..."), NULL, (void (*)(void)) folderview_rename_folder_cb, 0, NULL}, ++ {N_("/_Move folder..."), NULL, (void (*)(void)) folderview_move_folder_cb, 0, NULL}, ++ {N_("/_Delete folder"), NULL, (void (*)(void)) folderview_delete_folder_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Empty _junk"), NULL, folderview_empty_trash_cb, 0, NULL}, +- {N_("/Empty _trash"), NULL, folderview_empty_trash_cb, 0, NULL}, ++ {N_("/Empty _junk"), NULL, (void (*)(void)) folderview_empty_trash_cb, 0, NULL}, ++ {N_("/Empty _trash"), NULL, (void (*)(void)) folderview_empty_trash_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Check for new messages"), +- NULL, folderview_update_tree_cb, 0, NULL}, +- {N_("/R_ebuild folder tree"), NULL, folderview_update_tree_cb, 1, NULL}, +- {N_("/_Update summary"), NULL, folderview_update_summary_cb, 0, NULL}, ++ NULL, (void (*)(void)) folderview_update_tree_cb, 0, NULL}, ++ {N_("/R_ebuild folder tree"), NULL, (void (*)(void)) folderview_update_tree_cb, 1, NULL}, ++ {N_("/_Update summary"), NULL, (void (*)(void)) folderview_update_summary_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Mar_k all read"), NULL, folderview_mark_all_read_cb, 0, NULL}, +- {N_("/Send _queued messages"), NULL, folderview_send_queue_cb, 0, NULL}, ++ {N_("/Mar_k all read"), NULL, (void (*)(void)) folderview_mark_all_read_cb, 0, NULL}, ++ {N_("/Send _queued messages"), NULL, (void (*)(void)) folderview_send_queue_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL}, ++ {N_("/_Search messages..."), NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, + {N_("/Ed_it search condition..."), +- NULL, folderview_search_cb, 0, NULL}, +- {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL} ++ NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, ++ {N_("/_Properties..."), NULL, (void (*)(void)) folderview_property_cb, 0, NULL} + }; + + static GtkItemFactoryEntry folderview_imap_popup_entries[] = + { +- {N_("/Create _new folder..."), NULL, folderview_new_folder_cb, 0, NULL}, +- {N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL}, +- {N_("/_Move folder..."), NULL, folderview_move_folder_cb, 0, NULL}, +- {N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL}, ++ {N_("/Create _new folder..."), NULL, (void (*)(void)) folderview_new_folder_cb, 0, NULL}, ++ {N_("/_Rename folder..."), NULL, (void (*)(void)) folderview_rename_folder_cb, 0, NULL}, ++ {N_("/_Move folder..."), NULL, (void (*)(void)) folderview_move_folder_cb, 0, NULL}, ++ {N_("/_Delete folder"), NULL, (void (*)(void)) folderview_delete_folder_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Empty _junk"), NULL, folderview_empty_trash_cb, 0, NULL}, +- {N_("/Empty _trash"), NULL, folderview_empty_trash_cb, 0, NULL}, ++ {N_("/Empty _junk"), NULL, (void (*)(void)) folderview_empty_trash_cb, 0, NULL}, ++ {N_("/Empty _trash"), NULL, (void (*)(void)) folderview_empty_trash_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Down_load"), NULL, folderview_download_cb, 0, NULL}, ++ {N_("/Down_load"), NULL, (void (*)(void)) folderview_download_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Check for new messages"), +- NULL, folderview_update_tree_cb, 0, NULL}, +- {N_("/R_ebuild folder tree"), NULL, folderview_update_tree_cb, 1, NULL}, +- {N_("/_Update summary"), NULL, folderview_update_summary_cb, 0, NULL}, ++ NULL, (void (*)(void)) folderview_update_tree_cb, 0, NULL}, ++ {N_("/R_ebuild folder tree"), NULL, (void (*)(void)) folderview_update_tree_cb, 1, NULL}, ++ {N_("/_Update summary"), NULL, (void (*)(void)) folderview_update_summary_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Mar_k all read"), NULL, folderview_mark_all_read_cb, 0, NULL}, +- {N_("/Send _queued messages"), NULL, folderview_send_queue_cb, 0, NULL}, ++ {N_("/Mar_k all read"), NULL, (void (*)(void)) folderview_mark_all_read_cb, 0, NULL}, ++ {N_("/Send _queued messages"), NULL, (void (*)(void)) folderview_send_queue_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL}, ++ {N_("/_Search messages..."), NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, + {N_("/Ed_it search condition..."), +- NULL, folderview_search_cb, 0, NULL}, +- {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL} ++ NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, ++ {N_("/_Properties..."), NULL, (void (*)(void)) folderview_property_cb, 0, NULL} + }; + + static GtkItemFactoryEntry folderview_news_popup_entries[] = + { + {N_("/Su_bscribe to newsgroup..."), +- NULL, folderview_new_news_group_cb, 0, NULL}, +- {N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL}, +- {N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL}, +- {N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL}, ++ NULL, (void (*)(void)) folderview_new_news_group_cb, 0, NULL}, ++ {N_("/_Remove newsgroup"), NULL, (void (*)(void)) folderview_rm_news_group_cb, 0, NULL}, ++ {N_("/_Rename folder..."), NULL, (void (*)(void)) folderview_rename_folder_cb, 0, NULL}, ++ {N_("/_Delete folder"), NULL, (void (*)(void)) folderview_delete_folder_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Down_load"), NULL, folderview_download_cb, 0, NULL}, ++ {N_("/Down_load"), NULL, (void (*)(void)) folderview_download_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Check for new messages"), +- NULL, folderview_update_tree_cb, 0, NULL}, +- {N_("/_Update summary"), NULL, folderview_update_summary_cb, 0, NULL}, ++ NULL, (void (*)(void)) folderview_update_tree_cb, 0, NULL}, ++ {N_("/_Update summary"), NULL, (void (*)(void)) folderview_update_summary_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Mar_k all read"), NULL, folderview_mark_all_read_cb, 0, NULL}, ++ {N_("/Mar_k all read"), NULL, (void (*)(void)) folderview_mark_all_read_cb, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL}, ++ {N_("/_Search messages..."), NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, + {N_("/Ed_it search condition..."), +- NULL, folderview_search_cb, 0, NULL}, +- {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL} ++ NULL, (void (*)(void)) folderview_search_cb, 0, NULL}, ++ {N_("/_Properties..."), NULL, (void (*)(void)) folderview_property_cb, 0, NULL} + }; + + +diff --git a/src/mainwindow.c b/src/mainwindow.c +index bc7e713..234f1a3 100644 +--- a/src/mainwindow.c ++++ b/src/mainwindow.c +@@ -558,139 +558,139 @@ static GtkItemFactoryEntry mainwin_entries[] = + {N_("/_File"), NULL, NULL, 0, ""}, + {N_("/_File/_Folder"), NULL, NULL, 0, ""}, + {N_("/_File/_Folder/Create _new folder..."), +- NULL, new_folder_cb, 0, NULL}, +- {N_("/_File/_Folder/_Rename folder..."),NULL, rename_folder_cb, 0, NULL}, +- {N_("/_File/_Folder/_Move folder..."), NULL, move_folder_cb, 0, NULL}, +- {N_("/_File/_Folder/_Delete folder"), NULL, delete_folder_cb, 0, NULL}, ++ NULL, (void (*)(void)) new_folder_cb, 0, NULL}, ++ {N_("/_File/_Folder/_Rename folder..."),NULL, (void (*)(void)) rename_folder_cb, 0, NULL}, ++ {N_("/_File/_Folder/_Move folder..."), NULL, (void (*)(void)) move_folder_cb, 0, NULL}, ++ {N_("/_File/_Folder/_Delete folder"), NULL, (void (*)(void)) delete_folder_cb, 0, NULL}, + {N_("/_File/_Mailbox"), NULL, NULL, 0, ""}, +- {N_("/_File/_Mailbox/Add _mailbox..."), NULL, add_mailbox_cb, 0, NULL}, +- {N_("/_File/_Mailbox/_Remove mailbox"), NULL, remove_mailbox_cb, 0, NULL}, ++ {N_("/_File/_Mailbox/Add _mailbox..."), NULL, (void (*)(void)) add_mailbox_cb, 0, NULL}, ++ {N_("/_File/_Mailbox/_Remove mailbox"), NULL, (void (*)(void)) remove_mailbox_cb, 0, NULL}, + {N_("/_File/_Mailbox/---"), NULL, NULL, 0, ""}, + {N_("/_File/_Mailbox/_Check for new messages"), +- NULL, update_folderview_cb, 0, NULL}, ++ NULL, (void (*)(void)) update_folderview_cb, 0, NULL}, + {N_("/_File/_Mailbox/Check for new messages in _all mailboxes"), +- NULL, update_folderview_cb, 1, NULL}, ++ NULL, (void (*)(void)) update_folderview_cb, 1, NULL}, + {N_("/_File/_Mailbox/---"), NULL, NULL, 0, ""}, + {N_("/_File/_Mailbox/R_ebuild folder tree"), +- NULL, rebuild_tree_cb, 0, NULL}, ++ NULL, (void (*)(void)) rebuild_tree_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Import mail data..."), NULL, import_mail_cb, 0, NULL}, +- {N_("/_File/_Export mail data..."), NULL, export_mail_cb, 0, NULL}, ++ {N_("/_File/_Import mail data..."), NULL, (void (*)(void)) import_mail_cb, 0, NULL}, ++ {N_("/_File/_Export mail data..."), NULL, (void (*)(void)) export_mail_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/Empty all _trash"), NULL, empty_trash_cb, 0, NULL}, ++ {N_("/_File/Empty all _trash"), NULL, (void (*)(void)) empty_trash_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Save as..."), "S", save_as_cb, 0, NULL}, ++ {N_("/_File/_Save as..."), "S", (void (*)(void)) save_as_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, + #if GTK_CHECK_VERSION(2, 10, 0) +- {N_("/_File/Page set_up..."), NULL, page_setup_cb, 0, NULL}, ++ {N_("/_File/Page set_up..."), NULL, (void (*)(void)) page_setup_cb, 0, NULL}, + #endif +- {N_("/_File/_Print..."), NULL, print_cb, 0, NULL}, ++ {N_("/_File/_Print..."), NULL, (void (*)(void)) print_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Work offline"), NULL, toggle_offline_cb, 0, ""}, ++ {N_("/_File/_Work offline"), NULL, (void (*)(void)) toggle_offline_cb, 0, ""}, + {N_("/_File/---"), NULL, NULL, 0, ""}, + /* {N_("/_File/_Close"), "W", app_exit_cb, 0, NULL}, */ +- {N_("/_File/E_xit"), "Q", app_exit_cb, 0, NULL}, ++ {N_("/_File/E_xit"), "Q", (void (*)(void)) app_exit_cb, 0, NULL}, + + {N_("/_Edit"), NULL, NULL, 0, ""}, +- {N_("/_Edit/_Copy"), "C", copy_cb, 0, NULL}, +- {N_("/_Edit/Select _all"), "A", allsel_cb, 0, NULL}, +- {N_("/_Edit/Select _thread"), NULL, select_thread_cb, 0, NULL}, ++ {N_("/_Edit/_Copy"), "C", (void (*)(void)) copy_cb, 0, NULL}, ++ {N_("/_Edit/Select _all"), "A", (void (*)(void)) allsel_cb, 0, NULL}, ++ {N_("/_Edit/Select _thread"), NULL, (void (*)(void)) select_thread_cb, 0, NULL}, + {N_("/_Edit/---"), NULL, NULL, 0, ""}, + {N_("/_Edit/_Find in current message..."), +- "F", search_cb, 0, NULL}, +- {N_("/_Edit/_Search messages..."), "F", search_cb, 1, NULL}, +- {N_("/_Edit/_Quick search"), "S", search_cb, 2, NULL}, ++ "F", (void (*)(void)) search_cb, 0, NULL}, ++ {N_("/_Edit/_Search messages..."), "F", (void (*)(void)) search_cb, 1, NULL}, ++ {N_("/_Edit/_Quick search"), "S", (void (*)(void)) search_cb, 2, NULL}, + + {N_("/_View"), NULL, NULL, 0, ""}, + {N_("/_View/Show or hi_de"), NULL, NULL, 0, ""}, + {N_("/_View/Show or hi_de/_Folder tree"), +- NULL, toggle_folder_cb, 0, ""}, ++ NULL, (void (*)(void)) toggle_folder_cb, 0, ""}, + {N_("/_View/Show or hi_de/_Message view"), +- "V", toggle_message_cb, 0, ""}, ++ "V", (void (*)(void)) toggle_message_cb, 0, ""}, + {N_("/_View/Show or hi_de/_Toolbar"), + NULL, NULL, 0, ""}, + {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, ""}, ++ NULL, (void (*)(void)) toggle_toolbar_cb, TOOLBAR_BOTH, ""}, + {N_("/_View/Show or hi_de/_Toolbar/Text at the _right of icon"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Icon and text"}, ++ NULL, (void (*)(void)) toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Icon and text"}, + {N_("/_View/Show or hi_de/_Toolbar/_Icon"), +- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"}, ++ NULL, (void (*)(void)) toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"}, + {N_("/_View/Show or hi_de/_Toolbar/_Text"), +- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"}, ++ NULL, (void (*)(void)) toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"}, + {N_("/_View/Show or hi_de/_Toolbar/_None"), +- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"}, ++ NULL, (void (*)(void)) toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"}, + {N_("/_View/Show or hi_de/_Search bar"), +- NULL, toggle_searchbar_cb, 0, ""}, ++ NULL, (void (*)(void)) toggle_searchbar_cb, 0, ""}, + {N_("/_View/Show or hi_de/Status _bar"), +- NULL, toggle_statusbar_cb, 0, ""}, +- {N_("/_View/_Customize toolbar..."), NULL, toolbar_customize_cb, 0, NULL}, ++ NULL, (void (*)(void)) toggle_statusbar_cb, 0, ""}, ++ {N_("/_View/_Customize toolbar..."), NULL, (void (*)(void)) toolbar_customize_cb, 0, NULL}, + {N_("/_View/---"), NULL, NULL, 0, ""}, + {N_("/_View/Layou_t"), NULL, NULL, 0, ""}, +- {N_("/_View/Layou_t/_Normal"), NULL, change_layout_cb, LAYOUT_NORMAL, ""}, +- {N_("/_View/Layou_t/_Vertical"), NULL, change_layout_cb, LAYOUT_VERTICAL, "/View/Layout/Normal"}, +- {N_("/_View/Separate f_older tree"), NULL, separate_widget_cb, SEPARATE_FOLDER, ""}, +- {N_("/_View/Separate _message view"), NULL, separate_widget_cb, SEPARATE_MESSAGE, ""}, ++ {N_("/_View/Layou_t/_Normal"), NULL, (void (*)(void)) change_layout_cb, LAYOUT_NORMAL, ""}, ++ {N_("/_View/Layou_t/_Vertical"), NULL, (void (*)(void)) change_layout_cb, LAYOUT_VERTICAL, "/View/Layout/Normal"}, ++ {N_("/_View/Separate f_older tree"), NULL, (void (*)(void)) separate_widget_cb, SEPARATE_FOLDER, ""}, ++ {N_("/_View/Separate _message view"), NULL, (void (*)(void)) separate_widget_cb, SEPARATE_MESSAGE, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Sort"), NULL, NULL, 0, ""}, +- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, ""}, +- {N_("/_View/_Sort/by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by t_hread date"), NULL, sort_summary_cb, SORT_BY_TDATE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _from"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _recipient"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _number"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_NUMBER, ""}, ++ {N_("/_View/_Sort/by s_ize"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _date"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by t_hread date"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_TDATE, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _from"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _recipient"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _subject"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"}, + {N_("/_View/_Sort/by _color label"), +- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"}, ++ NULL, (void (*)(void)) sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _mark"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _unread"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"}, + {N_("/_View/_Sort/by a_ttachment"), +- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"}, +- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"}, ++ NULL, (void (*)(void)) sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/D_on't sort"), NULL, (void (*)(void)) sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"}, + {N_("/_View/_Sort/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, ""}, +- {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"}, ++ {N_("/_View/_Sort/Ascending"), NULL, (void (*)(void)) sort_summary_type_cb, SORT_ASCENDING, ""}, ++ {N_("/_View/_Sort/Descending"), NULL, (void (*)(void)) sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"}, + {N_("/_View/_Sort/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Sort/_Attract by subject"), +- NULL, attract_by_subject_cb, 0, NULL}, +- {N_("/_View/Th_read view"), "T", thread_cb, 0, ""}, +- {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL}, +- {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL}, +- {N_("/_View/Set display _item..."), NULL, set_display_item_cb, 0, NULL}, ++ NULL, (void (*)(void)) attract_by_subject_cb, 0, NULL}, ++ {N_("/_View/Th_read view"), "T", (void (*)(void)) thread_cb, 0, ""}, ++ {N_("/_View/E_xpand all threads"), NULL, (void (*)(void)) expand_threads_cb, 0, NULL}, ++ {N_("/_View/Co_llapse all threads"), NULL, (void (*)(void)) collapse_threads_cb, 0, NULL}, ++ {N_("/_View/Set display _item..."), NULL, (void (*)(void)) set_display_item_cb, 0, NULL}, + + {N_("/_View/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to"), NULL, NULL, 0, ""}, +- {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL}, +- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, ++ {N_("/_View/_Go to/_Prev message"), "P", (void (*)(void)) prev_cb, 0, NULL}, ++ {N_("/_View/_Go to/_Next message"), "N", (void (*)(void)) next_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/P_rev unread message"), +- "P", prev_unread_cb, 0, NULL}, ++ "P", (void (*)(void)) prev_unread_cb, 0, NULL}, + {N_("/_View/_Go to/N_ext unread message"), +- "N", next_unread_cb, 0, NULL}, ++ "N", (void (*)(void)) next_unread_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Go to/Prev ne_w message"), NULL, prev_new_cb, 0, NULL}, +- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL}, ++ {N_("/_View/_Go to/Prev ne_w message"), NULL, (void (*)(void)) prev_new_cb, 0, NULL}, ++ {N_("/_View/_Go to/Ne_xt new message"), NULL, (void (*)(void)) next_new_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/Prev _marked message"), +- NULL, prev_marked_cb, 0, NULL}, ++ NULL, (void (*)(void)) prev_marked_cb, 0, NULL}, + {N_("/_View/_Go to/Next m_arked message"), +- NULL, next_marked_cb, 0, NULL}, ++ NULL, (void (*)(void)) next_marked_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, + {N_("/_View/_Go to/Prev _labeled message"), +- NULL, prev_labeled_cb, 0, NULL}, ++ NULL, (void (*)(void)) prev_labeled_cb, 0, NULL}, + {N_("/_View/_Go to/Next la_beled message"), +- NULL, next_labeled_cb, 0, NULL}, ++ NULL, (void (*)(void)) next_labeled_cb, 0, NULL}, + {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Go to/Other _folder..."), "G", goto_folder_cb, 0, NULL}, ++ {N_("/_View/_Go to/Other _folder..."), "G", (void (*)(void)) goto_folder_cb, 0, NULL}, + {N_("/_View/---"), NULL, NULL, 0, ""}, + + #define ENC_SEPARATOR \ + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, ""} + #define ENC_ACTION(action) \ +- NULL, set_charset_cb, action, "/View/Character encoding/Auto detect" ++ NULL, (void (*)(void)) set_charset_cb, action, "/View/Character encoding/Auto detect" + + {N_("/_View/Character _encoding"), NULL, NULL, 0, ""}, + {N_("/_View/Character _encoding/_Auto detect"), +- NULL, set_charset_cb, C_AUTO, ""}, ++ NULL, (void (*)(void)) set_charset_cb, C_AUTO, ""}, + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, ""}, + {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"), + ENC_ACTION(C_US_ASCII)}, +@@ -785,117 +785,117 @@ static GtkItemFactoryEntry mainwin_entries[] = + #undef CODESET_ACTION + + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/Open in new _window"), "N", open_msg_cb, 0, NULL}, +- {N_("/_View/Mess_age source"), "U", view_source_cb, 0, NULL}, +- {N_("/_View/All _headers"), "H", show_all_header_cb, 0, ""}, ++ {N_("/_View/Open in new _window"), "N", (void (*)(void)) open_msg_cb, 0, NULL}, ++ {N_("/_View/Mess_age source"), "U", (void (*)(void)) view_source_cb, 0, NULL}, ++ {N_("/_View/All _headers"), "H", (void (*)(void)) show_all_header_cb, 0, ""}, + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/_Update summary"), "U", update_summary_cb, 0, NULL}, ++ {N_("/_View/_Update summary"), "U", (void (*)(void)) update_summary_cb, 0, NULL}, + + {N_("/_Message"), NULL, NULL, 0, ""}, + {N_("/_Message/Recei_ve"), NULL, NULL, 0, ""}, + {N_("/_Message/Recei_ve/Get from _current account"), +- "I", inc_mail_cb, 0, NULL}, ++ "I", (void (*)(void)) inc_mail_cb, 0, NULL}, + {N_("/_Message/Recei_ve/Get from _all accounts"), +- "I", inc_all_account_mail_cb, 0, NULL}, ++ "I", (void (*)(void)) inc_all_account_mail_cb, 0, NULL}, + {N_("/_Message/Recei_ve/Stop receivin_g"), +- NULL, inc_stop_cb, 0, NULL}, ++ NULL, (void (*)(void)) inc_stop_cb, 0, NULL}, + {N_("/_Message/Recei_ve/_Remote mailbox..."), +- NULL, rpop3_cb, 0, NULL}, ++ NULL, (void (*)(void)) rpop3_cb, 0, NULL}, + {N_("/_Message/Recei_ve/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL}, ++ {N_("/_Message/_Send queued messages"), NULL, (void (*)(void)) send_queue_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/Compose _new message"), "M", compose_cb, 0, NULL}, ++ {N_("/_Message/Compose _new message"), "M", (void (*)(void)) compose_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Reply"), "R", reply_cb, COMPOSE_REPLY, NULL}, ++ {N_("/_Message/_Reply"), "R", (void (*)(void)) reply_cb, COMPOSE_REPLY, NULL}, + {N_("/_Message/Repl_y to"), NULL, NULL, 0, ""}, +- {N_("/_Message/Repl_y to/_all"), "R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, +- {N_("/_Message/Repl_y to/_sender"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, ++ {N_("/_Message/Repl_y to/_all"), "R", (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, ++ {N_("/_Message/Repl_y to/_sender"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, + {N_("/_Message/Repl_y to/mailing _list"), +- "L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, ++ "L", (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Forward"), "F", reply_cb, COMPOSE_FORWARD, NULL}, ++ {N_("/_Message/_Forward"), "F", (void (*)(void)) reply_cb, COMPOSE_FORWARD, NULL}, + {N_("/_Message/For_ward as attachment"), +- "F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, +- {N_("/_Message/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL}, ++ "F", (void (*)(void)) reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, ++ {N_("/_Message/Redirec_t"), NULL, (void (*)(void)) reply_cb, COMPOSE_REDIRECT, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/M_ove..."), "O", move_to_cb, 0, NULL}, +- {N_("/_Message/_Copy..."), "O", copy_to_cb, 0, NULL}, ++ {N_("/_Message/M_ove..."), "O", (void (*)(void)) move_to_cb, 0, NULL}, ++ {N_("/_Message/_Copy..."), "O", (void (*)(void)) copy_to_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, + {N_("/_Message/_Mark"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Mark/Set _flag"), "asterisk", mark_cb, 0, NULL}, +- {N_("/_Message/_Mark/_Unset flag"), "U", unmark_cb, 0, NULL}, ++ {N_("/_Message/_Mark/Set _flag"), "asterisk", (void (*)(void)) mark_cb, 0, NULL}, ++ {N_("/_Message/_Mark/_Unset flag"), "U", (void (*)(void)) unmark_cb, 0, NULL}, + {N_("/_Message/_Mark/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Mark/Mark as unr_ead"), "exclam", mark_as_unread_cb, 0, NULL}, ++ {N_("/_Message/_Mark/Mark as unr_ead"), "exclam", (void (*)(void)) mark_as_unread_cb, 0, NULL}, + {N_("/_Message/_Mark/Mark as rea_d"), +- NULL, mark_as_read_cb, 0, NULL}, ++ NULL, (void (*)(void)) mark_as_read_cb, 0, NULL}, + {N_("/_Message/_Mark/Mark _thread as read"), +- NULL, mark_thread_as_read_cb, 0, NULL}, +- {N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL}, ++ NULL, (void (*)(void)) mark_thread_as_read_cb, 0, NULL}, ++ {N_("/_Message/_Mark/Mark all _read"), NULL, (void (*)(void)) mark_all_read_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Delete"), "D", delete_cb, 0, NULL}, ++ {N_("/_Message/_Delete"), "D", (void (*)(void)) delete_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/Set as _junk mail"), "J", junk_cb, 0, NULL}, +- {N_("/_Message/Set as not j_unk mail"), "J", junk_cb, 1, NULL}, ++ {N_("/_Message/Set as _junk mail"), "J", (void (*)(void)) junk_cb, 0, NULL}, ++ {N_("/_Message/Set as not j_unk mail"), "J", (void (*)(void)) junk_cb, 1, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL}, ++ {N_("/_Message/Re-_edit"), NULL, (void (*)(void)) reedit_cb, 0, NULL}, + + {N_("/_Tools"), NULL, NULL, 0, ""}, +- {N_("/_Tools/_Address book"), "A", addressbook_open_cb, 0, NULL}, ++ {N_("/_Tools/_Address book"), "A", (void (*)(void)) addressbook_open_cb, 0, NULL}, + {N_("/_Tools/Add sender to address boo_k..."), +- NULL, add_address_cb, 0, NULL}, ++ NULL, (void (*)(void)) add_address_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/_Filter all messages in folder"), +- NULL, filter_cb, 0, NULL}, ++ NULL, (void (*)(void)) filter_cb, 0, NULL}, + {N_("/_Tools/Filter _selected messages"), +- NULL, filter_cb, 1, NULL}, ++ NULL, (void (*)(void)) filter_cb, 1, NULL}, + {N_("/_Tools/_Create filter rule"), NULL, NULL, 0, ""}, + {N_("/_Tools/_Create filter rule/_Automatically"), +- NULL, create_filter_cb, FLT_BY_AUTO, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_AUTO, NULL}, + {N_("/_Tools/_Create filter rule/by _From"), +- NULL, create_filter_cb, FLT_BY_FROM, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_FROM, NULL}, + {N_("/_Tools/_Create filter rule/by _To"), +- NULL, create_filter_cb, FLT_BY_TO, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_TO, NULL}, + {N_("/_Tools/_Create filter rule/by _Subject"), +- NULL, create_filter_cb, FLT_BY_SUBJECT, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_SUBJECT, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/Filter _junk mails in folder"), +- NULL, filter_junk_cb, 0, NULL}, ++ NULL, (void (*)(void)) filter_junk_cb, 0, NULL}, + {N_("/_Tools/Filter junk _mails in selected messages"), +- NULL, filter_junk_cb, 1, NULL}, ++ NULL, (void (*)(void)) filter_junk_cb, 1, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + #ifndef G_OS_WIN32 + {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + #endif + {N_("/_Tools/Delete du_plicated messages"), +- NULL, delete_duplicated_cb, 0, NULL}, ++ NULL, (void (*)(void)) delete_duplicated_cb, 0, NULL}, + {N_("/_Tools/C_oncatenate separated messages"), +- NULL, concat_partial_cb, 0, NULL}, ++ NULL, (void (*)(void)) concat_partial_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/E_xecute marked process"), "X", execute_summary_cb, 0, NULL}, ++ {N_("/_Tools/E_xecute marked process"), "X", (void (*)(void)) execute_summary_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/Op_en configuration folder"), +- NULL, open_config_folder_cb, 0, NULL}, +- {N_("/_Tools/Open a_ttachments folder"),NULL, open_attachments_folder_cb, 0, NULL}, ++ NULL, (void (*)(void)) open_config_folder_cb, 0, NULL}, ++ {N_("/_Tools/Open a_ttachments folder"),NULL, (void (*)(void)) open_attachments_folder_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, +- {N_("/_Tools/_Log window"), "L", log_window_show_cb, 0, NULL}, ++ {N_("/_Tools/_Log window"), "L", (void (*)(void)) log_window_show_cb, 0, NULL}, + + {N_("/_Configuration"), NULL, NULL, 0, ""}, + {N_("/_Configuration/_Common preferences..."), +- NULL, prefs_common_open_cb, 0, NULL}, ++ NULL, (void (*)(void)) prefs_common_open_cb, 0, NULL}, + {N_("/_Configuration/_Filter settings..."), +- NULL, prefs_filter_open_cb, 0, NULL}, +- {N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL}, ++ NULL, (void (*)(void)) prefs_filter_open_cb, 0, NULL}, ++ {N_("/_Configuration/_Template..."), NULL, (void (*)(void)) prefs_template_open_cb, 0, NULL}, + #ifndef G_OS_WIN32 +- {N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL}, ++ {N_("/_Configuration/_Actions..."), NULL, (void (*)(void)) prefs_actions_open_cb, 0, NULL}, + #endif + {N_("/_Configuration/Plug-in _manager..."), +- NULL, plugin_manager_open_cb, 0, NULL}, ++ NULL, (void (*)(void)) plugin_manager_open_cb, 0, NULL}, + {N_("/_Configuration/---"), NULL, NULL, 0, ""}, + {N_("/_Configuration/_Preferences for current account..."), +- NULL, prefs_account_open_cb, 0, NULL}, ++ NULL, (void (*)(void)) prefs_account_open_cb, 0, NULL}, + {N_("/_Configuration/Create _new account..."), +- NULL, new_account_cb, 0, NULL}, ++ NULL, (void (*)(void)) new_account_cb, 0, NULL}, + {N_("/_Configuration/_Edit accounts..."), + NULL, account_edit_open, 0, NULL}, + {N_("/_Configuration/C_hange current account"), +@@ -903,21 +903,21 @@ static GtkItemFactoryEntry mainwin_entries[] = + + {N_("/_Help"), NULL, NULL, 0, ""}, + {N_("/_Help/_Manual"), NULL, NULL, 0, ""}, +- {N_("/_Help/_Manual/_English"), NULL, manual_open_cb, MANUAL_LANG_EN, NULL}, +- {N_("/_Help/_Manual/_Japanese"), NULL, manual_open_cb, MANUAL_LANG_JA, NULL}, ++ {N_("/_Help/_Manual/_English"), NULL, (void (*)(void)) manual_open_cb, MANUAL_LANG_EN, NULL}, ++ {N_("/_Help/_Manual/_Japanese"), NULL, (void (*)(void)) manual_open_cb, MANUAL_LANG_JA, NULL}, + {N_("/_Help/_FAQ"), NULL, NULL, 0, ""}, +- {N_("/_Help/_FAQ/_English"), NULL, faq_open_cb, MANUAL_LANG_EN, NULL}, +- {N_("/_Help/_FAQ/_German"), NULL, faq_open_cb, MANUAL_LANG_DE, NULL}, +- {N_("/_Help/_FAQ/_Spanish"), NULL, faq_open_cb, MANUAL_LANG_ES, NULL}, +- {N_("/_Help/_FAQ/_French"), NULL, faq_open_cb, MANUAL_LANG_FR, NULL}, +- {N_("/_Help/_FAQ/_Italian"), NULL, faq_open_cb, MANUAL_LANG_IT, NULL}, +- {N_("/_Help/_Command line options"), NULL, help_cmdline_cb, 0, NULL}, ++ {N_("/_Help/_FAQ/_English"), NULL, (void (*)(void)) faq_open_cb, MANUAL_LANG_EN, NULL}, ++ {N_("/_Help/_FAQ/_German"), NULL, (void (*)(void)) faq_open_cb, MANUAL_LANG_DE, NULL}, ++ {N_("/_Help/_FAQ/_Spanish"), NULL, (void (*)(void)) faq_open_cb, MANUAL_LANG_ES, NULL}, ++ {N_("/_Help/_FAQ/_French"), NULL, (void (*)(void)) faq_open_cb, MANUAL_LANG_FR, NULL}, ++ {N_("/_Help/_FAQ/_Italian"), NULL, (void (*)(void)) faq_open_cb, MANUAL_LANG_IT, NULL}, ++ {N_("/_Help/_Command line options"), NULL, (void (*)(void)) help_cmdline_cb, 0, NULL}, + #if USE_UPDATE_CHECK + {N_("/_Help/---"), NULL, NULL, 0, ""}, +- {N_("/_Help/_Update check..."), NULL, update_check_cb, 0, NULL}, ++ {N_("/_Help/_Update check..."), NULL, (void (*)(void)) update_check_cb, 0, NULL}, + #ifdef USE_UPDATE_CHECK_PLUGIN + {N_("/_Help/Update check of _plug-ins..."), +- NULL, update_check_plugin_cb, 0, NULL}, ++ NULL, (void (*)(void)) update_check_plugin_cb, 0, NULL}, + #endif + #endif + {N_("/_Help/---"), NULL, NULL, 0, ""}, +@@ -2604,17 +2604,17 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout, + + static GtkItemFactoryEntry reply_entries[] = + { +- {N_("/_Reply"), NULL, reply_cb, COMPOSE_REPLY, NULL}, +- {N_("/Reply to _all"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, +- {N_("/Reply to _sender"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, +- {N_("/Reply to mailing _list"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST, NULL} ++ {N_("/_Reply"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY, NULL}, ++ {N_("/Reply to _all"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, ++ {N_("/Reply to _sender"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, ++ {N_("/Reply to mailing _list"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_LIST, NULL} + }; + + static GtkItemFactoryEntry forward_entries[] = + { +- {N_("/_Forward"), NULL, reply_cb, COMPOSE_FORWARD, NULL}, +- {N_("/For_ward as attachment"), NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, +- {N_("/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL} ++ {N_("/_Forward"), NULL, (void (*)(void)) reply_cb, COMPOSE_FORWARD, NULL}, ++ {N_("/For_ward as attachment"), NULL, (void (*)(void)) reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, ++ {N_("/Redirec_t"), NULL, (void (*)(void)) reply_cb, COMPOSE_REDIRECT, NULL} + }; + + static PrefsToolbarItem items[] = +diff --git a/src/messageview.c b/src/messageview.c +index 782bc80..62f6516 100644 +--- a/src/messageview.c ++++ b/src/messageview.c +@@ -164,32 +164,32 @@ static void about_cb (gpointer data, + static GtkItemFactoryEntry msgview_entries[] = + { + {N_("/_File"), NULL, NULL, 0, ""}, +- {N_("/_File/_Save as..."), NULL, save_as_cb, 0, NULL}, ++ {N_("/_File/_Save as..."), NULL, (void (*)(void)) save_as_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, + #if GTK_CHECK_VERSION(2, 10, 0) +- {N_("/_File/Page set_up..."), NULL, page_setup_cb, 0, NULL}, ++ {N_("/_File/Page set_up..."), NULL, (void (*)(void)) page_setup_cb, 0, NULL}, + #endif +- {N_("/_File/_Print..."), NULL, print_cb, 0, NULL}, ++ {N_("/_File/_Print..."), NULL, (void (*)(void)) print_cb, 0, NULL}, + {N_("/_File/---"), NULL, NULL, 0, ""}, +- {N_("/_File/_Close"), NULL, close_cb, 0, NULL}, ++ {N_("/_File/_Close"), NULL, (void (*)(void)) close_cb, 0, NULL}, + + {N_("/_Edit"), NULL, NULL, 0, ""}, +- {N_("/_Edit/_Copy"), NULL, copy_cb, 0, NULL}, +- {N_("/_Edit/Select _all"), NULL, allsel_cb, 0, NULL}, ++ {N_("/_Edit/_Copy"), NULL, (void (*)(void)) copy_cb, 0, NULL}, ++ {N_("/_Edit/Select _all"), NULL, (void (*)(void)) allsel_cb, 0, NULL}, + {N_("/_Edit/---"), NULL, NULL, 0, ""}, + {N_("/_Edit/_Find in current message..."), +- NULL, search_cb, 0, NULL}, ++ NULL, (void (*)(void)) search_cb, 0, NULL}, + + {N_("/_View"), NULL, NULL, 0, ""}, + + #define ENC_SEPARATOR \ + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, ""} + #define ENC_ACTION(action) \ +- NULL, set_charset_cb, action, "/View/Character encoding/Auto detect" ++ NULL, (void (*)(void)) set_charset_cb, action, "/View/Character encoding/Auto detect" + + {N_("/_View/Character _encoding"), NULL, NULL, 0, ""}, + {N_("/_View/Character _encoding/_Auto detect"), +- NULL, set_charset_cb, C_AUTO, ""}, ++ NULL, (void (*)(void)) set_charset_cb, C_AUTO, ""}, + ENC_SEPARATOR, + {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"), + ENC_ACTION(C_US_ASCII)}, +@@ -273,51 +273,51 @@ static GtkItemFactoryEntry msgview_entries[] = + #undef ENC_ACTION + + {N_("/_View/---"), NULL, NULL, 0, ""}, +- {N_("/_View/Mess_age source"), NULL, view_source_cb, 0, NULL}, ++ {N_("/_View/Mess_age source"), NULL, (void (*)(void)) view_source_cb, 0, NULL}, + {N_("/_View/All _headers"), +- NULL, show_all_header_cb, 0, ""}, ++ NULL, (void (*)(void)) show_all_header_cb, 0, ""}, + + {N_("/_Message"), NULL, NULL, 0, ""}, + {N_("/_Message/Compose _new message"), +- NULL, compose_cb, 0, NULL}, ++ NULL, (void (*)(void)) compose_cb, 0, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Reply"), NULL, reply_cb, COMPOSE_REPLY, NULL}, ++ {N_("/_Message/_Reply"), NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY, NULL}, + {N_("/_Message/Repl_y to/_all"), +- NULL, reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, ++ NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, + {N_("/_Message/Repl_y to/_sender"), +- NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, ++ NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, + {N_("/_Message/Repl_y to/mailing _list"), +- NULL, reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, ++ NULL, (void (*)(void)) reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/_Forward"), NULL, reply_cb, COMPOSE_FORWARD, NULL}, ++ {N_("/_Message/_Forward"), NULL, (void (*)(void)) reply_cb, COMPOSE_FORWARD, NULL}, + {N_("/_Message/For_ward as attachment"), +- NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, +- {N_("/_Message/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL}, ++ NULL, (void (*)(void)) reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, ++ {N_("/_Message/Redirec_t"), NULL, (void (*)(void)) reply_cb, COMPOSE_REDIRECT, NULL}, + {N_("/_Message/---"), NULL, NULL, 0, ""}, +- {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL}, ++ {N_("/_Message/Re-_edit"), NULL, (void (*)(void)) reedit_cb, 0, NULL}, + + {N_("/_Tools"), NULL, NULL, 0, ""}, +- {N_("/_Tools/_Address book"), NULL, addressbook_open_cb, 0, NULL}, ++ {N_("/_Tools/_Address book"), NULL, (void (*)(void)) addressbook_open_cb, 0, NULL}, + {N_("/_Tools/Add sender to address boo_k"), +- NULL, add_address_cb, 0, NULL}, ++ NULL, (void (*)(void)) add_address_cb, 0, NULL}, + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/_Create filter rule"), + NULL, NULL, 0, ""}, + {N_("/_Tools/_Create filter rule/_Automatically"), +- NULL, create_filter_cb, FLT_BY_AUTO, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_AUTO, NULL}, + {N_("/_Tools/_Create filter rule/by _From"), +- NULL, create_filter_cb, FLT_BY_FROM, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_FROM, NULL}, + {N_("/_Tools/_Create filter rule/by _To"), +- NULL, create_filter_cb, FLT_BY_TO, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_TO, NULL}, + {N_("/_Tools/_Create filter rule/by _Subject"), +- NULL, create_filter_cb, FLT_BY_SUBJECT, NULL}, ++ NULL, (void (*)(void)) create_filter_cb, FLT_BY_SUBJECT, NULL}, + #ifndef G_OS_WIN32 + {N_("/_Tools/---"), NULL, NULL, 0, ""}, + {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, + #endif + + {N_("/_Help"), NULL, NULL, 0, ""}, +- {N_("/_Help/_About"), NULL, about_cb, 0, NULL} ++ {N_("/_Help/_About"), NULL, (void (*)(void)) about_cb, 0, NULL} + }; + + +diff --git a/src/mimeview.c b/src/mimeview.c +index e06b530..e36b574 100644 +--- a/src/mimeview.c ++++ b/src/mimeview.c +@@ -132,24 +132,24 @@ static void mimeview_check_signature (MimeView *mimeview); + + static GtkItemFactoryEntry mimeview_popup_entries[] = + { +- {N_("/_Open"), NULL, mimeview_launch, 0, NULL}, +- {N_("/Open _with..."), NULL, mimeview_open_with, 0, NULL}, +- {N_("/_Display as text"), NULL, mimeview_display_as_text, 0, NULL}, +- {N_("/_Save as..."), NULL, mimeview_save_as, 0, NULL}, +- {N_("/Save _all..."), NULL, mimeview_save_all, 0, NULL}, +- {N_("/_Print..."), NULL, mimeview_print, 0, NULL}, ++ {N_("/_Open"), NULL, (void (*)(void)) mimeview_launch, 0, NULL}, ++ {N_("/Open _with..."), NULL, (void (*)(void)) mimeview_open_with, 0, NULL}, ++ {N_("/_Display as text"), NULL, (void (*)(void)) mimeview_display_as_text, 0, NULL}, ++ {N_("/_Save as..."), NULL, (void (*)(void)) mimeview_save_as, 0, NULL}, ++ {N_("/Save _all..."), NULL, (void (*)(void)) mimeview_save_all, 0, NULL}, ++ {N_("/_Print..."), NULL, (void (*)(void)) mimeview_print, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Reply"), NULL, NULL, 0, ""}, +- {N_("/_Reply/_Reply"), NULL, mimeview_reply, COMPOSE_REPLY, NULL}, ++ {N_("/_Reply/_Reply"), NULL, (void (*)(void)) mimeview_reply, COMPOSE_REPLY, NULL}, + {N_("/_Reply/Reply to _all"), +- NULL, mimeview_reply, COMPOSE_REPLY_TO_ALL, NULL}, ++ NULL, (void (*)(void)) mimeview_reply, COMPOSE_REPLY_TO_ALL, NULL}, + {N_("/_Reply/Reply to _sender"), +- NULL, mimeview_reply, COMPOSE_REPLY_TO_SENDER, NULL}, ++ NULL, (void (*)(void)) mimeview_reply, COMPOSE_REPLY_TO_SENDER, NULL}, + {N_("/_Reply/Reply to mailing _list"), +- NULL, mimeview_reply, COMPOSE_REPLY_TO_LIST, NULL}, ++ NULL, (void (*)(void)) mimeview_reply, COMPOSE_REPLY_TO_LIST, NULL}, + #if USE_GPGME + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Check signature"), NULL, mimeview_check_signature, 0, NULL} ++ {N_("/_Check signature"), NULL, (void (*)(void)) mimeview_check_signature, 0, NULL} + #endif + }; + +diff --git a/src/summaryview.c b/src/summaryview.c +index 211efed..e0e6ba3 100644 +--- a/src/summaryview.c ++++ b/src/summaryview.c +@@ -435,58 +435,58 @@ static GtkTargetEntry summary_drag_types[] = + + static GtkItemFactoryEntry summary_popup_entries[] = + { +- {N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL}, ++ {N_("/_Reply"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_REPLY, NULL}, + {N_("/Repl_y to"), NULL, NULL, 0, ""}, +- {N_("/Repl_y to/_all"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, +- {N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, ++ {N_("/Repl_y to/_all"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, ++ {N_("/Repl_y to/_sender"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, + {N_("/Repl_y to/mailing _list"), +- NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, ++ NULL, (void (*)(void)) summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL}, +- {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, +- {N_("/Redirec_t"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL}, ++ {N_("/_Forward"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_FORWARD, NULL}, ++ {N_("/For_ward as attachment"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, ++ {N_("/Redirec_t"), NULL, (void (*)(void)) summary_reply_cb, COMPOSE_REDIRECT, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/M_ove..."), NULL, summary_move_to, 0, NULL}, +- {N_("/_Copy..."), NULL, summary_copy_to, 0, NULL}, ++ {N_("/M_ove..."), NULL, (void (*)(void)) summary_move_to, 0, NULL}, ++ {N_("/_Copy..."), NULL, (void (*)(void)) summary_copy_to, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Mark"), NULL, NULL, 0, ""}, +- {N_("/_Mark/Set _flag"), NULL, summary_mark, 0, NULL}, +- {N_("/_Mark/_Unset flag"), NULL, summary_unmark, 0, NULL}, ++ {N_("/_Mark/Set _flag"), NULL, (void (*)(void)) summary_mark, 0, NULL}, ++ {N_("/_Mark/_Unset flag"), NULL, (void (*)(void)) summary_unmark, 0, NULL}, + {N_("/_Mark/---"), NULL, NULL, 0, ""}, +- {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL}, ++ {N_("/_Mark/Mark as unr_ead"), NULL, (void (*)(void)) summary_mark_as_unread, 0, NULL}, + {N_("/_Mark/Mark as rea_d"), +- NULL, summary_mark_as_read, 0, NULL}, ++ NULL, (void (*)(void)) summary_mark_as_read, 0, NULL}, + {N_("/_Mark/Mark _thread as read"), +- NULL, summary_mark_thread_as_read, 0, NULL}, +- {N_("/_Mark/Mark all _read"), NULL, summary_mark_all_read, 0, NULL}, ++ NULL, (void (*)(void)) summary_mark_thread_as_read, 0, NULL}, ++ {N_("/_Mark/Mark all _read"), NULL, (void (*)(void)) summary_mark_all_read, 0, NULL}, + {N_("/Color la_bel"), NULL, NULL, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Delete"), NULL, summary_delete, 0, NULL}, ++ {N_("/_Delete"), NULL, (void (*)(void)) summary_delete, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Set as _junk mail"), NULL, summary_junk, 0, NULL}, +- {N_("/Set as not j_unk mail"), NULL, summary_not_junk, 0, NULL}, ++ {N_("/Set as _junk mail"), NULL, (void (*)(void)) summary_junk, 0, NULL}, ++ {N_("/Set as not j_unk mail"), NULL, (void (*)(void)) summary_not_junk, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL}, ++ {N_("/Re-_edit"), NULL, (void (*)(void)) summary_reedit, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/Add sender to address boo_k..."), +- NULL, summary_add_address_cb, 0, NULL}, ++ NULL, (void (*)(void)) summary_add_address_cb, 0, NULL}, + {N_("/Create f_ilter rule"), NULL, NULL, 0, ""}, + {N_("/Create f_ilter rule/_Automatically"), +- NULL, summary_create_filter_cb, FLT_BY_AUTO, NULL}, ++ NULL, (void (*)(void)) summary_create_filter_cb, FLT_BY_AUTO, NULL}, + {N_("/Create f_ilter rule/by _From"), +- NULL, summary_create_filter_cb, FLT_BY_FROM, NULL}, ++ NULL, (void (*)(void)) summary_create_filter_cb, FLT_BY_FROM, NULL}, + {N_("/Create f_ilter rule/by _To"), +- NULL, summary_create_filter_cb, FLT_BY_TO, NULL}, ++ NULL, (void (*)(void)) summary_create_filter_cb, FLT_BY_TO, NULL}, + {N_("/Create f_ilter rule/by _Subject"), +- NULL, summary_create_filter_cb, FLT_BY_SUBJECT, NULL}, ++ NULL, (void (*)(void)) summary_create_filter_cb, FLT_BY_SUBJECT, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_View"), NULL, NULL, 0, ""}, + {N_("/_View/Open in new _window"), +- NULL, summary_open_msg, 0, NULL}, +- {N_("/_View/Mess_age source"), NULL, summary_view_source, 0, NULL}, +- {N_("/_View/All _headers"), NULL, summary_show_all_header_cb, 0, ""}, ++ NULL, (void (*)(void)) summary_open_msg, 0, NULL}, ++ {N_("/_View/Mess_age source"), NULL, (void (*)(void)) summary_view_source, 0, NULL}, ++ {N_("/_View/All _headers"), NULL, (void (*)(void)) summary_show_all_header_cb, 0, ""}, + {N_("/---"), NULL, NULL, 0, ""}, +- {N_("/_Print..."), NULL, summary_print, 0, NULL} ++ {N_("/_Print..."), NULL, (void (*)(void)) summary_print, 0, NULL} + }; + + SummaryView *summary_create(void) diff --git a/mail-client/sylpheed/sylpheed-3.7.0-r6.ebuild b/mail-client/sylpheed/sylpheed-3.7.0-r6.ebuild new file mode 100644 index 0000000..f6d6361 --- /dev/null +++ b/mail-client/sylpheed/sylpheed-3.7.0-r6.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit desktop xdg + +DESCRIPTION="A lightweight email client and newsreader" +HOMEPAGE="https://sylpheed.sraoss.jp/" +SRC_URI="https://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86" +IUSE="crypt ipv6 ldap nls oniguruma spell ssl xface" + +CDEPEND="net-libs/liblockfile + x11-libs/gtk+:2 + crypt? ( app-crypt/gpgme:= ) + ldap? ( net-nds/openldap:= ) + nls? ( sys-devel/gettext ) + oniguruma? ( dev-libs/oniguruma:= ) + spell? ( + app-text/gtkspell:2 + dev-libs/dbus-glib + ) + ssl? ( dev-libs/openssl:0= )" +RDEPEND="${CDEPEND} + app-misc/mime-types + net-misc/curl" +DEPEND="${CDEPEND} + xface? ( media-libs/compface )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-fix-incompatible-pointer-type.patch" + "${FILESDIR}"/${PN}-tls-1.3.patch + "${FILESDIR}"/${PN}-CVE-2021-37746.patch + "${FILESDIR}/${P}-more-incomp-pt-type.patch" +) +DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*" + +src_configure() { + local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + econf \ + $(use_enable crypt gpgme) \ + $(use_enable ipv6) \ + $(use_enable ldap) \ + $(use_enable oniguruma) \ + $(use_enable spell gtkspell) \ + $(use_enable ssl) \ + $(use_enable xface compface) \ + --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \ + --with-manualdir="${htmldir}"/manual \ + --with-faqdir="${htmldir}"/faq \ + --disable-updatecheck +} + +src_install() { + default + + doicon *.png + domenu *.desktop + + cd plugin/attachment_tool + emake DESTDIR="${D}" install-plugin + docinto plugin/attachment_tool + dodoc README + + find "${ED}" -name '*.la' -delete || die +}