Bumped required gal version number to 0.19.99.11.

2002-04-17  Christopher James Lahey  <clahey@ximian.com>

	* configure.in: Bumped required gal version number to 0.19.99.11.

From addressbook/ChangeLog:

2002-04-17  Christopher James Lahey  <clahey@ximian.com>

	* gui/component/select-names/e-select-names.c
	(e_select_names_create_categories): Changed this to use
	ECategoriesMasterListOptionMenu.

	* gui/component/select-names/e-select-names.c
	(section_right_click_cb),
	gui/widgets/e-addressbook-reflow-adapter.c,
	gui/widgets/e-addressbook-view.c: Updated these to match the new
	EPopupMenu.

From calendar/ChangeLog:

2002-04-17  Christopher James Lahey  <clahey@ximian.com>

	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
	gui/dialogs/meeting-page.c: Updated these to match the new
	EPopupMenu.

From mail/ChangeLog:

2002-04-17  Christopher James Lahey  <clahey@ximian.com>

	* folder-browser.c, mail-display.c: Updated these to match the new
	EPopupMenu.

From shell/ChangeLog:

2002-04-17  Christopher James Lahey  <clahey@ximian.com>

	* e-activity-handler.c: Updated this to match the new EPopupMenu.

svn path=/trunk/; revision=16498

16 files changed, 205 insertions, 225 deletions

diff --git a/ChangeLog b/ChangeLog
index e9a483cc4b..5ec41c7a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* configure.in: Bumped required gal version number to 0.19.99.11.
+
 2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* configure.in: Add checks for gethostbyaddr_r
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 994aec5ec6..f8195e4d70 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/component/select-names/e-select-names.c
+	(e_select_names_create_categories): Changed this to use
+	ECategoriesMasterListOptionMenu.
+
+	* gui/component/select-names/e-select-names.c
+	(section_right_click_cb),
+	gui/widgets/e-addressbook-reflow-adapter.c,
+	gui/widgets/e-addressbook-view.c: Updated these to match the new
+	EPopupMenu.
+
 2002-04-11  Christopher James Lahey  <clahey@ximian.com>
 
 	* gui/component/addressbook-component.c: Include
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 559e0eef58..b3d3891595 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -43,7 +43,7 @@
 #include "e-select-names.h"
 #include <addressbook/backend/ebook/e-card-simple.h>
 #include "e-select-names-text-model.h"
-#include <gal/widgets/e-categories-master-list-combo.h>
+#include <gal/widgets/e-categories-master-list-option-menu.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/e-text/e-entry.h>
 #include <e-util/e-categories-master-list-wombat.h>
@@ -53,7 +53,7 @@ static void e_select_names_class_init	(ESelectNamesClass	 *klass);
 static void e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
 static void e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static void e_select_names_destroy (GtkObject *object);
-static void update_query (GtkWidget *button, ESelectNames *e_select_names);
+static void update_query (GtkWidget *widget, ESelectNames *e_select_names);
 
 static GnomeDialogClass *parent_class = NULL;
 #define PARENT_TYPE gnome_dialog_get_type()
@@ -465,15 +465,15 @@ removed_folder  (EvolutionStorageListener *storage_listener,
 }
 
 static void
-update_query (GtkWidget *button, ESelectNames *e_select_names)
+update_query (GtkWidget *widget, ESelectNames *e_select_names)
 {
 	char *category = "";
 	char *search = "";
 	char *query;
 	char *q_array[4];
 	int i;
-	if (e_select_names->categories_entry) {
-		category = gtk_entry_get_text (GTK_ENTRY (e_select_names->categories_entry));
+	if (e_select_names->categories) {
+		category = e_categories_master_list_option_menu_get_category (E_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories));
 	}
 	if (e_select_names->search_entry) {
 		search = gtk_entry_get_text (GTK_ENTRY (e_select_names->search_entry));
@@ -505,6 +505,12 @@ update_query (GtkWidget *button, ESelectNames *e_select_names)
 }
 
 static void
+categories_changed (GtkWidget *widget, gint value, ESelectNames *e_select_names)
+{
+	update_query (widget, e_select_names);
+}
+
+static void
 hookup_listener (ESelectNames *e_select_names,
 		 GNOME_Evolution_Storage storage,
 		 EvolutionStorageListener *listener,
@@ -653,13 +659,13 @@ e_select_names_create_categories (gchar *name,
 				  gint int1, gint int2)
 {
 	ECategoriesMasterList *ecml;
-	GtkWidget *combo;
+	GtkWidget *option_menu;
 
 	ecml = e_categories_master_list_wombat_new ();
-	combo = e_categories_master_list_combo_new (ecml);
+	option_menu = e_categories_master_list_option_menu_new (ecml);
 	gtk_object_unref (GTK_OBJECT (ecml));
 
-	return combo;
+	return option_menu;
 }
 
 static void
@@ -699,21 +705,17 @@ e_select_names_init (ESelectNames *e_select_names)
 	e_select_names->without = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "without");
 
 	e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
-	if (e_select_names->categories && !GTK_IS_COMBO (e_select_names->categories))
+	if (e_select_names->categories && !E_IS_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories))
 		e_select_names->categories = NULL;
