[Commits] [SCM] claws branch, master, updated. 3.16.0-180-ga593c38
wwp at claws-mail.org
wwp at claws-mail.org
Fri May 25 09:57:07 CEST 2018
The branch, master has been updated
via a593c3807cb39248e405368ff26a796ba25a6d9c (commit)
from 97dad00d18faf20a11deec509beb731f70cf5be2 (commit)
Summary of changes:
src/addrcustomattr.c | 2 +-
src/addressbook.c | 14 +++++++-------
src/common/socket.c | 2 ++
src/editaddress.c | 2 +-
src/edittags.c | 2 +-
src/gtk/gtkcmclist.c | 2 ++
src/gtk/gtkcmctree.c | 2 ++
src/gtk/gtksctree.c | 2 ++
src/gtk/gtkvscrollbutton.c | 2 ++
src/imap_gtk.c | 4 ++--
src/mimeview.c | 2 +-
src/plugins/att_remover/att_remover.c | 2 +-
src/plugins/fancy/fancy_prefs.c | 2 +-
src/plugins/managesieve/sieve_editor.c | 10 +++++-----
src/plugins/managesieve/sieve_prefs.c | 2 +-
src/plugins/notification/gtkhotkey/gtk-hotkey-info.c | 3 ++-
.../gtkhotkey/gtk-hotkey-key-file-registry.c | 3 ++-
.../notification/gtkhotkey/gtk-hotkey-listener.c | 3 ++-
.../notification/gtkhotkey/gtk-hotkey-registry.c | 3 ++-
.../notification/gtkhotkey/gtk-hotkey-x11-listener.c | 3 ++-
src/plugins/notification/notification_banner.c | 2 +-
src/plugins/notification/notification_trayicon.c | 8 ++++----
src/plugins/python/accounttype.c | 16 +++++++++++++++-
src/plugins/python/composewindowtype.c | 15 +++++++++++++++
src/plugins/python/folderpropertiestype.c | 16 +++++++++++++++-
src/plugins/python/foldertype.c | 15 +++++++++++++++
src/plugins/python/mailboxtype.c | 16 +++++++++++++++-
src/plugins/python/messageinfotype.c | 15 +++++++++++++++
src/plugins/python/python_plugin.c | 8 ++++----
src/plugins/vcalendar/common-views.c | 2 +-
src/plugins/vcalendar/vcal_dbus.c | 1 +
src/prefs_actions.c | 2 +-
src/prefs_filtering.c | 2 +-
src/prefs_template.c | 2 +-
src/textview.c | 6 +++---
35 files changed, 148 insertions(+), 45 deletions(-)
- Log -----------------------------------------------------------------
commit a593c3807cb39248e405368ff26a796ba25a6d9c
Author: wwp <wwp at free.fr>
Date: Fri May 25 09:55:34 2018 +0200
Fix missing initializers, taking for reference GLib 2.28 (with support
for up to 2.56) and Python 2.4 (with support for up to 3.6).
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 6997f60..a28e8c5 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -213,7 +213,7 @@ static void custom_attr_popup_factory_defaults (void *obj, void *data)
static GtkActionEntry custom_attr_popup_entries[] =
{
- {"CustomAttrPopup", NULL, "CustomAttrPopup" },
+ {"CustomAttrPopup", NULL, "CustomAttrPopup", NULL, NULL, NULL },
{"CustomAttrPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(custom_attr_popup_delete) },
{"CustomAttrPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(custom_attr_popup_clear_list) },
{"CustomAttrPopup/Reset", NULL, N_("_Reset to default"), NULL, NULL, G_CALLBACK(custom_attr_popup_factory_defaults) },
diff --git a/src/addressbook.c b/src/addressbook.c
index 30adcce..a5a0eba 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -399,12 +399,12 @@ static void about_show_cb(GtkAction *action, gpointer data)
static GtkActionEntry addressbook_entries[] =
{
- {"Menu", NULL, "Menu" },
+ {"Menu", NULL, "Menu", NULL, NULL, NULL },
/* menus */
- {"Book", NULL, N_("_Book") },
- {"Address", NULL, N_("_Edit") },
- {"Tools", NULL, N_("_Tools") },
- {"Help", NULL, N_("_Help") },
+ {"Book", NULL, N_("_Book"), NULL, NULL, NULL },
+ {"Address", NULL, N_("_Edit"), NULL, NULL, NULL },
+ {"Tools", NULL, N_("_Tools"), NULL, NULL, NULL },
+ {"Help", NULL, N_("_Help"), NULL, NULL, NULL },
/* Book menu */
{"Book/NewBook", NULL, N_("New _Book"), "<control>B", NULL, G_CALLBACK(addressbook_new_book_cb) },
@@ -461,7 +461,7 @@ static GtkActionEntry addressbook_entries[] =
static GtkActionEntry addressbook_tree_popup_entries[] =
{
- {"ABTreePopup", NULL, "ABTreePopup" },
+ {"ABTreePopup", NULL, "ABTreePopup", NULL, NULL, NULL },
{"ABTreePopup/EditBook", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_treenode_edit_cb) },
{"ABTreePopup/DeleteBook", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(addressbook_treenode_delete_cb) },
{"ABTreePopup/---", NULL, "---", NULL, NULL, NULL },
@@ -476,7 +476,7 @@ static GtkActionEntry addressbook_tree_popup_entries[] =
static GtkActionEntry addressbook_list_popup_entries[] =
{
- {"ABListPopup", NULL, "ABListPopup" },
+ {"ABListPopup", NULL, "ABListPopup", NULL, NULL, NULL },
{"ABListPopup/SelectAll", NULL, N_("_Select all"), NULL, NULL, G_CALLBACK(addressbook_select_all_cb) },
{"ABListPopup/---", NULL, "---", NULL, NULL, NULL },
{"ABListPopup/Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_edit_address_cb) },
diff --git a/src/common/socket.c b/src/common/socket.c
index b363f76..f401f28 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -146,6 +146,8 @@ GSourceFuncs ssl_watch_funcs = {
ssl_sock_prepare,
ssl_sock_check,
ssl_sock_dispatch,
+ NULL,
+ NULL,
NULL
};
#endif
diff --git a/src/editaddress.c b/src/editaddress.c
index 40ae385..ef50ca8 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -985,7 +985,7 @@ static void addressbook_edit_person_unset_picture_menu_cb (GtkAction *action, gp
static GtkWidget *editaddr_popup_menu = NULL;
static GtkActionEntry editaddr_popup_entries[] =
{
- {"EditAddressPopup", NULL, "EditAddressPopup" },
+ {"EditAddressPopup", NULL, "EditAddressPopup", NULL, NULL, NULL },
{"EditAddressPopup/SetPicture", NULL, N_("_Set picture"), NULL, NULL, G_CALLBACK(addressbook_edit_person_set_picture_menu_cb) },
{"EditAddressPopup/UnsetPicture", NULL, N_("_Unset picture"), NULL, NULL, G_CALLBACK(addressbook_edit_person_unset_picture_menu_cb) },
};
diff --git a/src/edittags.c b/src/edittags.c
index c559102..ddc9c2c 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -282,7 +282,7 @@ static void apply_popup_delete_all (GtkAction *action, gpointer data)
static GtkActionEntry apply_popup_actions[] =
{
- { "EditTags", NULL, "EditTags" },
+ { "EditTags", NULL, "EditTags", NULL, NULL, NULL },
{ "EditTags/Delete", NULL, N_("_Delete"), NULL, "Delete tag", G_CALLBACK(apply_popup_delete) },
{ "EditTags/DeleteAll", NULL, N_("Delete _all"), NULL, "Delete all tags", G_CALLBACK(apply_popup_delete_all) }
};
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
index 4f175ad..736cfe8 100644
--- a/src/gtk/gtkcmclist.c
+++ b/src/gtk/gtkcmclist.c
@@ -504,6 +504,8 @@ gtk_cmclist_get_type (void)
sizeof (GtkCMCList),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_cmclist_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
clist_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkCMCList", &clist_info, (GTypeFlags)0);
}
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index 0046b38..13dbdb5 100644
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -361,6 +361,8 @@ gtk_cmctree_get_type (void)
sizeof (GtkCMCTree),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_cmctree_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
ctree_type = g_type_register_static (GTK_TYPE_CMCLIST, "GtkCMCTree", &ctree_info, (GTypeFlags)0);
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 343b5db..392fcfe 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -144,6 +144,8 @@ gtk_sctree_get_type (void)
sizeof (GtkSCTree),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_sctree_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
sctree_type = g_type_register_static (GTK_TYPE_CMCTREE, "GtkSCTree", &sctree_info, (GTypeFlags)0);
diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
index 6d18715..5e59c50 100644
--- a/src/gtk/gtkvscrollbutton.c
+++ b/src/gtk/gtkvscrollbutton.c
@@ -102,6 +102,8 @@ GType gtk_vscrollbutton_get_type(void)
sizeof (GtkVScrollbutton),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_vscrollbutton_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
vscrollbutton_type = g_type_register_static (GTK_TYPE_VBOX, "GtkVScrollbutton", &vscrollbutton_info, (GTypeFlags)0);
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index e545554..4461a8a 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -72,7 +72,7 @@ static GtkActionEntry imap_popup_entries[] =
{"FolderViewPopup/DownloadMessages", NULL, N_("Down_load messages"), NULL, NULL, G_CALLBACK(download_cb) },
- {"FolderViewPopup/Subscriptions", NULL, N_("S_ubscriptions") },
+ {"FolderViewPopup/Subscriptions", NULL, N_("S_ubscriptions"), NULL, NULL, NULL },
{"FolderViewPopup/Subscriptions/---", NULL, "---", NULL, NULL, NULL },
{"FolderViewPopup/Subscriptions/Subscribe", NULL, N_("_Subscribe..."), NULL, NULL, G_CALLBACK(subscribe_cb) },
{"FolderViewPopup/Subscriptions/Unsubscribe", NULL, N_("_Unsubscribe..."), NULL, NULL, G_CALLBACK(unsubscribe_cb) },
@@ -84,7 +84,7 @@ static GtkActionEntry imap_popup_entries[] =
static GtkToggleActionEntry imap_toggle_popup_entries[] =
{
- {"FolderViewPopup/Subscriptions/ShowOnlySubs", NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb) },
+ {"FolderViewPopup/Subscriptions/ShowOnlySubs", NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb), FALSE },
};
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item);
diff --git a/src/mimeview.c b/src/mimeview.c
index 20d2312..614bcd7 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -188,7 +188,7 @@ static void mimeview_select_prev_part_cb(GtkAction *action, gpointer data)
}
static GtkActionEntry mimeview_menu_actions[] = {
- { "MimeView", NULL, "MimeView" },
+ { "MimeView", NULL, "MimeView", NULL, NULL, NULL },
{ "MimeView/Open", NULL, N_("_Open"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
#if (!defined G_OS_WIN32)
{ "MimeView/OpenWith", NULL, N_("Open _with..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index ad4cf8f..65e6778 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -66,7 +66,7 @@ static PrefParam prefs[] = {
NULL, NULL},
{"win_height", "-1", &AttRemoverData.win_height, P_INT, NULL,
NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
enum {
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index a2ca781..111706e 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -92,7 +92,7 @@ static PrefParam param[] = {
{"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
NULL, NULL, NULL},
{"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
static FancyPrefsPage fancy_prefs_page;
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index f7793ad..3b03136 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -76,10 +76,10 @@ static SearchInterface search_interface = {
static GtkActionEntry sieve_editor_entries[] =
{
- {"Menu", NULL, "Menu" },
+ {"Menu", NULL, "Menu", NULL, NULL, NULL },
/* menus */
- {"Filter", NULL, N_("_Filter") },
- {"Edit", NULL, N_("_Edit") },
+ {"Filter", NULL, N_("_Filter"), NULL, NULL, NULL },
+ {"Edit", NULL, N_("_Edit"), NULL, NULL, NULL },
/* Filter menu */
{"Filter/Save", NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(sieve_editor_save_cb) },
@@ -90,7 +90,7 @@ static GtkActionEntry sieve_editor_entries[] =
/* Edit menu */
{"Edit/Undo", NULL, N_("_Undo"), "<control>Z", NULL, G_CALLBACK(sieve_editor_undo_cb) },
{"Edit/Redo", NULL, N_("_Redo"), "<control>Y", NULL, G_CALLBACK(sieve_editor_redo_cb) },
- /* {"Edit/---", NULL, "---" }, */
+ /* {"Edit/---", NULL, "---", NULL, NULL, NULL }, */
{"Edit/Cut", NULL, N_("Cu_t"), "<control>X", NULL, G_CALLBACK(sieve_editor_cut_cb) },
{"Edit/Copy", NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(sieve_editor_copy_cb) },
@@ -98,7 +98,7 @@ static GtkActionEntry sieve_editor_entries[] =
{"Edit/SelectAll", NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(sieve_editor_allsel_cb) },
- {"Edit/---", NULL, "---" },
+ {"Edit/---", NULL, "---", NULL, NULL, NULL },
{"Edit/Find", NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(sieve_editor_find_cb) },
};
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index a26057e..bbacb31 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -49,7 +49,7 @@ static PrefParam prefs[] = {
P_INT, NULL, NULL, NULL},
{"manager_win_height", "-1", &sieve_config.manager_win_height,
P_INT, NULL, NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
#define PACK_HBOX(hbox, vbox) \
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
index f091aea..ee5aacd 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
@@ -641,7 +641,8 @@ gtk_hotkey_info_get_type (void)
NULL,
sizeof (GtkHotkeyInfo),
0,
- (GInstanceInitFunc) gtk_hotkey_info_init
+ (GInstanceInitFunc) gtk_hotkey_info_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_info_type_id = g_type_register_static (G_TYPE_OBJECT,
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
index 1a63e0d..fd4ce16 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
@@ -501,7 +501,8 @@ gtk_hotkey_key_file_registry_get_type (void)
NULL,
sizeof (GtkHotkeyKeyFileRegistry),
0,
- (GInstanceInitFunc) gtk_hotkey_key_file_registry_init
+ (GInstanceInitFunc) gtk_hotkey_key_file_registry_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_key_file_registry_type_id = g_type_register_static (GTK_HOTKEY_TYPE_STORAGE, "GtkHotkeyKeyFileRegistry", &g_define_type_info, 0);
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
index 2fedb91..2a08692 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
@@ -200,7 +200,8 @@ gtk_hotkey_listener_get_type (void)
NULL,
sizeof (GtkHotkeyListener),
0,
- (GInstanceInitFunc) gtk_hotkey_listener_init
+ (GInstanceInitFunc) gtk_hotkey_listener_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_listener_type_id = g_type_register_static (G_TYPE_OBJECT,
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
index 35bde56..150fcb9 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
@@ -332,7 +332,8 @@ gtk_hotkey_registry_get_type (void)
NULL,
sizeof (GtkHotkeyRegistry),
0,
- (GInstanceInitFunc) gtk_hotkey_registry_init
+ (GInstanceInitFunc) gtk_hotkey_registry_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_registry_type_id = g_type_register_static (G_TYPE_OBJECT, "GtkHotkeyRegistry", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
index 02bf334..22b850d 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
@@ -231,7 +231,8 @@ gtk_hotkey_x11_listener_get_type (void)
NULL,
sizeof (GtkHotkeyX11Listener),
0,
- (GInstanceInitFunc) gtk_hotkey_x11_listener_init
+ (GInstanceInitFunc) gtk_hotkey_x11_listener_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_x11_listener_type_id = g_type_register_static (GTK_HOTKEY_TYPE_LISTENER, "GtkHotkeyX11Listener", &g_define_type_info, 0);
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
index f2b4ee9..e025eae 100644
--- a/src/plugins/notification/notification_banner.c
+++ b/src/plugins/notification/notification_banner.c
@@ -91,7 +91,7 @@ G_LOCK_DEFINE_STATIC(sdata);
static GtkActionEntry banner_popup_entries[] =
{
- {"BannerPopup", NULL, "BannerPopup" },
+ {"BannerPopup", NULL, "BannerPopup", NULL, NULL, NULL },
{"BannerPopup/Reply", NULL, N_("_Reply"), NULL, NULL, G_CALLBACK(banner_menu_reply_cb) },
};
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index 0c37e41..e93c7ad 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -117,10 +117,10 @@ static GtkWidget *traymenu_popup;
static GtkWidget *focused_widget = NULL;
static GtkActionEntry trayicon_popup_menu_entries[] = {
- {"SysTrayiconPopup", NULL, "SysTrayiconPopup" },
+ {"SysTrayiconPopup", NULL, "SysTrayiconPopup", NULL, NULL, NULL },
{"SysTrayiconPopup/GetMail", NULL, N_("_Get Mail"), NULL, NULL, G_CALLBACK(trayicon_get_all_cb) },
{"SysTrayiconPopup/GetMailAcc", NULL, N_("_Get Mail from account"), NULL, NULL, NULL },
- {"SysTrayiconPopup/---", NULL, "---" },
+ {"SysTrayiconPopup/---", NULL, "---", NULL, NULL, NULL },
{"SysTrayiconPopup/Email", NULL, N_("_Email"), NULL, NULL, G_CALLBACK(trayicon_compose_cb) },
{"SysTrayiconPopup/EmailAcc", NULL, N_("E_mail from account"), NULL, NULL, NULL },
{"SysTrayiconPopup/OpenAB", NULL, N_("Open A_ddressbook"), NULL, NULL, G_CALLBACK(trayicon_addressbook_cb) },
@@ -129,9 +129,9 @@ static GtkActionEntry trayicon_popup_menu_entries[] = {
static GtkToggleActionEntry trayicon_popup_toggle_menu_entries[] =
{
- {"SysTrayiconPopup/ToggleOffline", NULL, N_("_Work Offline"), NULL, NULL, G_CALLBACK(trayicon_toggle_offline_cb) },
+ {"SysTrayiconPopup/ToggleOffline", NULL, N_("_Work Offline"), NULL, NULL, G_CALLBACK(trayicon_toggle_offline_cb), FALSE },
#ifdef HAVE_LIBNOTIFY
- {"SysTrayiconPopup/ShowBubbles", NULL, N_("Show Trayicon Notifications"), NULL, NULL, G_CALLBACK(trayicon_toggle_notify_cb) },
+ {"SysTrayiconPopup/ShowBubbles", NULL, N_("Show Trayicon Notifications"), NULL, NULL, G_CALLBACK(trayicon_toggle_notify_cb), FALSE },
#endif
};
diff --git a/src/plugins/python/accounttype.c b/src/plugins/python/accounttype.c
index e5cbe32..63588c2 100644
--- a/src/plugins/python/accounttype.c
+++ b/src/plugins/python/accounttype.c
@@ -133,9 +133,23 @@ static PyTypeObject clawsmail_AccountType = {
(initproc)Account_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_account(PyObject *module)
{
clawsmail_AccountType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/composewindowtype.c b/src/plugins/python/composewindowtype.c
index 5c54641..822cc7f 100644
--- a/src/plugins/python/composewindowtype.c
+++ b/src/plugins/python/composewindowtype.c
@@ -712,6 +712,21 @@ static PyTypeObject clawsmail_ComposeWindowType = {
(initproc)ComposeWindow_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_composewindow(PyObject *module)
diff --git a/src/plugins/python/folderpropertiestype.c b/src/plugins/python/folderpropertiestype.c
index 0eed08b..c5fcd30 100644
--- a/src/plugins/python/folderpropertiestype.c
+++ b/src/plugins/python/folderpropertiestype.c
@@ -101,9 +101,23 @@ static PyTypeObject clawsmail_FolderPropertiesType = {
(initproc)FolderProperties_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_folderproperties(PyObject *module)
{
clawsmail_FolderPropertiesType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index c11c701..ae27f8f 100644
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -367,6 +367,21 @@ static PyTypeObject clawsmail_FolderType = {
(initproc)Folder_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_folder(PyObject *module)
diff --git a/src/plugins/python/mailboxtype.c b/src/plugins/python/mailboxtype.c
index a7493ca..aa4be0e 100644
--- a/src/plugins/python/mailboxtype.c
+++ b/src/plugins/python/mailboxtype.c
@@ -106,9 +106,23 @@ static PyTypeObject clawsmail_MailboxType = {
(initproc)Mailbox_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_mailbox(PyObject *module)
{
clawsmail_MailboxType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/messageinfotype.c b/src/plugins/python/messageinfotype.c
index 2d20a3e..62794af 100644
--- a/src/plugins/python/messageinfotype.c
+++ b/src/plugins/python/messageinfotype.c
@@ -467,6 +467,21 @@ static PyTypeObject clawsmail_MessageInfoType = {
(initproc)MessageInfo_init,/* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_messageinfo(PyObject *module)
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index dc8b1d6..14646f1 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -355,7 +355,7 @@ static void create_compose_menus_and_items(GSList *filenames)
}
static GtkActionEntry compose_tools_python_actions[] = {
- {"Tools/PythonScripts", NULL, N_("Python scripts") },
+ {"Tools/PythonScripts", NULL, N_("Python scripts"), NULL, NULL, NULL },
};
static void ComposeActionData_destroy_cb(gpointer data)
@@ -499,12 +499,12 @@ static GtkToggleActionEntry mainwindow_tools_python_toggle[] = {
};
static GtkActionEntry mainwindow_tools_python_actions[] = {
- {"Tools/PythonScripts", NULL, N_("Python scripts") },
- {"Tools/PythonScripts/Refresh", NULL, N_("Refresh"),
+ {"Tools/PythonScripts", NULL, N_("Python scripts"), NULL, NULL, NULL },
+ {"Tools/PythonScripts/Refresh", NULL, N_("Refresh"), NULL, NULL, NULL,
NULL, NULL, G_CALLBACK(refresh_python_scripts_menus) },
{"Tools/PythonScripts/Browse", NULL, N_("Browse"),
NULL, NULL, G_CALLBACK(browse_python_scripts_dir) },
- {"Tools/PythonScripts/---", NULL, "---" },
+ {"Tools/PythonScripts/---", NULL, "---", NULL, NULL, NULL },
};
static int python_menu_init(char **error)
diff --git a/src/plugins/vcalendar/common-views.c b/src/plugins/vcalendar/common-views.c
index 3acb48e..d372802 100644
--- a/src/plugins/vcalendar/common-views.c
+++ b/src/plugins/vcalendar/common-views.c
@@ -58,7 +58,7 @@ static void view_go_today_cb (GtkAction *action,
static GtkActionEntry view_event_popup_entries[] =
{
- {"VcalViewEvent", NULL, "VcalViewEvent" },
+ {"VcalViewEvent", NULL, "VcalViewEvent", NULL, NULL, NULL },
{"VcalViewEvent/EditMeeting", NULL, N_("_Edit this meeting..."), NULL, NULL, G_CALLBACK(view_edit_meeting_cb) },
{"VcalViewEvent/CancelMeeting", NULL, N_("_Cancel this meeting..."), NULL, NULL, G_CALLBACK(view_cancel_meeting_cb) },
{"VcalViewEvent/---", NULL, "---", NULL, NULL, NULL },
diff --git a/src/plugins/vcalendar/vcal_dbus.c b/src/plugins/vcalendar/vcal_dbus.c
index f6269ed..cc9c725 100644
--- a/src/plugins/vcalendar/vcal_dbus.c
+++ b/src/plugins/vcalendar/vcal_dbus.c
@@ -129,6 +129,7 @@ static const GDBusInterfaceVTable interface_vtable =
{
handle_method_call,
NULL,
+ NULL,
NULL
};
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 61b8151..83c2eaf 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1080,7 +1080,7 @@ static GtkWidget *prefs_actions_popup_menu = NULL;
static GtkActionEntry prefs_actions_popup_entries[] =
{
- {"PrefsActionsPopup", NULL, "PrefsActionsPopup" },
+ {"PrefsActionsPopup", NULL, "PrefsActionsPopup", NULL, NULL, NULL },
{"PrefsActionsPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_actions_delete_cb) },
{"PrefsActionsPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_actions_delete_all_cb) },
{"PrefsActionsPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_actions_duplicate_cb) },
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 5cf8fb3..8db8859 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1695,7 +1695,7 @@ static GtkWidget *prefs_filtering_popup_menu = NULL;
static GtkActionEntry prefs_filtering_popup_entries[] =
{
- {"PrefsFilteringPopup", NULL, "PrefsFilteringPopup" },
+ {"PrefsFilteringPopup", NULL, "PrefsFilteringPopup", NULL, NULL, NULL },
{"PrefsFilteringPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_cb) },
{"PrefsFilteringPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_all_cb) },
{"PrefsFilteringPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_filtering_duplicate_cb) },
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 7a0aa12..06e54ba 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1107,7 +1107,7 @@ static GtkWidget *prefs_template_popup_menu = NULL;
static GtkActionEntry prefs_template_popup_entries[] =
{
- {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup" },
+ {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup", NULL, NULL, NULL },
{"PrefsTemplatePopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_template_delete_cb) },
{"PrefsTemplatePopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_template_delete_all_cb) },
{"PrefsTemplatePopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_template_duplicate_cb) },
diff --git a/src/textview.c b/src/textview.c
index 52030ad..e033347 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -241,14 +241,14 @@ static void textview_show_tags(TextView *textview);
static GtkActionEntry textview_link_popup_entries[] =
{
- {"TextviewPopupLink", NULL, "TextviewPopupLink" },
+ {"TextviewPopupLink", NULL, "TextviewPopupLink", NULL, NULL, NULL },
{"TextviewPopupLink/Open", NULL, N_("_Open in web browser"), NULL, NULL, G_CALLBACK(open_uri_cb) },
{"TextviewPopupLink/Copy", NULL, N_("Copy this _link"), NULL, NULL, G_CALLBACK(copy_uri_cb) },
};
static GtkActionEntry textview_mail_popup_entries[] =
{
- {"TextviewPopupMail", NULL, "TextviewPopupMail" },
+ {"TextviewPopupMail", NULL, "TextviewPopupMail", NULL, NULL, NULL },
{"TextviewPopupMail/Compose", NULL, N_("Compose _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
{"TextviewPopupMail/ReplyTo", NULL, N_("_Reply to this address"), NULL, NULL, G_CALLBACK(reply_to_uri_cb) },
{"TextviewPopupMail/AddAB", NULL, N_("Add to _Address book"), NULL, NULL, G_CALLBACK(add_uri_to_addrbook_cb) },
@@ -257,7 +257,7 @@ static GtkActionEntry textview_mail_popup_entries[] =
static GtkActionEntry textview_file_popup_entries[] =
{
- {"TextviewPopupFile", NULL, "TextviewPopupFile" },
+ {"TextviewPopupFile", NULL, "TextviewPopupFile", NULL, NULL, NULL },
{"TextviewPopupFile/Open", NULL, N_("_Open image"), NULL, NULL, G_CALLBACK(open_image_cb) },
{"TextviewPopupFile/Save", NULL, N_("_Save image..."), NULL, NULL, G_CALLBACK(save_file_cb) },
};
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list