diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-10-18 12:08:47 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-10-18 12:08:47 +0800 |
| commit | 48988a8a72a5869621e628a03011879508a8432b (patch) | |
| tree | adbf33e097109cf2a008d6892dd4859dcda196e9 /calendar/gui/e-cal-popup.c | |
| parent | 835302d0021f020cb9776a417b3e5e49a676e4c2 (diff) | |
| download | gsoc2013-evolution-48988a8a72a5869621e628a03011879508a8432b.tar.gz gsoc2013-evolution-48988a8a72a5869621e628a03011879508a8432b.tar.zst gsoc2013-evolution-48988a8a72a5869621e628a03011879508a8432b.zip | |
dont access a NULL client.
2004-10-14 Not Zed <NotZed@Ximian.com>
* gui/e-cal-menu.c (e_cal_menu_target_new_select): dont access a
NULL client.
* gui/gnome-cal.c (gnome_calendar_get_taskpad_menu)
(gnome_calendar_get_calendar_menu): accessors to get the menu
managers.
(gnome_calendar_init): setup menu managers.
2004-10-13 Not Zed <NotZed@Ximian.com>
* gui/calendar-commands.c (calendar_control_activate)
(calendar_control_deactivate): activate and deactivate the
calendar and taskpad menu handlers.
(sensitize_items): helper to sensitise items based on target
masks.
(calendar_control_sensitize_calendar_commands): update the
calendar menu manager target appropriately.
(sensitize_taskpad_commands): same for the taskpad.
* gui/e-cal-menu.[ch]: Targets for main menu management.
* gui/e-cal-popup.c (e_cal_popup_target_new_select): fix cast.
Also include the tasks stuff in the hook metadata.
svn path=/trunk/; revision=27607
Diffstat (limited to 'calendar/gui/e-cal-popup.c')
| -rw-r--r-- | calendar/gui/e-cal-popup.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 9c594416d8..b5b834324d 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -129,6 +129,8 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr ECal *client; gboolean read_only; + /* FIXME: This is duplicated in e-cal-menu */ + t->model = model; g_object_ref(t->model); t->events = events; @@ -136,8 +138,9 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr if (t->events->len == 0) { client = e_cal_model_get_default_client(t->model); } else { - ECalModelComponent *comp_data = (ECalendarViewEvent *)t->events->pdata[0]; + ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[0]; + mask &= ~E_CAL_POPUP_SELECT_ANY; if (t->events->len == 1) mask &= ~E_CAL_POPUP_SELECT_ONE; else @@ -257,6 +260,8 @@ static const EPopupHookTargetMask ecalph_select_masks[] = { { "organizer", E_CAL_POPUP_SELECT_ORGANIZER }, { "not-editing", E_CAL_POPUP_SELECT_NOTEDITING }, { "not-meeting", E_CAL_POPUP_SELECT_NOTMEETING }, + { "assignable", E_CAL_POPUP_SELECT_ASSIGNABLE }, + { "hasurl", E_CAL_POPUP_SELECT_HASURL }, { 0 } }; |