-	if (e_select_names->categories) {
-		e_select_names->categories_entry = GTK_COMBO (e_select_names->categories)->entry;
-	} else
-		e_select_names->categories_entry = NULL;
 	e_select_names->search_entry = glade_xml_get_widget (gui, "entry-find");
 	if (e_select_names->search_entry && !GTK_IS_ENTRY (e_select_names->search_entry))
 		e_select_names->search_entry = NULL;
 	if (e_select_names->search_entry)
 		gtk_signal_connect(GTK_OBJECT(e_select_names->search_entry), "activate",
 				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-	if (e_select_names->categories_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->categories_entry), "changed",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
+	if (e_select_names->categories)
+		gtk_signal_connect(GTK_OBJECT(e_select_names->categories), "changed",
+				   GTK_SIGNAL_FUNC(categories_changed), e_select_names);
 
 	button  = glade_xml_get_widget (gui, "button-find");
 	if (button)
@@ -849,7 +851,7 @@ static void
 section_right_click_cb (EText *text, GdkEventButton *ev, gint pos, ESelectNamesChild *child)
 {
 	EPopupMenu right_click_menu[] = {
-		{ N_("Remove"), NULL, GTK_SIGNAL_FUNC (remove_cb), NULL, NULL, 0 },
+		E_POPUP_ITEM (N_("Remove"), GTK_SIGNAL_FUNC (remove_cb), 0),
 		E_POPUP_TERMINATOR
 	};
 	gint index;
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 895489863a..793a9a4bc5 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -311,24 +311,24 @@ e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, Gd
 	ModelAndSelection *mns = g_new(ModelAndSelection, 1);
 	GtkMenu *popup;
 	EPopupMenu menu[] = {
-		{ N_("Open"), NULL, GTK_SIGNAL_FUNC(open_card), NULL, NULL, 0 },
-		{ N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, NULL, 0 },
-		{ N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, NULL, 0 },
-		{ N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, NULL, 0 },
-		{ N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, NULL, 0 },
+		E_POPUP_ITEM (N_("Open"), GTK_SIGNAL_FUNC(open_card), 0),
+		E_POPUP_ITEM (N_("Save as VCard"), GTK_SIGNAL_FUNC(save_as), 0),
+		E_POPUP_ITEM (N_("Forward Contact"), GTK_SIGNAL_FUNC(send_as), 0),
+		E_POPUP_ITEM (N_("Send Message to Contact"), GTK_SIGNAL_FUNC(send_to), 0),
+		E_POPUP_ITEM (N_("Print"), GTK_SIGNAL_FUNC(print), 0),
 #if 0 /* Envelope printing is disabled for Evolution 1.0. */
-		{ N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, NULL, 0 },
+		E_POPUP_ITEM (N_("Print Envelope"), GTK_SIGNAL_FUNC(print_envelope), 0),
 #endif
 		E_POPUP_SEPARATOR,
-		
-		{ N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, NULL, 0 }, 
-		{ N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, NULL, POPUP_READONLY_MASK },
+
+		E_POPUP_ITEM (N_("Copy to folder..."), GTK_SIGNAL_FUNC(copy_to_folder), 0),
+		E_POPUP_ITEM (N_("Move to folder..."), GTK_SIGNAL_FUNC(move_to_folder), POPUP_READONLY_MASK),
 		E_POPUP_SEPARATOR,
-		
-		{ N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, NULL, POPUP_READONLY_MASK },
-		{ N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, NULL, 0 },
-		{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
-		{ N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, NULL, POPUP_READONLY_MASK},
+
+		E_POPUP_ITEM (N_("Cut"), GTK_SIGNAL_FUNC (cut), POPUP_READONLY_MASK),
+		E_POPUP_ITEM (N_("Copy"), GTK_SIGNAL_FUNC (copy), 0),
+		E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),
+		E_POPUP_ITEM (N_("Delete"), GTK_SIGNAL_FUNC (delete), POPUP_READONLY_MASK),
 		E_POPUP_TERMINATOR
 	};
 
@@ -375,10 +375,10 @@ e_addressbook_reflow_adapter_base_right_click (EAddressbookReflowAdapter *adapte
 	ModelAndSelection *mns = g_new(ModelAndSelection, 1);
 	GtkMenu *popup;
 	EPopupMenu menu[] = {
-		{ N_("New Contact..."), NULL, GTK_SIGNAL_FUNC(new_card), NULL, NULL, POPUP_READONLY_MASK },
-		{ N_("New Contact List..."), NULL, GTK_SIGNAL_FUNC(new_list), NULL, NULL, POPUP_READONLY_MASK },
+		E_POPUP_ITEM (N_("New Contact..."), GTK_SIGNAL_FUNC(new_card), POPUP_READONLY_MASK),
+		E_POPUP_ITEM (N_("New Contact List..."), GTK_SIGNAL_FUNC(new_list), POPUP_READONLY_MASK),
 		E_POPUP_SEPARATOR,
-		{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
+		E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),
 		E_POPUP_TERMINATOR
 	};
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 119b8a4147..070e1b49e0 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -69,6 +69,8 @@
 
 #define SHOW_ALL_SEARCH "(contains \"x-evolution-any-field\" \"\")"
 
+#define d(x)
+
 static void e_addressbook_view_init		(EAddressbookView		 *card);
 static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);
 static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
@@ -771,7 +773,7 @@ minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)
 static void
 minicard_button_press (GtkWidget *widget, GdkEventButton *event, EAddressbookView *view)
 {
-	g_print ("Button %d pressed with event type %d\n", event->button, event->type);
+	d(g_print ("Button %d pressed with event type %d\n", event->button, event->type));
 }
 
 static void
@@ -1019,23 +1021,23 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA
 		GtkMenu *popup;
 
 		EPopupMenu menu[] = {
-			{ N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, NULL, 0 }, 
-			{ N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, NULL, 0 },
-			{ N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, NULL, 0 },
-			{ N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, NULL, 0 },
+			E_POPUP_ITEM (N_("Save as VCard"), GTK_SIGNAL_FUNC(save_as), 0), 
+			E_POPUP_ITEM (N_("Forward Contact"), GTK_SIGNAL_FUNC(send_as), 0),
+			E_POPUP_ITEM (N_("Send Message to Contact"), GTK_SIGNAL_FUNC(send_to), 0),
+			E_POPUP_ITEM (N_("Print"), GTK_SIGNAL_FUNC(print), 0),
 #if 0 /* Envelope printing is disabled for Evolution 1.0. */
-			{ N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, NULL, 0 },
+			E_POPUP_ITEM (N_("Print Envelope"), GTK_SIGNAL_FUNC(print_envelope), 0),
 #endif
 			E_POPUP_SEPARATOR,
 
-			{ N_("Copy to folder..."), NULL, GTK_SIGNAL_FUNC(copy_to_folder), NULL, NULL, 0 }, 
-			{ N_("Move to folder..."), NULL, GTK_SIGNAL_FUNC(move_to_folder), NULL, NULL, POPUP_READONLY_MASK },
+			E_POPUP_ITEM (N_("Copy to folder..."), GTK_SIGNAL_FUNC(copy_to_folder), 0), 
+			E_POPUP_ITEM (N_("Move to folder..."), GTK_SIGNAL_FUNC(move_to_folder), POPUP_READONLY_MASK),
 			E_POPUP_SEPARATOR,
 
-			{ N_("Cut"), NULL, GTK_SIGNAL_FUNC (cut), NULL, NULL, POPUP_READONLY_MASK },
-			{ N_("Copy"), NULL, GTK_SIGNAL_FUNC (copy), NULL, NULL, 0 },
-			{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
-			{ N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, NULL, POPUP_READONLY_MASK },
+			E_POPUP_ITEM (N_("Cut"), GTK_SIGNAL_FUNC (cut), POPUP_READONLY_MASK),
+			E_POPUP_ITEM (N_("Copy"), GTK_SIGNAL_FUNC (copy), 0),
+			E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),
+			E_POPUP_ITEM (N_("Delete"), GTK_SIGNAL_FUNC(delete), POPUP_READONLY_MASK),
 			E_POPUP_TERMINATOR
 		};
 
@@ -1085,10 +1087,10 @@ table_white_space_event(ETableScrolled *table, GdkEvent *event, EAddressbookView
 		GtkMenu *popup;
 
 		EPopupMenu menu[] = {
-			{ N_("New Contact..."), NULL, GTK_SIGNAL_FUNC(new_card), NULL, NULL, POPUP_READONLY_MASK },
-			{ N_("New Contact List..."), NULL, GTK_SIGNAL_FUNC(new_list), NULL, NULL, POPUP_READONLY_MASK },
+			E_POPUP_ITEM (N_("New Contact..."), GTK_SIGNAL_FUNC(new_card), POPUP_READONLY_MASK),
+			E_POPUP_ITEM (N_("New Contact List..."), GTK_SIGNAL_FUNC(new_list), POPUP_READONLY_MASK),
 			E_POPUP_SEPARATOR,
-			{ N_("Paste"), NULL, GTK_SIGNAL_FUNC (paste), NULL, NULL, POPUP_READONLY_MASK },
+			E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),
 			E_POPUP_TERMINATOR
 		};
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 40bf1f972d..498452ea40 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
+	gui/dialogs/meeting-page.c: Updated these to match the new
+	EPopupMenu.
+
 2002-04-05  Rodrigo Moya <rodrigo@ximian.com>
 
 	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 9358b40c8b..2504ed3993 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -698,14 +698,12 @@ enum {
 
 static EPopupMenu context_menu[] = {
 #if 0
-	{ N_("_Delegate To..."),               NULL,
-	  GTK_SIGNAL_FUNC (popup_delegate_cb), NULL, NULL,  CAN_DELEGATE },
+	E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb),  CAN_DELEGATE),
 
 	E_POPUP_SEPARATOR,
 #endif
 
-	{ N_("_Delete"),                      NULL,
-	  GTK_SIGNAL_FUNC (popup_delete_cb),  NULL, NULL,  CAN_DELETE },
+	E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb),   CAN_DELETE),
 	
 	E_POPUP_TERMINATOR
 };
