svn path=/trunk/; revision=28177

2004-12-17  Not Zed  <NotZed@Ximian.com>

        * gui/e-calendar-table.c (e_calendar_table_show_popup_menu):

        * gui/tasks-component.c (popup_event_cb):

        * gui/gnome-cal.c (gnome_calendar_view_popup_factory):

        * gui/e-calendar-view.c (e_calendar_view_create_popup_menu):

        * gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb):

        * gui/dialogs/meeting-page.c (button_press_event):

        * gui/calendar-component.c (popup_event_cb):

svn path=/trunk/; revision=28177

8 files changed, 24 insertions, 8 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 28ded89044..c979e5bb9c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,19 @@
+2004-12-17  Not Zed  <NotZed@Ximian.com>
+
+	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): 
+
+	* gui/tasks-component.c (popup_event_cb): 
+
+	* gui/gnome-cal.c (gnome_calendar_view_popup_factory): 
+
+	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu): 
+
+	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): 
+
+	* gui/dialogs/meeting-page.c (button_press_event): 
+
+	* gui/calendar-component.c (popup_event_cb): 
+
 2004-12-22  JP Rosevear  <jpr@novell.com>
 
 	Fixes #61077
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 8176c3c145..9e1519d1a6 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -888,7 +888,7 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 			ep = e_popup_new("org.gnome.evolution.alarmNotify.popup");
 			for (i=0;i<sizeof(tray_items)/sizeof(tray_items[0]);i++)
 				menus = g_slist_prepend(menus, &tray_items[i]);
-			e_popup_add_items(ep, menus, tray_popup_free, tray_data);
+			e_popup_add_items(ep, menus, NULL, tray_popup_free, tray_data);
 			menu = e_popup_create_menu_once(ep, NULL, 0);
 			gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5362abbad8..0b01900603 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -426,7 +426,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve
 			menus = g_slist_prepend(menus, &ecc_source_popups[i]);
 	}
 
-	e_popup_add_items((EPopup *)ep, menus, ecc_source_popup_free, component_view);
+	e_popup_add_items((EPopup *)ep, menus, NULL, ecc_source_popup_free, component_view);
 
 	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
 	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index de419ee668..33eb509865 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -826,7 +826,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, MeetingPage *mpage
 	for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++)
 		menus = g_slist_prepend(menus, &context_menu_items[i]);
 
-	e_popup_add_items((EPopup *)ep, menus, context_popup_free, mpage);
+	e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, mpage);
 	menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask);
 	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time);
 
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 64193687fa..e7847fe107 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1213,7 +1213,7 @@ e_calendar_table_show_popup_menu (ETable *table,
 
 	for (i=0;i<sizeof(tasks_popup_items)/sizeof(tasks_popup_items[0]);i++)
 		menus = g_slist_prepend(menus, &tasks_popup_items[i]);
-	e_popup_add_items((EPopup *)ep, menus, ect_popup_free, cal_table);
+	e_popup_add_items((EPopup *)ep, menus, NULL, ect_popup_free, cal_table);
 
 	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index ad2020b9f3..c935cb3f6d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1469,7 +1469,7 @@ e_calendar_view_create_popup_menu (ECalendarView *cal_view)
 			menus = g_slist_prepend(menus, &ecv_child_items[i]);
 	}
 
-	e_popup_add_items((EPopup *)ep, menus, ecv_popup_free, cal_view);
+	e_popup_add_items((EPopup *)ep, menus, NULL, ecv_popup_free, cal_view);
 
 	return e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
 }
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 81fc9061d3..965025a62a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2117,7 +2117,7 @@ gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *
 	}
 
 	if (menus)
-		e_popup_add_items(ep, menus, gc_popup_free, gcal);
+		e_popup_add_items(ep, menus, NULL, gc_popup_free, gcal);
 
 	menus = NULL;
 	for (i = found?3:0; i<sizeof(gc_popups)/sizeof(gc_popups[0]);i++) {
@@ -2127,7 +2127,7 @@ gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *
 		menus = g_slist_prepend(menus, pitem);
 	}
 
-	e_popup_add_items(ep, menus, gc_popup_free_static, gcal);
+	e_popup_add_items(ep, menus, NULL, gc_popup_free_static, gcal);
 }
 
 static void
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index feaf6b16ce..7abf67bc87 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -360,7 +360,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve
 	for (i=0;i<sizeof(etc_source_popups)/sizeof(etc_source_popups[0]);i++)
 		menus = g_slist_prepend(menus, &etc_source_popups[i]);
 
-	e_popup_add_items((EPopup *)ep, menus, etc_source_popup_free, component_view);
+	e_popup_add_items((EPopup *)ep, menus, NULL,etc_source_popup_free, component_view);
 
 	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
 	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());