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 6997f601adbf2b939323c0b62958bcfa75cd6362..a28e8c5cc0d5989817cf4d73fa0cb70bca1c9b7b 100644 (file)
--- 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 30adcce3d1d5fe9f811928ce859618ea73809a91..a5a0ebae5ba9dee2c08362180ff5a37d53082147 100644 (file)
--- 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 b363f76743f136252165542a4fd8cb46900d6e81..f401f28faf4a17a5555b828e31c6648ee3880fef 100644 (file)
--- 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 40ae3851ab288d7e6bc6848b22b3c9defe5c675a..ef50ca81ff4bac5f3a5e158a084bfe4472dce258 100644 (file)
--- 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 c559102a77352d4ffb5bca30b36d095d19271255..ddc9c2ce460b81373b600a3634d0e7e8d58b9c9e 100644 (file)
--- 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 4f175ada9932d9cd18db2b5078723b4541f072d3..736cfe8f0a78a7e27545a1e9c48579546be3bc2a 100644 (file)
--- 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 0046b38162e2680ec8e7be90c4ae20d37ee8159c..13dbdb5e4decc3f077b9530f90f9a95721e1280d 100644 (file)
--- 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 343b5dba72dae86ff407e94f99a2966382a6422e..392fcfeb32befad0decbf711dcd29e0bcb1a4bc4 100644 (file)
--- 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 6d187150686e5dbf48972866e78004f3fc3b09a9..5e59c503ad33f20de6d189b7cbfa54032fc904ac 100644 (file)
--- 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 e545554f4fce079ecd65fe7709ff718f549adb52..4461a8ac810c343fca5232477ab3c15a4bc93f23 100644 (file)
--- 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 20d2312c1cec476152cef5c0a2ca1e135acb5a37..614bcd75aba935e213f2404355c96ca1f950d532 100644 (file)
--- 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 ad4cf8f6b637bc7c338483d9521b6a2459e10e91..65e6778bd6a443c56a1d084882be4a78ad9bbd7c 100644 (file)
--- 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 a2ca78196350e26c3f5eb2c8367f21fc71b105e3..111706e2780ec6d06cbdcbb5257fa4fc632fb8fc 100644 (file)
--- 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 f7793ad89caf8b7ce1dce0628db208ef27938acc..3b03136b72034f8439a61969b34ed44b0a0be491 100644 (file)
--- 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 a26057e049db702987b88955e9ad15f5bfdfce51..bbacb3146c9472ea6e02d1111e07d2018d3b53ee 100644 (file)
--- 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 f091aeaaf4c0be9abf9409e44d76bf8907dceef9..ee5aacdc54a766cc87483dd5ea32af811a0cf5ba 100644 (file)
--- 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 1a63e0dfd5bc0da570a14c4a1d8c51ba56bbf35d..fd4ce16dd729ef9429ba701521ea26a25a193943 100644 (file)
--- 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 2fedb91e8035e7379329b67d21ffdac578ca24db..2a08692824b0487ef5b5903a037b671c6541ab48 100644 (file)
--- 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 35bde560a09fcc7e9cc3f0856e0ea3b4856bad70..150fcb97832c641087b414b300a535381b6f0ca5 100644 (file)
--- 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 02bf334107192ca17b6a581769a93974032e5a39..22b850d24a15ebfa6543e2bb5e1da6200c21cd30 100644 (file)
--- 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 f2b4ee927e009f7dd5eae2518364bae4c5f2452b..e025eae9c0d0128fbfe7cad1f81d24f988d40f0e 100644 (file)
--- 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 0c37e41b599945b189bb281628ca68e0f99e3b33..e93c7adc23a56bf88f6b2e145fd62fc363472521 100644 (file)
--- 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 e5cbe327e62eaf5df9fdfb5a958b5fb2c4402f22..63588c2d7050450f06b44308f092caaaed19429e 100644 (file)
--- 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 5c546410eb029c358f5035409cf8de866b0f6360..822cc7f006c893aaec32fc89d650f4c56922410d 100644 (file)
--- 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 0eed08bc877bbfee4b140c7602739b523d12f19f..c5fcd305396c3815ed1339fb21a1c819d5b6e08f 100644 (file)
--- 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 c11c701b78ee347fe35aa55ed940b7f686f644c2..ae27f8fbb65c6b2a69309e663d0885c8c51c4e49 100644 (file)
--- 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 a7493cac246d27fdada64df0eff494cee5db7c57..aa4be0e78c0cb7ece90b064243b64bcc042e0338 100644 (file)
--- 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 2d20a3e967bbe4eab4219d83989b18fc72bc11e7..62794af1e423b934834c63ac4b8d9a96604e4665 100644 (file)
--- 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 dc8b1d62bef6eeaa142c57b26287ba87ea2b0b35..14646f1500ea077179c2f67f1b5bf833dc719395 100644 (file)
--- 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 3acb48ed5b5205996e1711644cdc8c98f95f5491..d372802bbf4961abc1e5da4b5e6617dd6efba273 100644 (file)
--- 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 f6269ed704fe81d54b99e913b557758b30d80e17..cc9c7258e6f1e0ae5a1dc96310ae505a8c35c35f 100644 (file)
--- 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 61b81514f2587e68ec790795e68854dbad454b68..83c2eafea76fa7e26cdfc8525caf752bdb48c38a 100644 (file)
--- 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 5cf8fb383054afe66559b6eff7b38ff2067ba7ab..8db88598bfd775fc12bc79392a09183063ed2fbd 100644 (file)
--- 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 7a0aa12ec700aadee13d4297baf26b571a0959f7..06e54ba51d2354010198b07e6b508cdfa8b55d22 100644 (file)
--- 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 52030ad6d79c69dfb616dd63bfd0517214e911a3..e033347d49973dc0eeddfc1f451049bd107bd7f1 100644 (file)
--- 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) },
 };