@@ -725,7 +723,7 @@ right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer da
 	priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row);
 	
 	/* FIXME: if you enable Delegate, then change index to '1' */
-	context_menu[0].pixmap = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);
+	context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);
 	
 	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data);
 	e_auto_kill_popup_menu_on_hide (menu);
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 2f56f2b11d..8a7d3dd631 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -969,39 +969,27 @@ enum {
 
 
 static EPopupMenu tasks_popup_menu [] = {
-	{ N_("_Open"), NULL,
-	  e_calendar_table_on_open_task, NULL, NULL, MASK_SINGLE },
-	{ N_("_Save as..."), NULL,
-	  e_calendar_table_on_save_as, NULL, NULL, MASK_SINGLE },
-	{ N_("_Print..."), NULL,
-	  e_calendar_table_on_print_task, NULL, NULL, MASK_SINGLE },
+	E_POPUP_ITEM (N_("_Open"), e_calendar_table_on_open_task, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Save as..."), e_calendar_table_on_save_as, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Print..."), e_calendar_table_on_print_task, MASK_SINGLE),
 
 	E_POPUP_SEPARATOR,
 	
-	{ N_("C_ut"), NULL,
-	  e_calendar_table_on_cut, NULL, NULL, 0 },
-	{ N_("_Copy"), NULL,
-	  e_calendar_table_on_copy, NULL, NULL, 0 },
-	{ N_("_Paste"), NULL,
-	  e_calendar_table_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("C_ut"), e_calendar_table_on_cut, 0),
+	E_POPUP_ITEM (N_("_Copy"), e_calendar_table_on_copy, 0),
+	E_POPUP_ITEM (N_("_Paste"), e_calendar_table_on_paste, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Assign Task"), NULL,
-	  e_calendar_table_on_assign, NULL, NULL, MASK_SINGLE },
-	{ N_("_Forward as iCalendar"), NULL,
-	  e_calendar_table_on_forward, NULL, NULL, MASK_SINGLE },
-	{ N_("_Mark as Complete"), NULL,
-	  mark_as_complete_cb, NULL, NULL, MASK_SINGLE },
-	{ N_("_Mark Selected Tasks as Complete"), NULL,
-	  mark_as_complete_cb, NULL, NULL, MASK_MULTIPLE },
+	E_POPUP_ITEM (N_("_Assign Task"), e_calendar_table_on_assign, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Forward as iCalendar"), e_calendar_table_on_forward, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Mark as Complete"), mark_as_complete_cb, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, MASK_MULTIPLE),
 	
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Delete"), NULL,
-	  delete_cb, NULL, NULL, MASK_SINGLE },
-	{ N_("_Delete Selected Tasks"), NULL,
-	  delete_cb, NULL, NULL, MASK_MULTIPLE },
+	E_POPUP_ITEM (N_("_Delete"), delete_cb, MASK_SINGLE),
+	E_POPUP_ITEM (N_("_Delete Selected Tasks"), delete_cb, MASK_MULTIPLE),
 
 	E_POPUP_TERMINATOR
 };
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 3dede7fa96..29d7c97393 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3540,80 +3540,68 @@ enum {
 };
 
 static EPopupMenu main_items [] = {
-	{ N_("New _Appointment"), NULL,
-	  e_day_view_on_new_appointment, NULL, NULL, 0 },
-	{ N_("New All Day _Event"), NULL,
-	  e_day_view_on_new_event, NULL, NULL, 0 },
-	{ N_("New Meeting"), NULL,
-	  e_day_view_on_new_meeting, NULL, NULL, 0 },
-	{ N_("New Task"), NULL,
-	  e_day_view_on_new_task, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("New _Appointment"),
+	  e_day_view_on_new_appointment, 0),
+	E_POPUP_ITEM (N_("New All Day _Event"),
+	  e_day_view_on_new_event, 0),
+	E_POPUP_ITEM (N_("New Meeting"),
+	  e_day_view_on_new_meeting, 0),
+	E_POPUP_ITEM (N_("New Task"),
+	  e_day_view_on_new_task, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("Print..."), NULL,
-	  e_day_view_on_print, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("Print..."),
+	  e_day_view_on_print, 0),
 	
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Paste"), NULL,
-	  e_day_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Paste"),
+	  e_day_view_on_paste, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("Go to _Today"), NULL,
-	  e_day_view_on_goto_today, NULL, NULL, 0 },
-	{ N_("_Go to Date..."), NULL,
-	  e_day_view_on_goto_date, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("Go to _Today"),
+	  e_day_view_on_goto_today, 0),
+	E_POPUP_ITEM (N_("_Go to Date..."),
+	  e_day_view_on_goto_date, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Publish Free/Busy Information"), NULL,
-	  e_day_view_on_publish, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Publish Free/Busy Information"),
+	  e_day_view_on_publish, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Configure..."), NULL,
-	  e_day_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Configure..."),
+	  e_day_view_on_paste, 0),
 
 	E_POPUP_TERMINATOR
 };
 
 static EPopupMenu child_items [] = {
-	{ N_("_Open"), NULL,
-	  e_day_view_on_edit_appointment, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("_Save As..."), NULL,
-	  e_day_view_on_save_as, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("_Print..."), NULL,
-	  e_day_view_on_print_event, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Open"), e_day_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Save As..."), e_day_view_on_save_as, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Print..."), e_day_view_on_print_event, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
 
 	/* Only show this separator if one of the above is shown. */
-	{ "", NULL, NULL, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
+	E_POPUP_SEPARATOR,
 
-	{ N_("C_ut"), NULL,
-	  e_day_view_on_cut, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("_Copy"), NULL,
-	  e_day_view_on_copy, NULL, NULL, 0 },
-	{ N_("_Paste"), NULL,
-	  e_day_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("C_ut"), e_day_view_on_cut, MASK_EDITABLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Copy"), e_day_view_on_copy, 0),
+	E_POPUP_ITEM (N_("_Paste"), e_day_view_on_paste, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Schedule Meeting..."), NULL,
-	  e_day_view_on_meeting, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("_Forward as iCalendar..."), NULL,
-	  e_day_view_on_forward, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_day_view_on_meeting, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_day_view_on_forward, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
 	
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Delete"), NULL,
-	  e_day_view_on_delete_appointment, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("Make this Occurrence _Movable"), NULL,
-	  e_day_view_on_unrecur_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete this _Occurrence"), NULL,
-	  e_day_view_on_delete_occurrence, NULL, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete _All Occurrences"), NULL,
-	  e_day_view_on_delete_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Delete"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_day_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),
+	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_day_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),
+	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_day_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),
 
 	E_POPUP_TERMINATOR
 };
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index ce8bba0635..f7eb62d56b 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3428,80 +3428,58 @@ enum {
 };
 
 static EPopupMenu main_items [] = {
-	{ N_("New _Appointment..."), NULL,
-	  e_week_view_on_new_appointment, NULL, NULL, 0 },
-	{ N_("New All Day _Event"), NULL,
-	  e_week_view_on_new_event, NULL, NULL, 0 },
-	{ N_("New Meeting"), NULL,
-	  e_week_view_on_new_meeting, NULL, NULL, 0 },
-	{ N_("New Task"), NULL,
-	  e_week_view_on_new_task, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("New _Appointment..."), e_week_view_on_new_appointment, 0),
+	E_POPUP_ITEM (N_("New All Day _Event"), e_week_view_on_new_event, 0),
+	E_POPUP_ITEM (N_("New Meeting"), e_week_view_on_new_meeting, 0),
+	E_POPUP_ITEM (N_("New Task"), e_week_view_on_new_task, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Print..."), NULL,
-	  e_week_view_on_print, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Paste"), NULL,
-	  e_week_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),
 
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Go to _Today"), NULL,
-	  e_week_view_on_goto_today, NULL, NULL, 0 },
-	{ N_("_Go to Date..."), NULL,
- 	  e_week_view_on_goto_date, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("Go to _Today"), e_week_view_on_goto_today, 0),
+	E_POPUP_ITEM (N_("_Go to Date..."), e_week_view_on_goto_date, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Publish Free/Busy Information"), NULL,
-	  e_week_view_on_publish, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Publish Free/Busy Information"), e_week_view_on_publish, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Configure..."), NULL,
-	  e_week_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("_Configure..."), e_week_view_on_paste, 0),
 
 	E_POPUP_TERMINATOR
 };
 
 static EPopupMenu child_items [] = {
-	{ N_("_Open"), NULL,
-	  e_week_view_on_edit_appointment, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("_Save As..."), NULL,
-	  e_week_view_on_save_as, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("_Print..."), NULL,
-	  e_week_view_on_print_event, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Open"), e_week_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Save As..."), e_week_view_on_save_as, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print_event, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
 
 	/* Only show this separator if one of the above is shown. */
-	{ "", NULL, NULL, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
+	E_POPUP_SEPARATOR,
 
-	{ N_("C_ut"), NULL,
-	  e_week_view_on_cut, NULL, NULL, MASK_EDITING | MASK_EDITABLE },
-	{ N_("_Copy"), NULL,
-	  e_week_view_on_copy, NULL, NULL, MASK_EDITING | MASK_EDITABLE },
-	{ N_("_Paste"), NULL,
-	  e_week_view_on_paste, NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("C_ut"), e_week_view_on_cut, MASK_EDITING | MASK_EDITABLE),
+	E_POPUP_ITEM (N_("_Copy"), e_week_view_on_copy, MASK_EDITING | MASK_EDITABLE),
+	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Schedule Meeting..."), NULL,
-	  e_week_view_on_meeting, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("_Forward as iCalendar..."), NULL,
-	  e_week_view_on_forward, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_week_view_on_meeting, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_week_view_on_forward, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
 
 	E_POPUP_SEPARATOR,
 
-	{ N_("_Delete this Appointment"), NULL,
-	  e_week_view_on_delete_appointment, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("Make this Occurrence _Movable"), NULL,
-	  e_week_view_on_unrecur_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete this _Occurrence"), NULL,
-	  e_week_view_on_delete_occurrence, NULL, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete _All Occurrences"), NULL,
-	  e_week_view_on_delete_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING },
+	E_POPUP_ITEM (N_("_Delete this Appointment"), e_week_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
+	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_week_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),
+	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_week_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),
+	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_week_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),
 
 	E_POPUP_TERMINATOR
 };
