"-//Claws Mail//NONSGML Claws Mail Calendar//EN"),
icalproperty_new_calscale("GREGORIAN"),
icalproperty_new_method(is_reply ? ICAL_METHOD_REPLY:event->method),
- 0
+ (void*)0
);
if (!calendar) {
ievent =
icalcomponent_vanew(
- ICAL_VEVENT_COMPONENT, 0);
+ ICAL_VEVENT_COMPONENT, (void*)0);
if (!ievent) {
g_warning ("can't generate event");
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_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);
ICAL_ROLE_REQPARTICIPANT),
icalparameter_new_rsvp(ICAL_RSVP_TRUE),
icalparameter_new_partstat(status),
- 0
+ (void*)0
);
icalcomponent_add_property(ievent, attprop);
} else {
icalparameter_new_rsvp(ICAL_RSVP_TRUE),
icalparameter_new_cutype(a->cutype),
icalparameter_new_partstat(a->answer),
- 0
+ (void*)0
);
icalcomponent_add_property(ievent, attprop);
static void get_rfc822_date_from_time_t(gchar *buf, gint len, time_t t)
{
+#ifndef G_OS_WIN32
struct tm *lt;
gchar day[4], mon[4];
gint dd, hh, mm, ss, yyyy;
gchar buft1[512];
struct tm buft2;
-#ifndef G_OS_WIN32
lt = localtime_r(&t, &buft2);
-#else
- if (t < 0)
- t = 1;
- lt = localtime(&t);
-#endif
-
sscanf(asctime_r(lt, buft1), "%3s %3s %d %d:%d:%d %d\n",
day, mon, &dd, &hh, &mm, &ss, &yyyy);
g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
+#else
+ GDateTime *dt = g_date_time_new_from_unix_local(t);
+ gchar *buf2 = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+ g_date_time_unref(dt);
+ strncpy(buf, buf2, len);
+ g_free(buf2);
+#endif
}
static gchar *write_headers_date(const gchar *uid)
gchar date[128];
time_t t;
struct tm lt;
- struct tm buft;
memset(subject, 0, sizeof(subject));
memset(date, 0, sizeof(date));
t = time(NULL) + (86400*7);
t_subject = _("Later");
} else {
- g_warning("unknown spec date\n");
+ g_warning("unknown spec date");
return NULL;
}
#ifndef G_OS_WIN32
+ struct tm buft;
lt = *localtime_r(&t, &buft);
#else
if (t < 0)
"-//Claws Mail//NONSGML Claws Mail Calendar//EN"),
icalproperty_new_calscale("GREGORIAN"),
icalproperty_new_method(ICAL_METHOD_PUBLISH),
- 0
+ (void*)0
);
if (!calendar) {
/* encode to quoted-printable */
while (lines[i]) {
- gchar buf[256];
gint e_len = strlen(qpbody), n_len = 0;
gchar *outline = conv_codeset_strdup(lines[i], CS_UTF_8, conv_get_outgoing_charset_str());
+ gchar *qpoutline = g_malloc(strlen(outline)*8 + 1);
- qp_encode_line(buf, (guchar *)outline);
- n_len = strlen(buf);
+ qp_encode_line(qpoutline, (guchar *)outline);
+ n_len = strlen(qpoutline);
qpbody = g_realloc(qpbody, e_len + n_len + 1);
- strcpy(qpbody+e_len, buf);
+ strcpy(qpbody+e_len, qpoutline);
*(qpbody+n_len+e_len) = '\0';
g_free(outline);
+ g_free(qpoutline);
i++;
}
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");
+ 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");
+ 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("type", tmp));
g_free(tmp);
- tmp = g_strdup_printf("%lu", event->postponed);
+ tmp = g_strdup_printf("%lld", (long long)event->postponed);
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);
xml_free_tree(rootnode);
if (prefs_file_close(pfile) < 0) {
- g_warning("failed to write event.\n");
+ g_warning("failed to write event.");
return;
}
VCalEvent *event = NULL;
enum icalproperty_method method = ICAL_METHOD_REQUEST;
enum icalcomponent_kind type = ICAL_VEVENT_COMPONENT;
- gint sequence = 0, rec_occurence = 0;
+ gint sequence = 0, rec_occurrence = 0;
time_t postponed = (time_t)0;
g_return_val_if_fail(node->data != NULL, NULL);
xmlnode = node->data;
if (strcmp2(xmlnode->tag->tag, "event") != 0) {
- g_warning("tag name != \"event\"\n");
+ g_warning("tag name != \"event\"");
return 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);
xmlnode = node->data;
if (strcmp2(xmlnode->tag->tag, "answer") != 0) {
- g_warning("tag name != \"answer\"\n");
+ g_warning("tag name != \"answer\"");
return event;
}
list = xmlnode->tag->attr;
g_free(path);
if (!node) {
- g_warning("no node\n");
+ g_warning("no node");
return NULL;
}
enum 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;
folderitem = account_get_special_folder(account, F_QUEUE);
if (!folderitem) {
- g_warning("can't find queue folder for %s\n", account->address);
+ g_warning("can't find queue folder for %s", account->address);
g_unlink(tmpfile);
g_free(tmpfile);
return FALSE;
folder_item_scan(folderitem);
if ((msgnum = folder_item_add_msg(folderitem, tmpfile, NULL, TRUE)) < 0) {
- g_warning("can't queue the message\n");
+ g_warning("can't queue the message");
g_unlink(tmpfile);
g_free(tmpfile);
return FALSE;
struct tm evtstart, today;
time_t evtstart_t, today_t;
struct icaltimetype itt;
- struct tm buft;
tzset();
}
#ifndef G_OS_WIN32
+ struct tm buft;
today = *localtime_r(&today_t, &buft);
localtime_r(&evtstart_t, &evtstart);
#else
projects / claws.git / blobdiff