diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/e-cal-view.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-cal-view.h | 2 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.h | 2 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 3 |
6 files changed, 12 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b8d2c02053..73ab017f4b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,7 @@ +2003-10-23 Rodrigo Moya <rodrigo@ximian.com> + + * gui/e-day-view.c: accept also text/calendar for D&D. + 2003-10-23 JP Rosevear <jpr@ximian.com> * gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received): diff --git a/calendar/gui/e-cal-view.c b/calendar/gui/e-cal-view.c index 184e5d6689..a77ad4bb42 100644 --- a/calendar/gui/e-cal-view.c +++ b/calendar/gui/e-cal-view.c @@ -278,7 +278,7 @@ selection_clear_event (GtkWidget *invisible, void e_cal_view_add_event (ECalView *cal_view, CalClient *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) + icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) { CalComponent *comp; struct icaltimetype itime, old_dtstart, old_dtend; @@ -396,7 +396,7 @@ selection_received (GtkWidget *invisible, child_kind = icalcomponent_isa (subcomp); if (child_kind == ICAL_VEVENT_COMPONENT) e_cal_view_add_event (cal_view, client, selected_time_start, - default_zone, subcomp, FALSE); + default_zone, subcomp, FALSE); else if (child_kind == ICAL_VTIMEZONE_COMPONENT) { icaltimezone *zone; diff --git a/calendar/gui/e-cal-view.h b/calendar/gui/e-cal-view.h index 04d6d079bb..0212e28006 100644 --- a/calendar/gui/e-cal-view.h +++ b/calendar/gui/e-cal-view.h @@ -117,7 +117,7 @@ void e_cal_view_delete_selected_occurrence (ECalView *cal_view); GtkMenu *e_cal_view_create_popup_menu (ECalView *cal_view); void e_cal_view_add_event (ECalView *cal_view, CalClient *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas); + icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas); void e_cal_view_new_appointment_for (ECalView *cal_view, time_t dtstart, time_t dtend, diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 184e5d6689..a77ad4bb42 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -278,7 +278,7 @@ selection_clear_event (GtkWidget *invisible, void e_cal_view_add_event (ECalView *cal_view, CalClient *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) + icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) { CalComponent *comp; struct icaltimetype itime, old_dtstart, old_dtend; @@ -396,7 +396,7 @@ selection_received (GtkWidget *invisible, child_kind = icalcomponent_isa (subcomp); if (child_kind == ICAL_VEVENT_COMPONENT) e_cal_view_add_event (cal_view, client, selected_time_start, - default_zone, subcomp, FALSE); + default_zone, subcomp, FALSE); else if (child_kind == ICAL_VTIMEZONE_COMPONENT) { icaltimezone *zone; diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 04d6d079bb..0212e28006 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -117,7 +117,7 @@ void e_cal_view_delete_selected_occurrence (ECalView *cal_view); GtkMenu *e_cal_view_create_popup_menu (ECalView *cal_view); void e_cal_view_add_event (ECalView *cal_view, CalClient *client, time_t dtstart, - icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas); + icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas); void e_cal_view_new_appointment_for (ECalView *cal_view, time_t dtstart, time_t dtend, diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index d2dc6c6b57..a25b945c43 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -120,7 +120,8 @@ enum { }; static GtkTargetEntry target_table[] = { { "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT }, - { "text/x-calendar", 0, TARGET_VCALENDAR } + { "text/x-calendar", 0, TARGET_VCALENDAR }, + { "text/calendar", 0, TARGET_VCALENDAR } }; static guint n_targets = sizeof(target_table) / sizeof(target_table[0]); |