diff --git a/configure.in b/configure.in
index aab96493e4..1bb7047047 100644
--- a/configure.in
+++ b/configure.in
@@ -660,7 +660,7 @@ EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0)
 EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0)
 EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11)
 
-EVO_CHECK_LIB(GAL, gal, 0.19.99.10)
+EVO_CHECK_LIB(GAL, gal, 0.19.99.11)
 EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0)
 EVO_CHECK_LIB(Libsoup, soup, 0.6)
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d6726d1426..361495e399 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* folder-browser.c, mail-display.c: Updated these to match the new
+	EPopupMenu.
+
 2002-04-17  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-format.c (handle_multipart_signed): Handle broken
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 94db6493a0..0ce4e7ee64 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1572,83 +1572,83 @@ enum {
 #define MLIST_FILTER (8)
 
 static EPopupMenu filter_menu[] = {
-	{ N_("VFolder on _Subject"),        NULL, GTK_SIGNAL_FUNC (vfolder_subject_uid),   NULL, NULL, SELECTION_SET },
-	{ N_("VFolder on Se_nder"),         NULL, GTK_SIGNAL_FUNC (vfolder_sender_uid),    NULL, NULL, SELECTION_SET },
-	{ N_("VFolder on _Recipients"),     NULL, GTK_SIGNAL_FUNC (vfolder_recipient_uid), NULL, NULL, SELECTION_SET },
-	{ N_("VFolder on Mailing _List"),   NULL, GTK_SIGNAL_FUNC (vfolder_mlist_uid),     NULL, NULL, SELECTION_SET | IS_MAILING_LIST },
+	E_POPUP_ITEM (N_("VFolder on _Subject"),        GTK_SIGNAL_FUNC (vfolder_subject_uid),   SELECTION_SET),
+	E_POPUP_ITEM (N_("VFolder on Se_nder"),         GTK_SIGNAL_FUNC (vfolder_sender_uid),    SELECTION_SET),
+	E_POPUP_ITEM (N_("VFolder on _Recipients"),     GTK_SIGNAL_FUNC (vfolder_recipient_uid), SELECTION_SET),
+	E_POPUP_ITEM (N_("VFolder on Mailing _List"),   GTK_SIGNAL_FUNC (vfolder_mlist_uid),     SELECTION_SET | IS_MAILING_LIST),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Filter on Sub_ject"),         NULL, GTK_SIGNAL_FUNC (filter_subject_uid),    NULL, NULL, SELECTION_SET },
-	{ N_("Filter on Sen_der"),          NULL, GTK_SIGNAL_FUNC (filter_sender_uid),     NULL, NULL, SELECTION_SET },
-	{ N_("Filter on Re_cipients"),      NULL, GTK_SIGNAL_FUNC (filter_recipient_uid),  NULL, NULL, SELECTION_SET },
-	{ N_("Filter on _Mailing List"),    NULL, GTK_SIGNAL_FUNC (filter_mlist_uid),      NULL, NULL, SELECTION_SET | IS_MAILING_LIST },
+	E_POPUP_ITEM (N_("Filter on Sub_ject"),         GTK_SIGNAL_FUNC (filter_subject_uid),    SELECTION_SET),
+	E_POPUP_ITEM (N_("Filter on Sen_der"),          GTK_SIGNAL_FUNC (filter_sender_uid),     SELECTION_SET),
+	E_POPUP_ITEM (N_("Filter on Re_cipients"),      GTK_SIGNAL_FUNC (filter_recipient_uid),  SELECTION_SET),
+	E_POPUP_ITEM (N_("Filter on _Mailing List"),    GTK_SIGNAL_FUNC (filter_mlist_uid),      SELECTION_SET | IS_MAILING_LIST),
 	
 	E_POPUP_TERMINATOR
 };
 
 static EPopupMenu label_menu[] = {
-	{ N_("None"), NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 0 },
+	E_POPUP_ITEM (N_("None"), GTK_SIGNAL_FUNC (colourise_msg), 0),
 	E_POPUP_SEPARATOR,
-	{ NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 0 },
-	{ NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 0 },
-	{ NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 0 },
-	{ NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 0 },
-	{ NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, NULL, 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_ITEM (NULL, GTK_SIGNAL_FUNC (colourise_msg), 0),
 	E_POPUP_TERMINATOR
 };
 
 static EPopupMenu context_menu[] = {
-	{ N_("_Open"),                    NULL, GTK_SIGNAL_FUNC (open_msg),         NULL, NULL,  0 },
-	{ N_("_Edit as New Message..."),  NULL, GTK_SIGNAL_FUNC (resend_msg),       NULL, NULL,  CAN_RESEND },
-	{ N_("_Save As..."),              NULL, GTK_SIGNAL_FUNC (save_msg),         NULL, NULL,  0 },
-	{ N_("_Print"),                   NULL, GTK_SIGNAL_FUNC (print_msg),        NULL, NULL,  0 },
+	E_POPUP_ITEM (N_("_Open"),                    GTK_SIGNAL_FUNC (open_msg),          0),
+	E_POPUP_ITEM (N_("_Edit as New Message..."),  GTK_SIGNAL_FUNC (resend_msg),        CAN_RESEND),
+	E_POPUP_ITEM (N_("_Save As..."),              GTK_SIGNAL_FUNC (save_msg),          0),
+	E_POPUP_ITEM (N_("_Print"),                   GTK_SIGNAL_FUNC (print_msg),         0),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("_Reply to Sender"),         NULL, GTK_SIGNAL_FUNC (reply_to_sender),  NULL, NULL,  0 },
-	{ N_("Reply to _List"),        	  NULL, GTK_SIGNAL_FUNC (reply_to_list),    NULL, NULL,  0 },
-	{ N_("Reply to _All"),            NULL, GTK_SIGNAL_FUNC (reply_to_all),     NULL, NULL,  0 },
-	{ N_("_Forward"),                 NULL, GTK_SIGNAL_FUNC (forward),          NULL, NULL,  0 },
+	E_POPUP_ITEM (N_("_Reply to Sender"),         GTK_SIGNAL_FUNC (reply_to_sender),   0),
+	E_POPUP_ITEM (N_("Reply to _List"),           GTK_SIGNAL_FUNC (reply_to_list),     0),
+	E_POPUP_ITEM (N_("Reply to _All"),            GTK_SIGNAL_FUNC (reply_to_all),      0),
+	E_POPUP_ITEM (N_("_Forward"),                 GTK_SIGNAL_FUNC (forward),           0),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Follo_w Up..."),            NULL, GTK_SIGNAL_FUNC (flag_for_followup),       NULL, NULL, CAN_FLAG_FOR_FOLLOWUP },
-	{ N_("Fla_g Completed"),          NULL, GTK_SIGNAL_FUNC (flag_followup_completed), NULL, NULL, CAN_FLAG_COMPLETED },
-	{ N_("Cl_ear Flag"),              NULL, GTK_SIGNAL_FUNC (flag_followup_clear),     NULL, NULL, CAN_CLEAR_FLAG },
+	E_POPUP_ITEM (N_("Follo_w Up..."),            GTK_SIGNAL_FUNC (flag_for_followup),       CAN_FLAG_FOR_FOLLOWUP),
+	E_POPUP_ITEM (N_("Fla_g Completed"),          GTK_SIGNAL_FUNC (flag_followup_completed), CAN_FLAG_COMPLETED),
+	E_POPUP_ITEM (N_("Cl_ear Flag"),              GTK_SIGNAL_FUNC (flag_followup_clear),     CAN_CLEAR_FLAG),
 	
 	/* separator here? */
 	
-	{ N_("Mar_k as Read"),            NULL, GTK_SIGNAL_FUNC (mark_as_seen),        NULL, NULL, CAN_MARK_READ },
-	{ N_("Mark as _Unread"),          NULL, GTK_SIGNAL_FUNC (mark_as_unseen),      NULL, NULL, CAN_MARK_UNREAD },
-	{ N_("Mark as _Important"),       NULL, GTK_SIGNAL_FUNC (mark_as_important),   NULL, NULL, CAN_MARK_IMPORTANT },
-	{ N_("_Mark as Unimportant"),     NULL, GTK_SIGNAL_FUNC (mark_as_unimportant), NULL, NULL, CAN_MARK_UNIMPORTANT },
+	E_POPUP_ITEM (N_("Mar_k as Read"),            GTK_SIGNAL_FUNC (mark_as_seen),        CAN_MARK_READ),
+	E_POPUP_ITEM (N_("Mark as _Unread"),          GTK_SIGNAL_FUNC (mark_as_unseen),      CAN_MARK_UNREAD),
+	E_POPUP_ITEM (N_("Mark as _Important"),       GTK_SIGNAL_FUNC (mark_as_important),   CAN_MARK_IMPORTANT),
+	E_POPUP_ITEM (N_("_Mark as Unimportant"),     GTK_SIGNAL_FUNC (mark_as_unimportant), CAN_MARK_UNIMPORTANT),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("_Delete"),                  NULL, GTK_SIGNAL_FUNC (delete_msg),          NULL, NULL, CAN_DELETE },
-	{ N_("U_ndelete"),                NULL, GTK_SIGNAL_FUNC (undelete_msg),        NULL, NULL, CAN_UNDELETE },
+	E_POPUP_ITEM (N_("_Delete"),                  GTK_SIGNAL_FUNC (delete_msg),          CAN_DELETE),
+	E_POPUP_ITEM (N_("U_ndelete"),                GTK_SIGNAL_FUNC (undelete_msg),        CAN_UNDELETE),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Mo_ve to Folder..."),       NULL, GTK_SIGNAL_FUNC (move_msg_cb),         NULL, NULL,  0 },
-	{ N_("_Copy to Folder..."),       NULL, GTK_SIGNAL_FUNC (copy_msg_cb),         NULL, NULL,  0 },
+	E_POPUP_ITEM (N_("Mo_ve to Folder..."),       GTK_SIGNAL_FUNC (move_msg_cb),          0),
+	E_POPUP_ITEM (N_("_Copy to Folder..."),       GTK_SIGNAL_FUNC (copy_msg_cb),          0),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Label"),                    NULL, GTK_SIGNAL_FUNC (NULL), NULL, label_menu, 0 },
+	E_POPUP_SUBMENU (N_("Label"),                 label_menu,                             0),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Add Sender to Address_book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL, NULL,  SELECTION_SET },
+	E_POPUP_ITEM (N_("Add Sender to Address_book"), GTK_SIGNAL_FUNC (addrbook_sender),    SELECTION_SET),
 	
 	E_POPUP_SEPARATOR,	
 	
