diff options
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/calendar-commands.c | 10 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 115 |
3 files changed, 118 insertions, 19 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 18724d3659..551a977439 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2001-09-12 JP Rosevear <jpr@ximian.com> + + * gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of + free busy info starting with the UTC start of day + + * gui/itip-utils.c (get_label): create a text representation of + the given icaltime + (itip_send_comp): if the summary is empty, set the subject based + on the type of component, put the right extension on free/busy + components and base descriptions on type of component, include + start/end for free/busy info + 2001-09-11 Federico Mena Quintero <federico@ximian.com> * gui/alarm-notify/alarm-queue.c (display_notification): Added an diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 24e21d76f3..efb4b7860c 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -334,10 +334,14 @@ publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) CalClient *client; CalClientGetStatus status; CalComponent *comp; - time_t start, end; - + icaltimezone *utc; + time_t start = time (NULL), end; + gcal = GNOME_CALENDAR (data); - gnome_calendar_get_current_time_range (gcal, &start, &end); + + utc = icaltimezone_get_utc_timezone (); + start = time_day_begin_with_zone (start, utc); + end = time_add_week_with_zone (start, 6, utc); client = gnome_calendar_get_cal_client (gcal); status = cal_client_get_free_busy (client, start, end, &comp); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 6d7936b813..459f6e1a9e 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -39,7 +39,10 @@ #include <e-util/e-unicode-i18n.h> #include <ical.h> #include <Evolution-Composer.h> -#include "cal-util/cal-util.h" +#include <e-util/e-time-utils.h> +#include <cal-util/timeutil.h> +#include <cal-util/cal-util.h> +#include "calendar-config.h" #include "itip-utils.h" #define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer" @@ -168,6 +171,30 @@ itip_strip_mailto (const gchar *address) return address; } +static char * +get_label (struct icaltimetype *tt) +{ + char buffer[1000]; + struct tm tmp_tm = { 0 }; + + tmp_tm.tm_year = tt->year - 1900; + tmp_tm.tm_mon = tt->month - 1; + tmp_tm.tm_mday = tt->day; + tmp_tm.tm_hour = tt->hour; + tmp_tm.tm_min = tt->minute; + tmp_tm.tm_sec = tt->second; + tmp_tm.tm_isdst = -1; + + tmp_tm.tm_wday = time_day_of_week (tt->day, tt->month - 1, tt->year); + + e_time_format_date_and_time (&tmp_tm, + calendar_config_get_24_hour_format (), + FALSE, FALSE, + buffer, 1000); + + return g_strdup (buffer); +} + static void foreach_tzid_callback (icalparameter *param, gpointer data) { @@ -204,23 +231,27 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp) GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; GNOME_Evolution_Composer_Recipient *recipient; CORBA_char *subject; - gint cntr; - gint len; + gint cntr, len; + CalComponentVType type; CalComponentText caltext; CalComponentOrganizer organizer; CORBA_char *content_type, *filename, *description; GNOME_Evolution_Composer_AttachmentData *attach_data; CORBA_boolean show_inline; - CORBA_char tempstr[200]; + char tempstr[200]; CORBA_exception_init (&ev); - /* First, I obtain an object reference that represents the Composer. */ + /* Obtain an object reference for the Composer. */ bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0); g_return_if_fail (bonobo_server != NULL); composer_server = BONOBO_OBJREF (bonobo_server); + /* Type for later use */ + type = cal_component_get_vtype (comp); + + /* Create list of recipients */ switch (method) { case CAL_COMPONENT_METHOD_REQUEST: case CAL_COMPONENT_METHOD_CANCEL: @@ -281,12 +312,30 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp) bcc_list = GNOME_Evolution_Composer_RecipientList__alloc (); bcc_list->_maximum = bcc_list->_length = 0; + /* Subject information */ cal_component_get_summary (comp, &caltext); - if (caltext.value != NULL) + if (caltext.value != NULL) { subject = CORBA_string_dup (caltext.value); - else - subject = CORBA_string_dup (""); - + } else { + switch (type) { + case CAL_COMPONENT_EVENT: + subject = CORBA_string_dup ("Event information"); + break; + case CAL_COMPONENT_TODO: + subject = CORBA_string_dup ("Task information"); + break; + case CAL_COMPONENT_JOURNAL: + subject = CORBA_string_dup ("Journal information"); + break; + case CAL_COMPONENT_FREEBUSY: + subject = CORBA_string_dup ("Free/Busy information"); + break; + default: + subject = CORBA_string_dup ("Calendar information"); + } + } + + /* Set recipients, subject */ GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Unable to set composer headers while sending iTip message"); @@ -294,15 +343,51 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp) return; } + /* Content type, suggested file name, description */ sprintf (tempstr, "text/calendar;METHOD=%s", itip_methods[method]); content_type = CORBA_string_dup (tempstr); - filename = CORBA_string_dup ("calendar.ics"); - sprintf (tempstr, U_("Calendar attachment")); - description = CORBA_string_dup (tempstr); + if (type == CAL_COMPONENT_FREEBUSY) + filename = CORBA_string_dup ("freebusy.ifb"); + else + filename = CORBA_string_dup ("calendar.ics"); + switch (type) { + case CAL_COMPONENT_EVENT: + description = CORBA_string_dup ("Event information"); + break; + case CAL_COMPONENT_TODO: + description = CORBA_string_dup ("Task information"); + break; + case CAL_COMPONENT_JOURNAL: + description = CORBA_string_dup ("Journal information"); + break; + case CAL_COMPONENT_FREEBUSY: + { + CalComponentDateTime dt; + char *start = NULL, *end = NULL; + + cal_component_get_dtstart (comp, &dt); + if (dt.value) { + start = get_label (dt.value); + cal_component_get_dtend (comp, &dt); + if (dt.value) + end = get_label (dt.value); + } + if (start != NULL && end != NULL) { + snprintf (tempstr, 200, "Free/Busy information (%s to %s)", start, end); + description = CORBA_string_dup (tempstr); + g_free (start); + g_free (end); + } else { + description = CORBA_string_dup ("Free/Busy information"); + } + } + break; + default: + description = CORBA_string_dup ("iCalendar information"); + } show_inline = FALSE; - /* Need to create an encapsulating iCalendar component, and - stuff our component into it. */ + /* Create a top level component, and add our component */ { icalcomponent *icomp, *clone; icalproperty *prop; @@ -354,8 +439,6 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp) CORBA_exception_free (&ev); - /* Let's free shit up. */ - /* Beware--depending on whether CORBA_free is recursive, which I think is is, we might have memory leaks, in which case the code below is necessary. */ |