diff options
author | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
commit | 200606f92810d3de322e5ee96f8326e1a656f8bb (patch) | |
tree | da0dc27f5311128dcb6e7eb6400931e45743372e /calendar/gui/itip-utils.c | |
parent | e5472b4cc9a4bb80b89437a16f8b77943ea35555 (diff) | |
download | gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.gz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.zst gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.zip |
Various changes to merge in evolution-data-server reliance.
svn path=/trunk/; revision=23206
Diffstat (limited to 'calendar/gui/itip-utils.c')
-rw-r--r-- | calendar/gui/itip-utils.c | 286 |
1 files changed, 143 insertions, 143 deletions
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index e2640f01f4..2ea27974fd 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -36,8 +36,8 @@ #include <Evolution-Composer.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-time-utils.h> -#include <cal-util/timeutil.h> -#include <cal-util/cal-util.h> +#include <libecal/e-cal-time-util.h> +#include <libecal/e-cal-util.h> #include "calendar-config.h" #include "itip-utils.h" @@ -86,24 +86,24 @@ itip_addresses_get_default (void) } gboolean -itip_organizer_is_user (CalComponent *comp, CalClient *client) +itip_organizer_is_user (ECalComponent *comp, ECal *client) { - CalComponentOrganizer organizer; + ECalComponentOrganizer organizer; const char *strip; gboolean user_org = FALSE; - if (!cal_component_has_organizer (comp)) + if (!e_cal_component_has_organizer (comp)) return FALSE; - cal_component_get_organizer (comp, &organizer); + e_cal_component_get_organizer (comp, &organizer); if (organizer.value != NULL) { strip = itip_strip_mailto (organizer.value); - if (cal_client_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { + if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { char *email; - if (cal_client_get_cal_address (client, &email, NULL) && !g_strcasecmp (email, strip)) { + if (e_cal_get_cal_address (client, &email, NULL) && !g_strcasecmp (email, strip)) { g_free (email); return TRUE; @@ -119,16 +119,16 @@ itip_organizer_is_user (CalComponent *comp, CalClient *client) } gboolean -itip_sentby_is_user (CalComponent *comp) +itip_sentby_is_user (ECalComponent *comp) { - CalComponentOrganizer organizer; + ECalComponentOrganizer organizer; const char *strip; gboolean user_sentby = FALSE; - if (!cal_component_has_organizer (comp)) + if (!e_cal_component_has_organizer (comp)) return FALSE; - cal_component_get_organizer (comp, &organizer); + e_cal_component_get_organizer (comp, &organizer); if (organizer.sentby != NULL) { strip = itip_strip_mailto (organizer.sentby); user_sentby = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; @@ -167,7 +167,7 @@ get_label (struct icaltimetype *tt) typedef struct { GHashTable *tzids; icalcomponent *icomp; - CalClient *client; + ECal *client; icalcomponent *zones; } ItipUtilTZData; @@ -191,7 +191,7 @@ foreach_tzid_callback (icalparameter *param, gpointer data) if (zone == NULL) zone = icaltimezone_get_builtin_timezone_from_tzid (tzid); if (zone == NULL && tz_data->client != NULL) - cal_client_get_timezone (tz_data->client, tzid, &zone, NULL); + e_cal_get_timezone (tz_data->client, tzid, &zone, NULL); if (zone == NULL) return; @@ -205,21 +205,21 @@ foreach_tzid_callback (icalparameter *param, gpointer data) } static icalcomponent * -comp_toplevel_with_zones (CalComponentItipMethod method, CalComponent *comp, CalClient *client, icalcomponent *zones) +comp_toplevel_with_zones (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones) { icalcomponent *top_level, *icomp; icalproperty *prop; icalvalue *value; ItipUtilTZData tz_data; - top_level = cal_util_new_top_level (); + top_level = e_cal_util_new_top_level (); prop = icalproperty_new (ICAL_METHOD_PROPERTY); value = icalvalue_new_method (itip_methods_enum[method]); icalproperty_set_value (prop, value); icalcomponent_add_property (top_level, prop); - icomp = cal_component_get_icalcomponent (comp); + icomp = e_cal_component_get_icalcomponent (comp); icomp = icalcomponent_new_clone (icomp); tz_data.tzids = g_hash_table_new (g_str_hash, g_str_equal); @@ -248,21 +248,21 @@ users_has_attendee (GList *users, const char *address) } static CORBA_char * -comp_from (CalComponentItipMethod method, CalComponent *comp) +comp_from (ECalComponentItipMethod method, ECalComponent *comp) { - CalComponentOrganizer organizer; - CalComponentAttendee *attendee; + ECalComponentOrganizer organizer; + ECalComponentAttendee *attendee; GSList *attendees; CORBA_char *str; switch (method) { - case CAL_COMPONENT_METHOD_PUBLISH: + case E_CAL_COMPONENT_METHOD_PUBLISH: return |