-	{ N_("Appl_y Filters"),             NULL, GTK_SIGNAL_FUNC (apply_filters),     NULL, NULL,  0 },
+	E_POPUP_ITEM (N_("Appl_y Filters"),             GTK_SIGNAL_FUNC (apply_filters),      0),
 	
 	E_POPUP_SEPARATOR,
 	
-	{ N_("Crea_te Rule From Message"),  NULL, GTK_SIGNAL_FUNC (NULL), NULL, filter_menu,  SELECTION_SET },
+	E_POPUP_SUBMENU (N_("Crea_te Rule From Message"), filter_menu,                        SELECTION_SET),
 	
 	E_POPUP_TERMINATOR
 };
@@ -1730,7 +1730,7 @@ setup_popup_icons (void)
 			char *filename;
 			
 			filename = g_strdup_printf ("%s/%s", EVOLUTION_IMAGES, context_pixmaps[i]);
-			context_menu[i].pixmap = gnome_pixmap_new_from_file (filename);
+			context_menu[i].pixmap_widget = gnome_pixmap_new_from_file (filename);
 			g_free (filename);
 		}
 	}
@@ -1960,7 +1960,7 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
 		g_ptr_array_add (closures, closure);
 		
 		label_menu[i + 2].name = e_utf8_to_locale_string (mail_config_get_label_name (i));
