aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util
diff options
context:
space:
mode:
authorDamon Chaplin <damon@ximian.com>2001-08-07 08:46:56 +0800
committerDamon Chaplin <damon@src.gnome.org>2001-08-07 08:46:56 +0800
commit9d8f94804917a0338a08be9f36a8e047ccedd939 (patch)
tree4e29f6218af7cbdc4a84933d9cffddd1b7caa61c /calendar/cal-util
parent5949b39e3437ebbf7e7461c58df50424e0993809 (diff)
downloadgsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar.gz
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar.bz2
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar.lz
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar.xz
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.tar.zst
gsoc2013-evolution-9d8f94804917a0338a08be9f36a8e047ccedd939.zip
added 'different_timezone' fields to EDayViewEvent and EWeekViewEvent, to
2001-08-06 Damon Chaplin <damon@ximian.com> * gui/e-week-view.h: * gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent and EWeekViewEvent, to note that the event is in a different timezone. We now compute this once when we add the event to the array, rather than each time we draw the event. If it is set, we will draw the timezone icon next to the event. * gui/e-day-view-main-item.c: take transparency into account when drawing the blue vertical bars to represent busy time. * gui/tag-calendar.c: take transparency into account when tagging the mini calendar. * gui/e-calendar-table.c (e_calendar_table_init): removed the "None" options for transparency and classification, since these properties have defaults anyway, so we may as well use those to keep it simple. Also use "Free" and "Busy" for transparency, rather than "Transparent" and "Opaque". * gui/calendar-model.c: updated classification & transparency code as above. * gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As" since people have a chance of understanding that. * gui/e-week-view.c: * gui/e-day-view.c: * gui/gnome-cal.c: added functions to get the visible time range. * gui/calendar-commands.c: finished stuff to set the folder bar label to the dates currently displayed. * gui/control-factory.c (control_factory_new_control): connected signal to update the folder title bar label when the dates shown are changed. I had to connect it here since we need the BonoboControl in the callback, and I don't know how to get the control from the widget. * gui/tasks-control.c (tasks_control_activate): clear the folder bar label. We could display something here at some point. * gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since we have an "_Actions" menu. (These also use Alt+key, right?) * gui/dialogs/event-page.glade: * gui/dialogs/event-page.c: added 'Show Time As' field, which is really the TRANSP property but with a better name! Also changed one of the "_Confidential" to "Con_fidential" since we already have "_Contacts" using the same 'C' key. * pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip events that are TRANSPARENT. Also added comment as this code looks inefficient. * cal-util/cal-component.c: removed stuff for comparing timezones. * gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the above function here, and updated it to compare the UTC offsets of the times as well as the TZIDs. svn path=/trunk/; revision=11717
Diffstat (limited to 'calendar/cal-util')
-rw-r--r--calendar/cal-util/cal-component.c41
-rw-r--r--calendar/cal-util/cal-component.h3
2 files changed, 0 insertions, 44 deletions
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index b806f8e3e7..7bacfb5432 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -4934,44 +4934,3 @@ cal_component_event_dates_match (CalComponent *comp1,
return TRUE;
}
-/* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
-static gboolean
-cal_component_compare_tzid (const char *tzid1, const char *tzid2)
-{
- gboolean retval = TRUE;
-
- if (tzid1) {
- if (!tzid2 || strcmp (tzid1, tzid2))
- retval = FALSE;
- } else {
- if (tzid2)
- retval = FALSE;
- }
-
- return retval;
-}
-
-/* Returns TRUE if the component uses the given timezones for both DTSTART
- and DTEND. */
-gboolean
-cal_component_compare_event_timezone (CalComponent *comp, icaltimezone *zone)
-{
- CalComponentDateTime datetime;
- const char *tzid;
- gboolean match;
-
- tzid = icaltimezone_get_tzid (zone);
-
- cal_component_get_dtstart (comp, &datetime);
- match = cal_component_compare_tzid (tzid, datetime.tzid);
- cal_component_free_datetime (&datetime);
- if (!match)
- return FALSE;
-
- /* FIXME: DURATION may be used instead. */
- cal_component_get_dtend (comp, &datetime);
- match = cal_component_compare_tzid (tzid, datetime.tzid);
- cal_component_free_datetime (&datetime);
-
- return match;
-}
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
index f0628cb967..e1f4022b91 100644
--- a/calendar/cal-util/cal-component.h
+++ b/calendar/cal-util/cal-component.h
@@ -335,9 +335,6 @@ void cal_component_set_attendee_list (CalComponent *comp, GSList *attendee_list)
gboolean cal_component_event_dates_match (CalComponent *comp1, CalComponent *comp2);
-/* Returns TRUE if the component uses the given timezones for both DTSTART
- and DTEND. */
-gboolean cal_component_compare_event_timezone (CalComponent *comp, icaltimezone *zone);
/* Functions to free returned values */