aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/folder-browser.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5bab4872c3..e722465ee8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2002-04-24 Jeffrey Stedfast <fejj@ximian.com>
+ * folder-browser.c (label_menu): Update to use
+ E_POPUP_MENU_PIXMAP_WIDGET_ITEM_CC so that our callback gets
+ called without per-item closure rather than being called with NULL
+ and causing a segfault.
+
* mail-account-gui.c (mail_account_gui_build_extra_conf): Set the
default Username label and handle the new
CAMEL_PROVIDER_CONF_LABEL enum allowing the provider to setup a
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index dede81bfc5..539c18dd49 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1593,13 +1593,13 @@ static EPopupMenu filter_menu[] = {
};
static EPopupMenu label_menu[] = {
- E_POPUP_ITEM (N_("None"), GTK_SIGNAL_FUNC (colourise_msg), 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (N_("None"), NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
E_POPUP_SEPARATOR,
- E_POPUP_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
- E_POPUP_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
- E_POPUP_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
- E_POPUP_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
- E_POPUP_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
+ E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
E_POPUP_TERMINATOR
};