-		label_menu[i + 2].pixmap = gtk_pixmap_new (pixmap, NULL);
+		label_menu[i + 2].pixmap_widget = gtk_pixmap_new (pixmap, NULL);
 		label_menu[i + 2].closure = closure;
 	}
 	
diff --git a/mail/mail-display.c b/mail/mail-display.c
index e3dbcfc67d..a4d3ae65bd 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -385,12 +385,9 @@ static gboolean
 pixmap_press (GtkWidget *widget, GdkEventButton *event, EScrollFrame *user_data)
 {
 	EPopupMenu *menu;
-	EPopupMenu save_item = { N_("Save to Disk..."), NULL,
-				 GTK_SIGNAL_FUNC (save_cb), NULL, NULL, 0 };
-	EPopupMenu view_item = { N_("View Inline"), NULL,
-				 GTK_SIGNAL_FUNC (inline_cb), NULL, NULL, 2 };
-	EPopupMenu open_item = { N_("Open in %s..."), NULL,
-				 GTK_SIGNAL_FUNC (launch_cb), NULL, NULL, 1 };
+	EPopupMenu save_item = E_POPUP_ITEM (N_("Save to Disk..."), GTK_SIGNAL_FUNC (save_cb), 0);
+	EPopupMenu view_item = E_POPUP_ITEM (N_("View Inline"), GTK_SIGNAL_FUNC (inline_cb), 2);
+	EPopupMenu open_item = E_POPUP_ITEM (N_("Open in %s..."), GTK_SIGNAL_FUNC (launch_cb), 1);
 	MailDisplay *md;
 	CamelMimePart *part;
 	MailMimeHandler *handler;
@@ -1123,7 +1120,7 @@ load_http (MailDisplay *md, gpointer data)
 	}
 
 	while ((result = gnome_vfs_read (handle, buf, sizeof (buf), &read)) == GNOME_VFS_OK) {
-		printf ("%s: read %d bytes\n", url, read);
+		printf ("%s: read %d bytes\n", url, (int) read); 
 		g_byte_array_append (ba, buf, read);
 		total += read;
 	}
