#ifdef USE_PTHREAD
#include <pthread.h>
#endif
-#include <ical.h>
+#include <libical/ical.h>
#include "vcalendar.h"
#include "vcal_folder.h"
#include "vcal_manager.h"
#include "folder.h"
#include "quoted-printable.h"
#include "utils.h"
+#include "defs.h"
#ifdef G_OS_WIN32
#define getuid() 0
Answer *answer_new(const gchar *attendee,
const gchar *name,
- enum icalparameter_partstat ans,
- enum icalparameter_cutype cutype)
+ icalparameter_partstat ans,
+ icalparameter_cutype cutype)
{
Answer *answer = g_new0(Answer, 1);
answer->attendee = g_strdup(attendee);
dest->answers = g_slist_reverse(dest->answers);
}
-gchar *vcal_manager_answer_get_text(enum icalparameter_partstat ans)
+gchar *vcal_manager_answer_get_text(icalparameter_partstat ans)
{
static gchar *replies[5]={
N_("accepted"),
case ICAL_PARTSTAT_X:
case ICAL_PARTSTAT_INPROCESS:
case ICAL_PARTSTAT_NONE:
+ case ICAL_PARTSTAT_FAILED:
return _(replies[4]);
break;
}
return NULL;
}
-gchar *vcal_manager_cutype_get_text(enum icalparameter_cutype type)
+gchar *vcal_manager_cutype_get_text(icalparameter_cutype type)
{
static gchar *replies[5]={
N_("individual"),
return new;
}
-enum icalparameter_partstat vcal_manager_get_reply_for_attendee(VCalEvent *event, const gchar *att)
+icalparameter_partstat vcal_manager_get_reply_for_attendee(VCalEvent *event, const gchar *att)
{
Answer *a = answer_new(att, NULL, 0, 0);
GSList *ans = answer_find(event, a);
- enum icalparameter_partstat res = 0;
+ icalparameter_partstat res = 0;
if (ans) {
Answer *b = (Answer *)ans->data;
res = b->answer;
gchar *vcal_manager_get_cutype_text_for_attendee(VCalEvent *event, const gchar *att)
{
- enum icalparameter_cutype status = vcal_manager_get_cutype_for_attendee(event, att);
+ icalparameter_cutype status = vcal_manager_get_cutype_for_attendee(event, att);
gchar *res = NULL;
if (status != 0)
res = g_strdup(vcal_manager_cutype_get_text(status));
return res;
}
-enum icalparameter_partstat vcal_manager_get_cutype_for_attendee(VCalEvent *event, const gchar *att)
+icalparameter_partstat vcal_manager_get_cutype_for_attendee(VCalEvent *event, const gchar *att)
{
Answer *a = answer_new(att, NULL, 0, 0);
GSList *ans = answer_find(event, a);
- enum icalparameter_cutype res = 0;
+ icalparameter_cutype res = 0;
if (ans) {
Answer *b = (Answer *)ans->data;
res = b->cutype;
gchar *vcal_manager_get_reply_text_for_attendee(VCalEvent *event, const gchar *att)
{
- enum icalparameter_partstat status = vcal_manager_get_reply_for_attendee(event, att);
+ icalparameter_partstat status = vcal_manager_get_reply_for_attendee(event, att);
gchar *res = NULL;
if (status != 0)
res = g_strdup(vcal_manager_answer_get_text(status));
icalcomponent *calendar, *ievent, *timezone, *tzc;
icalproperty *attprop;
icalproperty *orgprop;
- enum icalparameter_partstat status = ICAL_PARTSTAT_NEEDSACTION;
+ icalparameter_partstat status = ICAL_PARTSTAT_NEEDSACTION;
gchar *sanitized_uid = g_strdup(event->uid);
subst_for_filename(sanitized_uid);
icalcomponent_add_property(ievent,
icalproperty_new_uid(event->uid));
icalcomponent_add_property(ievent,
- icalproperty_vanew_dtstamp(icaltime_from_timet(time(NULL), TRUE), 0));
+ icalproperty_vanew_dtstamp(icaltime_from_timet(time(NULL), TRUE), (void*)0));
icalcomponent_add_property(ievent,
- icalproperty_vanew_dtstart((icaltime_from_string(event->dtstart)), 0));
+ icalproperty_vanew_dtstart((icaltime_from_string(event->dtstart)), (void*)0));
icalcomponent_add_property(ievent,
- icalproperty_vanew_dtend((icaltime_from_string(event->dtend)), 0));
+ icalproperty_vanew_dtend((icaltime_from_string(event->dtend)), (void*)0));
if (event->recur && *(event->recur)) {
icalcomponent_add_property(ievent,
- icalproperty_vanew_rrule((icalrecurrencetype_from_string(event->recur)), 0));
+ icalproperty_vanew_rrule((icalrecurrencetype_from_string(event->recur)), (void*)0));
}
icalcomponent_add_property(ievent,
icalproperty_new_description(event->description));
icalcomponent_add_property(ievent,
icalproperty_new_sequence(modif && !is_reply ? event->sequence + 1 : event->sequence));
icalcomponent_add_property(ievent,
- icalproperty_new_class("PUBLIC"));
+ icalproperty_new_class(ICAL_CLASS_PUBLIC));
icalcomponent_add_property(ievent,
- icalproperty_new_transp("OPAQUE"));
+ icalproperty_new_transp(ICAL_TRANSP_OPAQUE));
if (event->location && *event->location)
icalcomponent_add_property(ievent,
icalproperty_new_location(event->location));
icalcomponent_add_property(ievent,
icalproperty_new_status(ICAL_STATUS_CONFIRMED));
icalcomponent_add_property(ievent,
- icalproperty_vanew_created(icaltime_from_timet(time(NULL), TRUE), 0));
+ icalproperty_vanew_created(icaltime_from_timet(time(NULL), TRUE), (void*)0));
icalcomponent_add_property(ievent,
- icalproperty_vanew_lastmodified(icaltime_from_timet(time(NULL), TRUE), 0));
+ icalproperty_vanew_lastmodified(icaltime_from_timet(time(NULL), TRUE), (void*)0));
icalcomponent_add_property(ievent,
orgprop);
{
gchar subject[512];
gchar *t_subject;
- gchar date[128];
+ gchar date[RFC822_DATE_BUFFSIZE];
time_t t;
struct tm lt;
const gchar *recur,
const gchar *tzid,
const gchar *url,
- enum icalproperty_method method,
+ icalproperty_method method,
gint sequence,
- enum icalcomponent_kind type)
+ icalcomponent_kind type)
{
VCalEvent *event = g_new0(VCalEvent, 1);
if (dtend && *(dtend)) {
time_t tmp = icaltime_as_timet((icaltime_from_string(dtend)));
-#ifdef G_OS_WIN32
GDateTime *dt = g_date_time_new_from_unix_local(tmp);
- event->end = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+ event->end = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %Z");
g_date_time_unref(dt);
-#else
- gchar buft[512];
- tzset();
- event->end = g_strdup(ctime_r(&tmp, buft));
-#endif
}
if (dtstart && *(dtstart)) {
time_t tmp = icaltime_as_timet((icaltime_from_string(dtstart)));
-#ifdef G_OS_WIN32
GDateTime *dt = g_date_time_new_from_unix_local(tmp);
- event->start = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+ event->start = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %Z");
g_date_time_unref(dt);
-#else
- gchar buft[512];
- tzset();
- event->start = g_strdup(ctime_r(&tmp, buft));
-#endif
}
event->dtstart = g_strdup(dtstart?dtstart:"");
event->dtend = g_strdup(dtend?dtend:"");
event->method = method;
event->sequence = sequence;
event->type = type;
- event->rec_occurence = FALSE;
+ event->rec_occurrence = FALSE;
while (strchr(event->summary, '\n'))
*(strchr(event->summary, '\n')) = ' ';
xml_tag_add_attr(tag, xml_attr_new("postponed", tmp));
g_free(tmp);
- tmp = g_strdup_printf("%d", event->rec_occurence);
- xml_tag_add_attr(tag, xml_attr_new("rec_occurence", tmp));
+ tmp = g_strdup_printf("%d", event->rec_occurrence);
+ xml_tag_add_attr(tag, xml_attr_new("rec_occurrence", tmp));
g_free(tmp);
xmlnode = xml_node_new(tag, NULL);
gchar *dtstart = NULL, *dtend = NULL, *tzid = NULL;
gchar *description = NULL, *url = NULL, *recur = NULL;
VCalEvent *event = NULL;
- enum icalproperty_method method = ICAL_METHOD_REQUEST;
- enum icalcomponent_kind type = ICAL_VEVENT_COMPONENT;
- gint sequence = 0, rec_occurence = 0;
+ icalproperty_method method = ICAL_METHOD_REQUEST;
+ icalcomponent_kind type = ICAL_VEVENT_COMPONENT;
+ gint sequence = 0, rec_occurrence = 0;
time_t postponed = (time_t)0;
g_return_val_if_fail(node->data != NULL, NULL);
sequence = atoi(attr->value);
if (!strcmp(attr->name, "postponed"))
postponed = atoi(attr->value);
- if (!strcmp(attr->name, "rec_occurence"))
- rec_occurence = atoi(attr->value);
+ if (!strcmp(attr->name, "rec_occurrence"))
+ rec_occurrence = atoi(attr->value);
}
event = vcal_manager_new_event(uid, org, orgname, location, summary, description,
sequence, type);
event->postponed = postponed;
- event->rec_occurence = rec_occurence;
+ event->rec_occurrence = rec_occurrence;
g_free(org);
g_free(orgname);
while (node != NULL) {
gchar *attendee = NULL;
gchar *name = NULL;
- enum icalparameter_partstat answer = ICAL_PARTSTAT_NEEDSACTION;
- enum icalparameter_cutype cutype = ICAL_CUTYPE_INDIVIDUAL;
+ icalparameter_partstat answer = ICAL_PARTSTAT_NEEDSACTION;
+ icalparameter_cutype cutype = ICAL_CUTYPE_INDIVIDUAL;
xmlnode = node->data;
if (strcmp2(xmlnode->tag->tag, "answer") != 0) {
void vcal_manager_update_answer (VCalEvent *event,
const gchar *attendee,
const gchar *name,
- enum icalparameter_partstat ans,
- enum icalparameter_cutype cutype)
+ icalparameter_partstat ans,
+ icalparameter_cutype cutype)
{
Answer *answer = NULL;
GSList *existing = NULL;
gboolean is_pseudo_display)
{
gchar *subject = NULL;
- gchar date[128];
+ gchar date[RFC822_DATE_BUFFSIZE];
gchar *save_folder = NULL;
gchar *result = NULL;
gchar *queue_headers = NULL;
gchar *method_str = NULL;
gchar *attendees = NULL;
- enum icalparameter_partstat status;
+ icalparameter_partstat status;
gchar *prefix = NULL;
gchar enc_subject[512], enc_from[512], *from = NULL;
- gchar msgid[128];
+ gchar *msgid;
gchar *calmsgid = NULL;
cm_return_val_if_fail(account != NULL, NULL);
calmsgid = g_strdup("");
}
- if (account && account->set_domain && account->domain) {
- g_snprintf(msgid, sizeof(msgid), "%s", account->domain);
- } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
- g_snprintf(msgid, sizeof(msgid), "%s",
- strchr(account->address, '@') ?
- strchr(account->address, '@')+1 :
- account->address);
- } else {
- g_snprintf(msgid, sizeof(msgid), "%s", "");
- }
-
- generate_msgid(msgid, sizeof(msgid), account->address);
+ msgid = prefs_account_generate_msgid(account);
result = g_strdup_printf("%s"
"From: %s <%s>\n"
g_free(save_folder);
g_free(queue_headers);
g_free(attendees);
+ g_free(msgid);
return result;
gchar *orga)
{
gchar subject[512];
- gchar date[128];
+ gchar date[RFC822_DATE_BUFFSIZE];
gchar *result = NULL;
gchar *method_str = NULL;
gchar *summary = NULL;
projects / claws.git / blobdiff