rename to view_popup_factory. Make it build an epopup item list directly.

2004-10-06  Not Zed  <NotZed@Ximian.com>

        * gui/gnome-cal.c (gnome_calendar_setup_view_popup): rename to
        view_popup_factory.  Make it build an epopup item list directly.
        Can't re-use the galview cruft :-/
        (gnome_calendar_discard_view_popup): no longer needed.
        (gc_set_view, gc_save_custom_view, gc_define_views_response)
        (gc_define_views): implement the gal-view popup menu items.

        * gui/gnome-cal.h:
        * gui/e-week-view.h:
        * gui/e-day-view.h:
        * gui/e-cal-list-view.h: removed old e-popup-menu header.

        * gui/e-calendar-view.c (setup_popup_icons): removed.
        (e_calendar_view_create_popup_menu): converted to use e-popup.
        (on_paste, on_copy, on_cut, on_delete_occurrence)
        (on_unrecur_appointment, on_delete_appointment, on_publish)
        (on_forward, on_meeting, on_move_to, on_copy_to, on_print_event)
        (on_save_as, on_print, on_edit_appointment, on_goto_today)
        (on_goto_date, on_new_task, on_new_meeting, on_new_event)
        (on_new_appointment): convert to use e-popup stuff.

        * gui/tasks-component.c (popup_event_cb): e-popup api changes.

        * gui/e-cal-popup.c (e_cal_popup_target_new_select): implement the
        selection target.
        (ecalp_target_free): and free it.

        * gui/e-cal-model.h: Make the ECalModel struct non-anonymous so it
        can be forward-declared.

        * gui/calendar-component.c (popup_event_cb): e-popup api changes.

svn path=/trunk/; revision=27489

1 files changed, 5 insertions, 6 deletions

diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 14f7aff23a..b1d63987bd 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -379,10 +379,10 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_calendar_cb, NULL, "stock_folder-copy", E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_calendar_cb, NULL, "stock_delete", E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_calendar_cb, NULL, NULL, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "10.new", N_("New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
+	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_calendar_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -409,8 +409,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve
 
 	e_popup_add_items((EPopup *)ep, menus, ecc_source_popup_free, component_view);
 
-	/* visibility is disabled, we only disable menu items */
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0, t->target.mask);
+	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());
 
 	return TRUE;