@@ -1813,16 +1810,12 @@ enum {
 #define TERMINATOR { NULL, NULL, (NULL), NULL,  0 }
 
 static EPopupMenu link_menu [] = {
-	{ N_("Open Link in Browser"), NULL,
-	  GTK_SIGNAL_FUNC (link_open_in_browser),  NULL, NULL,  MASK_URL },
-	{ N_("Copy Link Location"), NULL,
-	  GTK_SIGNAL_FUNC (link_copy_location), NULL, NULL,  MASK_URL },
+	E_POPUP_ITEM (N_("Open Link in Browser"), GTK_SIGNAL_FUNC (link_open_in_browser),   MASK_URL),
+	E_POPUP_ITEM (N_("Copy Link Location"), GTK_SIGNAL_FUNC (link_copy_location),  MASK_URL),
 #if 0
-	{ N_("Save Link as (FIXME)"), NULL,
-	  GTK_SIGNAL_FUNC (link_save_as), NULL, NULL,  MASK_URL },
+	E_POPUP_ITEM (N_("Save Link as (FIXME)"), GTK_SIGNAL_FUNC (link_save_as),  MASK_URL),
 #endif
-	{ N_("Save Image as..."), NULL,
-	  GTK_SIGNAL_FUNC (image_save_as), NULL, NULL, MASK_SRC }, 
+	E_POPUP_ITEM (N_("Save Image as..."), GTK_SIGNAL_FUNC (image_save_as), MASK_SRC), 
      
 	TERMINATOR
 };
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ade1859497..160de416f9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* e-activity-handler.c: Updated this to match the new EPopupMenu.
+
 2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-storage-set-view.c (handle_evolution_path_drag_motion):
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index 34afb7fb65..f7bc09919d 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-handler.c
@@ -159,9 +159,9 @@ show_cancellation_popup (ActivityInfo *activity_info,
 {
 	GtkMenu *popup;
 	EPopupMenu items[] = {
-		{ N_("Show Details"), NULL, task_widget_show_details_callback, NULL, NULL, 0 },
+		E_POPUP_MENU (N_("Show Details"), task_widget_show_details_callback, 0),
 		E_POPUP_SEPARATOR,
-		{ N_("Cancel Operation"), NULL, task_widget_cancel_callback, NULL, NULL, 0 },
+		E_POPUP_MENU (N_("Cancel Operation"), task_widget_cancel_callback, 0),
 		E_POPUP_TERMINATOR
 	};