[evolution-kolab/gnome-2-30] libekolabconv: fixes for C++ style comments (builds again)
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/gnome-2-30] libekolabconv: fixes for C++ style comments (builds again)
- Date: Wed, 16 Nov 2011 19:18:52 +0000 (UTC)
commit 8edae0d3ca7e3911afdb7b7c59a56b0bd6d9c71f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Wed Nov 16 14:53:13 2011 +0100
libekolabconv: fixes for C++ style comments (builds again)
* replaced numerous C++ style comments with ISO C ones
* replaced multiline C++ style comments with #if 0 / #endif
src/libekolabconv/main/Makefile.am | 3 +-
.../main/src/evolution/contact-e-to-i.c | 131 ++--
.../main/src/evolution/contact-i-to-e.c | 145 ++--
.../main/src/evolution/event-e-to-i.c | 15 +-
.../main/src/evolution/event-i-to-e.c | 15 +-
.../main/src/evolution/evolution-util.c | 46 +-
.../main/src/evolution/priv-common-e-to-i.c | 38 +-
.../main/src/evolution/priv-common-i-to-e.c | 54 +-
.../main/src/evolution/priv-evolution-preserve.c | 23 +-
.../main/src/evolution/priv-incidence-e-to-i.c | 147 ++--
.../main/src/evolution/priv-incidence-i-to-e.c | 88 ++-
src/libekolabconv/main/src/evolution/task-e-to-i.c | 14 +-
src/libekolabconv/main/src/evolution/task-i-to-e.c | 4 +-
src/libekolabconv/main/src/kolab-conv.c | 58 +-
src/libekolabconv/main/src/kolab-conv.h | 14 +-
src/libekolabconv/main/src/kolab/contact-i-to-k.c | 56 +-
src/libekolabconv/main/src/kolab/contact-k-to-i.c | 94 ++--
src/libekolabconv/main/src/kolab/event-i-to-k.c | 26 +-
src/libekolabconv/main/src/kolab/event-k-to-i.c | 23 +-
src/libekolabconv/main/src/kolab/kolab-constants.h | 50 +-
src/libekolabconv/main/src/kolab/kolab-util.c | 77 +-
src/libekolabconv/main/src/kolab/kolab-util.h | 28 +-
src/libekolabconv/main/src/kolab/kolab.h | 6 +-
src/libekolabconv/main/src/kolab/note-i-to-k.c | 14 +-
src/libekolabconv/main/src/kolab/note-k-to-i.c | 12 +-
.../main/src/kolab/priv-common-i-to-k.c | 14 +-
.../main/src/kolab/priv-incidence-i-to-k.c | 48 +-
.../main/src/kolab/priv-incidence-k-to-i.c | 63 +-
.../main/src/kolab/priv-kolab-preserve.c | 6 +-
src/libekolabconv/main/src/kolab/priv-kolab.h | 6 +-
src/libekolabconv/main/src/kolab/task-i-to-k.c | 29 +-
src/libekolabconv/main/src/kolab/task-k-to-i.c | 29 +-
src/libekolabconv/main/src/logging.h | 2 +-
src/libekolabconv/main/src/structs/common.c | 44 +-
src/libekolabconv/main/src/structs/common.h | 24 +-
src/libekolabconv/main/src/structs/contact.c | 8 +-
src/libekolabconv/main/src/structs/contact.h | 46 +-
src/libekolabconv/main/src/structs/event.h | 8 +-
src/libekolabconv/main/src/structs/incidence.c | 10 +-
src/libekolabconv/main/src/structs/incidence.h | 68 +-
src/libekolabconv/main/src/structs/note.h | 2 +-
src/libekolabconv/main/src/structs/task.h | 13 +-
src/libekolabconv/main/src/util.c | 63 +-
src/libekolabconv/test/src/email-parser.c | 72 +-
src/libekolabconv/test/src/main.c | 10 +-
.../test/src/test-evolution-contact.c | 2 +-
src/libekolabconv/test/src/test-evolution-event.c | 254 ++++----
src/libekolabconv/test/src/test-evolution-task.c | 346 +++++-----
src/libekolabconv/test/src/test-kolab-contact.c | 147 ++--
src/libekolabconv/test/src/test-kolab-event.c | 793 ++++++++++----------
src/libekolabconv/test/src/test-kolab-note.c | 8 +-
src/libekolabconv/test/src/test-kolab-task.c | 648 ++++++++--------
src/libekolabconv/test/src/test-util.c | 63 +-
src/libekolabconv/test/src/test-util.h | 2 +-
src/libekolabconv/test/src/testbase.c | 12 +-
55 files changed, 2042 insertions(+), 1979 deletions(-)
---
diff --git a/src/libekolabconv/main/Makefile.am b/src/libekolabconv/main/Makefile.am
index 128da94..15a2eb0 100644
--- a/src/libekolabconv/main/Makefile.am
+++ b/src/libekolabconv/main/Makefile.am
@@ -23,7 +23,8 @@ libekolabconv_la_LIBADD = \
AM_CPPFLAGS = \
$(EDS_CFLAGS) $(CAMEL_CFLAGS) \
- $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"libekolabconv\"
+ $(GLIB_CFLAGS) \
+ -DG_LOG_DOMAIN=\"libekolabconv\"
noinst_HEADERS = \
src/kolab-conv.h \
diff --git a/src/libekolabconv/main/src/evolution/contact-e-to-i.c b/src/libekolabconv/main/src/evolution/contact-e-to-i.c
index d8bd9bf..a28a95f 100644
--- a/src/libekolabconv/main/src/evolution/contact-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/contact-e-to-i.c
@@ -95,11 +95,12 @@ is_not_empty(gchar* str)
static void
process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
{
- // Tested:
- // - Not needed, works also without duplicate.
- // - There is not more memory needed with duplicate / everything is freed.
- // - Common->body has 3 different states in carriage returns and newlines without duplicate.
- // - Maybe there is more delay for copying.
+ /* Tested:
+ * - Not needed, works also without duplicate.
+ * - There is not more memory needed with duplicate / everything is freed.
+ * - Common->body has 3 different states in carriage returns and newlines without duplicate.
+ * - Maybe there is more delay for copying.
+ */
EContact* e_contact_dup = e_contact_duplicate ( (EContact*) e_contact );
EContactDate *date;
@@ -115,19 +116,19 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
GHashTable *kstore_hash = kolab_store_read_values (e_contact_dup, i_contact);
log_debug("process birth date");
- //e_contact_get (EContact *contact, EContactField field_id);
- //*****************************************************************SET BIRTHDAY******************************************
+ /* e_contact_get (EContact *contact, EContactField field_id); */
+ /* *****************************************************************SET BIRTHDAY****************************************** */
date = e_contact_get (e_contact_dup, E_CONTACT_BIRTH_DATE);
if (date)
i_contact->birthday = g_date_new_dmy ((GDateDay)date->day, (GDateMonth)date->month, (GDateYear)date->year);
e_contact_date_free(date);
- //*****************************************************************SET ANNIVERSARY***************************************
+ /* *****************************************************************SET ANNIVERSARY*************************************** */
log_debug("process anniversary");
date = e_contact_get (e_contact_dup, E_CONTACT_ANNIVERSARY);
if (date)
i_contact->anniversary = g_date_new_dmy ((GDateDay)date->day, (GDateMonth)date->month, (GDateYear)date->year);
e_contact_date_free(date);
- //*****************************************************************SET ADDRESSES*****************************************
+ /* *****************************************************************SET ADDRESSES***************************************** */
log_debug("process addresses");
address = e_contact_get (e_contact_dup, E_CONTACT_ADDRESS_HOME);
if (address)
@@ -141,7 +142,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
if (address)
add_address (e_contact_dup, address, i_contact, E_CONTACT_ADDRESS_OTHER, kstore_hash);
e_contact_address_free(address);
- //*****************************************************************GEO **************************************************
+ /* *****************************************************************GEO ************************************************** */
log_debug("process GEO");
geo = e_contact_get (e_contact_dup, E_CONTACT_GEO);
if (geo) {
@@ -152,7 +153,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
}
}
e_contact_geo_free(geo);
- //*****************************************************************SET NAME**********************************************
+ /* *****************************************************************SET NAME********************************************** */
log_debug("process names");
name = e_contact_get (e_contact_dup, E_CONTACT_NAME);
if (is_not_empty(name->suffixes))
@@ -180,7 +181,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
i_contact->full_name = g_string_new (full_name);
g_free(full_name);
- //*****************************************************************SET EMAIL**************************************
+ /* *****************************************************************SET EMAIL************************************** */
log_debug("process emails");
buffer = e_contact_get (e_contact_dup, E_CONTACT_EMAIL_1);
if (buffer)
@@ -199,7 +200,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
add_email (e_contact_dup, E_CONTACT_EMAIL_4, i_contact, buffer, kstore_hash);
g_free(buffer);
- //*****************************************************************SET PHONE**************************************
+ /* *****************************************************************SET PHONE************************************** */
log_debug("process phones");
/*
@@ -212,7 +213,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
add_phone_numbers(e_contact_dup, i_contact, kstore_hash);
- //*****************************************************************SET ORGANIZATIONAL FIELDS**********************
+ /* *****************************************************************SET ORGANIZATIONAL FIELDS********************** */
log_debug("process organization fields");
@@ -240,7 +241,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
if (is_not_empty(buffer))
i_contact->assistant = g_string_new (buffer);
g_free(buffer);
- //*****************************************************************SET WEB FIELDS*********************************
+ /* *****************************************************************SET WEB FIELDS********************************* */
log_debug("process web page");
buffer = e_contact_get (e_contact_dup, E_CONTACT_HOMEPAGE_URL);
if (is_not_empty(buffer))
@@ -251,13 +252,13 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
if (is_not_empty(buffer))
i_contact->free_busy_url = g_string_new (buffer);
g_free(buffer);
- //*****************************************************************SET CATEGORY***********************************
+ /* *****************************************************************SET CATEGORY*********************************** */
log_debug("process categories");
buffer = e_contact_get (e_contact_dup, E_CONTACT_CATEGORIES);
if (buffer)
i_contact->common->categories = g_string_new (buffer);
g_free(buffer);
- //*****************************************************************SET MISC FIELDS********************************
+ /* *****************************************************************SET MISC FIELDS******************************** */
log_debug("process misc fields");
@@ -270,7 +271,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
i_contact->office_location = g_string_new (buffer);
g_free(buffer);
- //*****************************************************************SET COMMON FIELDS******************************
+ /* *****************************************************************SET COMMON FIELDS****************************** */
buffer = e_contact_get (e_contact_dup, E_CONTACT_UID);
if (buffer)
i_contact->common->uid = g_string_new (buffer);
@@ -281,7 +282,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
g_free(buffer);
buffer = e_contact_get (e_contact_dup, E_CONTACT_REV);
if (buffer) {
- if (buffer[10] == 'T') // get rid of 'T' in iso time stamp if neccessary
+ if (buffer[10] == 'T') /* get rid of 'T' in iso time stamp if neccessary */
buffer[10] = ' ';
struct tm *t = g_new0(struct tm, 1);
@@ -304,7 +305,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
value = e_vcard_attribute_get_value (attribute);
if (attribute && value) {
- if (value[10] == 'T') // get rid of 'T' in iso time stamp if neccessary
+ if (value[10] == 'T') /* get rid of 'T' in iso time stamp if neccessary */
value[10] = ' ';
struct tm *t2 = g_new0(struct tm, 1);
@@ -320,30 +321,30 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
*i_contact->common->creation_datetime->date_time = *i_contact->common->last_modified_datetime->date_time;
}
-// g_debug("populateIContactFromEContact: icontact->common->uid == '%s'", icontact->common->uid->str);
+ /* g_debug("populateIContactFromEContact: icontact->common->uid == '%s'", icontact->common->uid->str); */
- //*****************************************************************SET PICTURE FIELDS*****************************
+ /* *****************************************************************SET PICTURE FIELDS***************************** */
log_debug("process picture fields");
e_contact_photo = e_contact_get (e_contact_dup, E_CONTACT_PHOTO);
if (e_contact_photo && e_contact_photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
- //Bin_attachment *photo;
- //photo = (Bin_attachment *) malloc ( sizeof(Bin_attachment) );
+ /* Bin_attachment *photo; */
+ /* photo = (Bin_attachment *) malloc ( sizeof(Bin_attachment) ); */
i_contact->photo = g_new0(Kolab_conv_mail_part, 1);
i_contact->photo->length = e_contact_photo->data.inlined.length;
i_contact->photo->data = g_new0(gchar, i_contact->photo->length);
- // handle mime type
+ /* handle mime type */
gchar *d = (gchar*) e_contact_photo->data.inlined.data;
- // JPEG SOI marker (first two bytes): FF D8
+ /* JPEG SOI marker (first two bytes): FF D8 */
if (memcmp (d, "\xFF\xD8", 2) == 0) {
i_contact->photo->name = g_strdup("kolab-picture.jpg");
i_contact->photo->mime_type = g_strdup("image/jpeg");
- // PNG signature (first eight bytes): 89 50 4E 47 0D 0A 1A 0A
+ /* PNG signature (first eight bytes): 89 50 4E 47 0D 0A 1A 0A */
} else if (memcmp (d, "\x89PNG\r\n\x1A\n", 8) == 0) {
i_contact->photo->name = g_strdup("kolab-picture.png");
i_contact->photo->mime_type = g_strdup("image/png");
@@ -358,23 +359,23 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
e_contact_photo_free(e_contact_photo);
- //*************************************SET X-CUSTOM FIELDS (ALL IM fields, BlogFeed URL and self defined fields)***
+ /* *************************************SET X-CUSTOM FIELDS (ALL IM fields, BlogFeed URL and self defined fields)*** */
log_debug("process X-CUSTOMER fields");
add_custom_fields(e_contact_dup, i_contact, kstore_hash);
- //*************************************SET EVOLUTION HIDDEN FIELDS BACK IN ICONTACT (In KolabStore) **************
+ /* *************************************SET EVOLUTION HIDDEN FIELDS BACK IN ICONTACT (In KolabStore) ************** */
kolab_store_handle_attachments(e_contact_dup, i_contact->common);
- //*************************************SET EVOLUTION SPECIFIC FIELDS INTO EVOLUTIONSTORE IN ICONTACT *************
+ /* *************************************SET EVOLUTION SPECIFIC FIELDS INTO EVOLUTIONSTORE IN ICONTACT ************* */
i_evo_store_add_contact(e_contact_dup, i_contact->common);
- //TODO: COMPLETE ALL REMAINING FIELDS
- //KLBC_CNT_KEY
+ /* TODO: COMPLETE ALL REMAINING FIELDS */
+ /* KLBC_CNT_KEY */
g_hash_table_unref(kstore_hash);
} else
@@ -393,7 +394,7 @@ add_address (const EContact *e_contact, EContactAddress *e_address, I_contact* i
Address *addr = new_address ();
addr->type = address_type_e_to_i(e_addr_type);
-// g_debug ("**** e_address_type: %d, addr->type: %d ****", e_addr_type, addr->type);
+ /* g_debug ("**** e_address_type: %d, addr->type: %d ****", e_addr_type, addr->type); */
if (e_address->street)
addr->street = g_string_new (e_address->street);
@@ -435,17 +436,17 @@ add_email (const EContact *e_contact, EContactField e_field,
static void
add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *k_store_hash)
{
- // read phone tags from vcard manually
+ /* read phone tags from vcard manually */
GList *attrs;
GList *attr;
attrs = e_vcard_get_attributes (E_VCARD (e_contact));
- // for all attributes in vcard object
+ /* for all attributes in vcard object */
for (attr = attrs; attr;)
{
EVCardAttribute *a = attr->data;
- // do if it is a phone object
+ /* do if it is a phone object */
if (!strcmp (EVC_TEL, e_vcard_attribute_get_name (a)))
{
GList *params = e_vcard_attribute_get_param (a, EVC_TYPE);
@@ -457,7 +458,7 @@ add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *
type_list = g_list_append(type_list, p);
}
- // phone number
+ /* phone number */
gchar* value = e_vcard_attribute_get_value(a);
if (value != NULL) {
@@ -502,7 +503,7 @@ add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *
g_list_free(type_list);
type_list = NULL;
}
- // next attribute in vcard
+ /* next attribute in vcard */
attr = attr->next;
}
}
@@ -513,44 +514,44 @@ add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *
static void
add_custom_fields (const EContact *e_contact, I_contact* i_contact, GHashTable *k_store_hash)
{
- // read phone tags from vcard manually
+ /* read phone tags from vcard manually */
GList *attrs;
GList *attr;
attrs = e_vcard_get_attributes (E_VCARD (e_contact));
- // for all attributes in vcard object
+ /* for all attributes in vcard object */
for (attr = attrs; attr;) {
EVCardAttribute *a = attr->data;
Custom *custom_field = g_new0(Custom, 1);
- // do if it is a blog object
- if (!strcmp (EVC_X_BLOG_URL, e_vcard_attribute_get_name(a))) { // blogfeed
+ /* do if it is a blog object */
+ if (!strcmp (EVC_X_BLOG_URL, e_vcard_attribute_get_name(a))) { /* blogfeed */
custom_field->name = g_string_new(KLBX_CNT_X_CUSTOM_NAME_BLOGFEED);
custom_field->app = g_string_new("");
}
else {
custom_field->name = g_string_new("All");
- if (!strcmp (EVC_X_AIM, e_vcard_attribute_get_name (a))) // im aim
+ if (!strcmp (EVC_X_AIM, e_vcard_attribute_get_name (a))) /* im aim */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_AIM);
- else if (!strcmp (EVC_X_JABBER, e_vcard_attribute_get_name (a))) // im jabber/xmpp
+ else if (!strcmp (EVC_X_JABBER, e_vcard_attribute_get_name (a))) /* im jabber/xmpp */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_XMPP);
- else if (!strcmp (EVC_X_YAHOO, e_vcard_attribute_get_name (a))) // im yahoo
+ else if (!strcmp (EVC_X_YAHOO, e_vcard_attribute_get_name (a))) /* im yahoo */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_YAHOO);
- else if (!strcmp (EVC_X_GADUGADU, e_vcard_attribute_get_name (a))) // im gadu-gadu
+ else if (!strcmp (EVC_X_GADUGADU, e_vcard_attribute_get_name (a))) /* im gadu-gadu */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_GADUGADU);
- else if (!strcmp (EVC_X_MSN, e_vcard_attribute_get_name (a))) // im msn
+ else if (!strcmp (EVC_X_MSN, e_vcard_attribute_get_name (a))) /* im msn */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_MSN);
- else if (!strcmp (EVC_X_ICQ, e_vcard_attribute_get_name (a))) // im icq
+ else if (!strcmp (EVC_X_ICQ, e_vcard_attribute_get_name (a))) /* im icq */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_ICQ);
- else if (!strcmp (EVC_X_GROUPWISE, e_vcard_attribute_get_name (a))) // im groupwise
+ else if (!strcmp (EVC_X_GROUPWISE, e_vcard_attribute_get_name (a))) /* im groupwise */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_GROUPWISE);
- else if (!strcmp (EVC_X_SKYPE, e_vcard_attribute_get_name (a))) // im skype
+ else if (!strcmp (EVC_X_SKYPE, e_vcard_attribute_get_name (a))) /* im skype */
custom_field->app = g_string_new(KLBX_CNT_X_CUSTOM_APP_SKYPE);
}
- // test if name and app are set, if not, it is no x custom element and could produce errors due to multiple values etc.
+ /* test if name and app are set, if not, it is no x custom element and could produce errors due to multiple values etc. */
if (custom_field->app != NULL && custom_field->name != NULL) {
gchar *val = e_vcard_attribute_get_value(a);
if (val != NULL) {
@@ -588,7 +589,7 @@ add_custom_fields (const EContact *e_contact, I_contact* i_contact, GHashTable *
}
}
- // next attribute in vcard
+ /* next attribute in vcard */
attr = attr->next;
}
g_list_free(attr);
@@ -664,7 +665,7 @@ kolab_store_read_values (const EContact *e_contact, I_contact* i_contact)
if (id == KOLAB_STORE_PTR_CONTACT_NAME)
kolab_store_add_element(i_contact->common, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME, strdup(str->str), FALSE);
else {
- gint *idptr = g_new0(gint, 1); // pointer must be different every time
+ gint *idptr = g_new0(gint, 1); /* pointer must be different every time */
*idptr = id;
GList *xml_str_list = g_hash_table_lookup(hash, idptr);
xml_str_list = g_list_append(xml_str_list, (gpointer) strdup(str->str));
@@ -704,8 +705,8 @@ kolab_store_restore_subnode_xml(I_contact *i_contact, gpointer parent_ptr,
{
log_debug("get vcard attributes for econtact field");
- gchar *e_value = e_contact_get ((EContact*) e_contact, e_field); // params cannot be accessed here
- GList* e_attr_list = e_contact_get_attributes ((EContact*)e_contact, e_field); // params can be accessed here but attribute set is bigger than before => use evalue to reduce attribute set.
+ gchar *e_value = e_contact_get ((EContact*) e_contact, e_field); /* params cannot be accessed here */
+ GList* e_attr_list = e_contact_get_attributes ((EContact*)e_contact, e_field); /* params can be accessed here but attribute set is bigger than before => use evalue to reduce attribute set. */
for (; e_attr_list != NULL; e_attr_list = e_attr_list->next) {
EVCardAttribute *eattr = (EVCardAttribute*) e_attr_list->data;
if (e_vcard_attribute_is_single_valued(eattr)) {
@@ -713,11 +714,11 @@ kolab_store_restore_subnode_xml(I_contact *i_contact, gpointer parent_ptr,
if (strcmp(avalue, e_value) != 0)
continue;
} else {
- //log_warn("could not read kolab store id from multivalued vcard field");
+ /* log_warn("could not read kolab store id from multivalued vcard field"); */
break;
}
- //log_debug("get vcard parameters for attribute %s", ((GString*)e_vcard_attribute_get_values_decoded(eattr)->data)->str);
-// gchar *aname = e_vcard_attribute_get_name(eattr); //no new string is created here
+ /* log_debug("get vcard parameters for attribute %s", ((GString*)e_vcard_attribute_get_values_decoded(eattr)->data)->str); */
+ /* gchar *aname = e_vcard_attribute_get_name(eattr); no new string is created here */
GList *eparams = e_vcard_attribute_get_params (eattr);
for (;eparams != NULL; eparams = eparams->next) {
if (strcmp(e_vcard_attribute_param_get_name (eparams->data), ICONTACT_KOLAB_STORE_ID) == 0) {
@@ -773,7 +774,7 @@ address_type_e_to_i(EContactField e_addr_type)
static Icontact_phone_type
phone_type_e_to_i(GList *vcard_types)
{
- // set default phone type:
+ /* set default phone type: */
const Icontact_phone_type DEFAULT_TYPE = ICONTACT_PHONE_PRIMARY;
if (g_list_length(vcard_types) == 1) {
@@ -801,25 +802,25 @@ phone_type_e_to_i(GList *vcard_types)
return ICONTACT_PHONE_TTYTDD;
else if (strcmp(vcard_types->data, "VOICE") == 0)
return ICONTACT_PHONE_OTHER;
- else if (strcmp(vcard_types->data, "FAX") == 0) // OTHER_FAX
+ else if (strcmp(vcard_types->data, "FAX") == 0) /* OTHER_FAX */
return ICONTACT_PHONE_BUSINESS_FAX;
else
return DEFAULT_TYPE;
} else {
- // combinated types
+ /* combinated types */
if (g_list_find_custom(vcard_types, "WORK", (GCompareFunc)strcmp) != NULL) {
if (g_list_find_custom(vcard_types, "VOICE", (GCompareFunc)strcmp) != NULL) {
- return ICONTACT_PHONE_BUSINESS_1; // TYPE=WORK,VOICE
+ return ICONTACT_PHONE_BUSINESS_1; /* TYPE=WORK,VOICE */
} else if (g_list_find_custom(vcard_types, "FAX", (GCompareFunc)strcmp) != NULL) {
- return ICONTACT_PHONE_BUSINESS_FAX; // TYPE=WORK,FAX
+ return ICONTACT_PHONE_BUSINESS_FAX; /* TYPE=WORK,FAX */
} else {
return DEFAULT_TYPE;
}
} else if (g_list_find_custom(vcard_types, "HOME", (GCompareFunc)strcmp) != NULL) {
if (g_list_find_custom(vcard_types, "VOICE", (GCompareFunc)strcmp) != NULL) {
- return ICONTACT_PHONE_HOME_1; // TYPE=HOME,VOICE
+ return ICONTACT_PHONE_HOME_1; /* TYPE=HOME,VOICE */
} else if (g_list_find_custom(vcard_types, "FAX", (GCompareFunc)strcmp) != NULL) {
- return ICONTACT_PHONE_HOME_FAX; // TYPE=HOME,FAX
+ return ICONTACT_PHONE_HOME_FAX; /* TYPE=HOME,FAX */
} else {
return DEFAULT_TYPE;
}
diff --git a/src/libekolabconv/main/src/evolution/contact-i-to-e.c b/src/libekolabconv/main/src/evolution/contact-i-to-e.c
index 493703b..9884a9f 100644
--- a/src/libekolabconv/main/src/evolution/contact-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/contact-i-to-e.c
@@ -85,8 +85,8 @@ static void
process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
{
I_contact *icontact = *i_contact;
- //This method assumes contact object is initialized
- //printContact( *i_contact );
+ /* This method assumes contact object is initialized */
+ /* printContact( *i_contact ); */
/**
* holds pointers of kolab_store (I_contact) elements which hold kolab
@@ -96,7 +96,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
*/
GList *k_store_sublist = NULL;
- //*****************************************************************SET NAME*******************************************
+ /* *****************************************************************SET NAME******************************************* */
EContactName *name = g_new0(EContactName, 1);
if (icontact->given_name != NULL)
name->given = icontact->given_name->str;
@@ -118,17 +118,18 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
if (icontact->spouse_name != NULL)
e_contact_set (e_contact, E_CONTACT_SPOUSE, icontact->spouse_name->str);
- // following command is not possible because the id cannot be read later
- // from the multivalue field "N":
- // kolab_store_add_id_to_field(e_contact, E_CONTACT_NAME, icontact, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME, &k_store_sublist);
+ /* following command is not possible because the id cannot be read later
+ * from the multivalue field "N":
+ */
+ /* kolab_store_add_id_to_field(e_contact, E_CONTACT_NAME, icontact, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME, &k_store_sublist); */
- //*****************************************************************SET WEB FIELDS*************************************
+ /* *****************************************************************SET WEB FIELDS************************************* */
if (icontact->web_page != NULL)
e_contact_set (e_contact, E_CONTACT_HOMEPAGE_URL, icontact->web_page->str);
if (icontact->free_busy_url != NULL)
e_contact_set (e_contact, E_CONTACT_FREEBUSY_URL, icontact->free_busy_url->str);
- //*****************************************************************SET ORGANIZATIONAL FIELDS**************************
+ /* *****************************************************************SET ORGANIZATIONAL FIELDS************************** */
if (icontact->organization != NULL)
e_contact_set (e_contact, E_CONTACT_ORG, icontact->organization->str);
if (icontact->department != NULL)
@@ -144,11 +145,11 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
if (icontact->office_location != NULL)
e_contact_set (e_contact, E_CONTACT_OFFICE, icontact->office_location->str);
- //*****************************************************************SET BIRTHDAY***************************************
+ /* *****************************************************************SET BIRTHDAY*************************************** */
EContactDate date;
GList* list = NULL;
Custom * custom_field = NULL;
- //char paramName[20], intStr[5]; //for adding hidden field for kolab_store
+ /* char paramName[20], intStr[5]; for adding hidden field for kolab_store */
if (icontact->birthday != NULL) {
date.day = icontact->birthday->day;
@@ -158,7 +159,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
e_contact_set (e_contact, E_CONTACT_BIRTH_DATE, &date);
}
- //*****************************************************************SET ANNIVERSARY************************************
+ /* *****************************************************************SET ANNIVERSARY************************************ */
if (icontact->anniversary != NULL) {
date.day = icontact->anniversary->day;
date.month = icontact->anniversary->month;
@@ -167,9 +168,9 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
e_contact_set (e_contact, E_CONTACT_ANNIVERSARY, &date);
}
- //*****************************************************************SET PICTURE FIELDS*********************************
+ /* *****************************************************************SET PICTURE FIELDS********************************* */
if (icontact->photo) {
- //log_debug("\nPicture is set in eContact\n");
+ /* log_debug("\nPicture is set in eContact\n"); */
EContactPhoto e_contact_photo;
e_contact_photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
@@ -189,7 +190,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
g_free(e_contact_photo.data.uri);
}
- //*****************************************************************SET PHONE******************************************
+ /* *****************************************************************SET PHONE****************************************** */
for (list = g_list_first (icontact->phone_numbers); list != NULL; list = list->next) {
Phone_number *phone = (Phone_number *)list->data;
GList *vcard_types = phone_type_i_to_v(phone->type);
@@ -200,18 +201,18 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
while (vcard_types != NULL)
{
- e_vcard_attribute_param_add_value(ph_param, vcard_types->data); // set type
+ e_vcard_attribute_param_add_value(ph_param, vcard_types->data); /* set type */
vcard_types = vcard_types->next;
}
- e_vcard_attribute_add_value (ph_number, phone->number); // set number
- kolab_store_add_id(icontact, (gpointer)phone, &k_store_sublist, ph_number); // set kolab store attributes
+ e_vcard_attribute_add_value (ph_number, phone->number); /* set number */
+ kolab_store_add_id(icontact, (gpointer)phone, &k_store_sublist, ph_number); /* set kolab store attributes */
e_vcard_add_attribute(&e_contact->parent, ph_number);
g_list_free(vcard_types);
}
- //*****************************************************************SET EMAIL******************************************
+ /* *****************************************************************SET EMAIL****************************************** */
list = NULL;
list = g_list_first (icontact->emails);
gint i = 0;
@@ -236,19 +237,20 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
kolab_store_add_id_to_field(e_contact, email_slot, icontact, (gpointer) email, &k_store_sublist);
}
- // TODO: handle display-name properly (kolab-store?)
- // if (((Email*) list->data)->display_name)
- // addHiddenParamToExistingFieldInEcontact (eContact,
- // email_slot, "display-name",
- // ((Email*) list->data)->display_name->str);
-
-// log_debug("\nEmail %d \n\tdisplay_name: %s, smtp_address: %s", (i), ((Email*)list->data)->display_name->str, ((Email*)list->data)->smtp_address->str);
+ /* TODO: handle display-name properly (kolab-store?) */
+#if 0
+ if (((Email*) list->data)->display_name)
+ addHiddenParamToExistingFieldInEcontact (eContact,
+ email_slot, "display-name",
+ ((Email*) list->data)->display_name->str);
+#endif
+ /* log_debug("\nEmail %d \n\tdisplay_name: %s, smtp_address: %s", (i), ((Email*)list->data)->display_name->str, ((Email*)list->data)->smtp_address->str); */
i++;
list = list->next;
}
- //*****************************************************************SET ADDRESSES**************************************
+ /* *****************************************************************SET ADDRESSES************************************** */
list = g_list_first (icontact->addresses);
i = 0;
@@ -277,7 +279,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
if (i_address->type) {
EContactField ecf = address_type_i_to_e(i_address->type);
e_contact_set (e_contact, ecf, e_address);
- // put address-fields unknown by evolution into kolab-store
+ /* put address-fields unknown by evolution into kolab-store */
kolab_store_add_id_to_field(e_contact, ecf, icontact, (gpointer) i_address, &k_store_sublist);
}
@@ -288,10 +290,10 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
/* print_addresses_from_econtact (eContact, "populateEContactFromIContact"); */
- //*****************************************************************GEO************************************************
+ /* *****************************************************************GEO************************************************ */
if (icontact->latitude >= -90.0 && icontact->latitude <= 90.0
&& icontact->longitude >= -180.0 && icontact->longitude <= 180.0) {
- // if both degrees are set and their values are valid coordinate values, then set geo
+ /* if both degrees are set and their values are valid coordinate values, then set geo */
EContactGeo geo;
geo.latitude = icontact->latitude;
geo.longitude = icontact->longitude;
@@ -299,7 +301,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
}
- //*****************************************************************SET COMMON FIELDS************************************
+ /* *****************************************************************SET COMMON FIELDS************************************ */
if (icontact->common != NULL)
{
if (icontact->common->uid != NULL)
@@ -319,10 +321,10 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
gchar *buf = g_new0(gchar, 21);
strftime (buf, 21, "%Y-%m-%dT%H:%M:%SZ", ts);
- //Create a new vcard attribute
+ /* Create a new vcard attribute */
EVCardAttribute *createdAttribute = e_vcard_attribute_new (NULL, ICONTACT_KOLAB_CREATED);
- //Add the vcard attribute to eContact
+ /* Add the vcard attribute to eContact */
e_vcard_add_attribute_with_value ((EVCard *) e_contact, createdAttribute, buf);
g_debug ("**** populateEContactFromIContact() X-KOLAB-CREATED: %s", buf);
@@ -341,13 +343,13 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
}
}
- //*****************************************************************SET BINARY BASE 64 ENCODED FIELDS******************
- //We add one binary base 64 encoded field for each element of extraAttachments GList in icontact
+ /* *****************************************************************SET BINARY BASE 64 ENCODED FIELDS****************** */
+ /* We add one binary base 64 encoded field for each element of extraAttachments GList in icontact */
list = g_list_first (icontact->common->kolab_attachment_store);
while (list != NULL) {
- //log_debug("\nBinary Attachment No. %d is attached. \n", ++i);
+ /* log_debug("\nBinary Attachment No. %d is attached. \n", ++i); */
Kolab_conv_mail_part *bin_att = ((Kolab_conv_mail_part *) list->data);
add_binary_field_base64 (e_contact, bin_att);
@@ -357,49 +359,49 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
list = list->next;
}
- //*************************************SET X-CUSTOM FIELDS (ALL IM fields and BlogFeed URL)***************************
+ /* **************************************SET X-CUSTOM FIELDS (ALL IM fields and BlogFeed URL)*************************** */
list = NULL;
list = g_list_first (icontact->custom_list);
- i = 0; // count for written messenger fields
- gint max_evolution_im = 4; // maximum instant messenger fields that can be handled by evolution, rest in kolab store
+ i = 0; /* count for written messenger fields */
+ gint max_evolution_im = 4; /* maximum instant messenger fields that can be handled by evolution, rest in kolab store */
while (list != NULL) {
custom_field = (Custom *) list->data;
- if (strcmp (custom_field->name->str, KLBX_CNT_X_CUSTOM_NAME_BLOGFEED) == 0) { // x-custom blogfeed
+ if (strcmp (custom_field->name->str, KLBX_CNT_X_CUSTOM_NAME_BLOGFEED) == 0) { /* x-custom blogfeed */
e_contact_set (e_contact, E_CONTACT_BLOG_URL, custom_field->value->str);
}
- else if (strcmp (custom_field->name->str, KLBX_CNT_X_CUSTOM_NAME_ALL) == 0 // x-custom im
+ else if (strcmp (custom_field->name->str, KLBX_CNT_X_CUSTOM_NAME_ALL) == 0 /* x-custom im */
&& i < max_evolution_im) {
- EVCardAttribute *im_field = NULL; // attribute to write
+ EVCardAttribute *im_field = NULL; /* attribute to write */
- // save just elements that are available in evolution, put other in kolab store
- if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_AIM) == 0) { // aim
+ /* save just elements that are available in evolution, put other in kolab store */
+ if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_AIM) == 0) { /* aim */
im_field = e_vcard_attribute_new(NULL, EVC_X_AIM);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_XMPP) == 0) { // jabber
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_XMPP) == 0) { /* jabber */
im_field = e_vcard_attribute_new(NULL, EVC_X_JABBER);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_YAHOO) == 0) { // yahoo
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_YAHOO) == 0) { /* yahoo */
im_field = e_vcard_attribute_new(NULL, EVC_X_YAHOO);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_GADUGADU) == 0) { // gadu-gadu
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_GADUGADU) == 0) {/* gadu-gadu */
im_field = e_vcard_attribute_new(NULL, EVC_X_GADUGADU);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_MSN) == 0) { // msn
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_MSN) == 0) { /* msn */
im_field = e_vcard_attribute_new(NULL, EVC_X_MSN);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_ICQ) == 0) { // icq
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_ICQ) == 0) { /* icq */
im_field = e_vcard_attribute_new(NULL, EVC_X_ICQ);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_GROUPWISE) == 0) { // groupwise
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_GROUPWISE) == 0) {/* groupwise */
im_field = e_vcard_attribute_new(NULL, EVC_X_GROUPWISE);
}
- else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_SKYPE) == 0) { // skype
+ else if (strcmp (custom_field->app->str, KLBX_CNT_X_CUSTOM_APP_SKYPE) == 0) { /* skype */
im_field = e_vcard_attribute_new(NULL, EVC_X_SKYPE);
}
else {
- // type not found
+ /* type not found */
xmlNodePtr store_node = NULL;
store_node = xmlNewNode(NULL, BAD_CAST KLBX_CNT_X_CUSTOM_LIST);
add_property (store_node, "value", custom_field->value->str);
@@ -409,12 +411,13 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
xmlFree(store_node);
}
- // If there will be a mappable IRC field in Evolution some time, the value of one field has to be split
- // in Adress and Network by delimiter sign î (\356\204\240).
- // Kontact saves both in value field.
- // Example:<x-custom value="IRC-AddressîIRC-Network" app="messaging/irc" name="All" />
+ /* If there will be a mappable IRC field in Evolution some time, the value of one field has to be split
+ * in Adress and Network by delimiter sign î (\356\204\240).
+ * Kontact saves both in value field.
+ * Example:<x-custom value="IRC-AddressîIRC-Network" app="messaging/irc" name="All" />
+ */
- if (im_field != NULL) { // if attribute not set mappable type found
+ if (im_field != NULL) { /* if attribute not set mappable type found */
EVCardAttributeParam* im_param = e_vcard_attribute_param_new (EVC_TYPE);
e_vcard_attribute_add_param(im_field, im_param);
e_vcard_attribute_param_add_value(im_param, "HOME");
@@ -434,24 +437,24 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
xmlFree(store_node);
}
- //log_debug("\nApp=%s, Value=%s, Name=%s\n", custom_field->app->str, custom_field->value->str, custom_field->name->str);
+ /* log_debug("\nApp=%s, Value=%s, Name=%s\n", custom_field->app->str, custom_field->value->str, custom_field->name->str); */
list = list->next;
}
i_evo_store_get_all_contact(icontact->common, e_contact);
- //*************************************SET KOLAB STORE AS A HIDDEN FIELD IN EVOLUTION*********************************
+ /* *************************************SET KOLAB STORE AS A HIDDEN FIELD IN EVOLUTION********************************* */
list = NULL;
if (icontact->common->kolab_store) {
- //Add a param in kolab_store for each element in the list icontact->kolab_store
+ /* Add a param in kolab_store for each element in the list icontact->kolab_store */
list = kolab_store_get_element_list(icontact->common, icontact->common);
for (list = g_list_last (list); list != NULL; list = list->prev)
add_hidden_field_base64 (e_contact,
ICONTACT_KOLAB_STORE,
((gchar *) list->data), -1);
- // add kolab store elements with a constant id (name)
+ /* add kolab store elements with a constant id (name) */
list = kolab_store_get_element_list(icontact->common, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME);
for (list = g_list_last (list); list != NULL; list = list->prev)
@@ -459,7 +462,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
ICONTACT_KOLAB_STORE,
((gchar *) list->data), KOLAB_STORE_PTR_CONTACT_NAME);
- // add kolab store elements which are referred by id
+ /* add kolab store elements which are referred by id */
i = 0;
for (; k_store_sublist != NULL; k_store_sublist = k_store_sublist->next) {
@@ -487,27 +490,27 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
static void
add_binary_field_base64 (EContact *e_contact, Kolab_conv_mail_part *mpart)
{
- //Create a new vcard attribute
+ /* Create a new vcard attribute */
EVCardAttribute *bin_attr = e_vcard_attribute_new (NULL, ICONTACT_KOLAB_STORE_ATTACHMENT);
- //Add a encoding parameter to vcard attribute to make it base 64 encoded
+ /* Add a encoding parameter to vcard attribute to make it base 64 encoded */
e_vcard_attribute_add_param_with_value (bin_attr, e_vcard_attribute_param_new (
EVC_ENCODING), "BASE64");
- //Add a mime_type parameter to vcard attribute.
+ /* Add a mime_type parameter to vcard attribute. */
if (mpart->mime_type)
e_vcard_attribute_add_param_with_value (bin_attr, e_vcard_attribute_param_new (
ICONTACT_KOLAB_STORE_ATTACHMENT_MTYPE), mpart->mime_type);
- //Add a mime_type parameter to vcard attribute.
+ /* Add a mime_type parameter to vcard attribute. */
if (mpart->name)
e_vcard_attribute_add_param_with_value (bin_attr, e_vcard_attribute_param_new (
ICONTACT_KOLAB_STORE_ATTACHMENT_NAME), mpart->name);
- //Add binary data to the attribute
+ /* Add binary data to the attribute */
e_vcard_attribute_add_value_decoded (bin_attr, mpart->data, (gint)mpart->length);
- //Add the vcard attribute to eContact
+ /* Add the vcard attribute to eContact */
e_vcard_add_attribute ((EVCard *) e_contact, bin_attr);
}
@@ -540,7 +543,7 @@ static gint
kolab_store_get_sub_id(GList **k_store_sublist, gpointer ptr)
{
gint idx = g_list_index(*k_store_sublist, ptr);
- if (idx == -1) { // element is not found
+ if (idx == -1) { /* element is not found */
idx = (gint) g_list_length(*k_store_sublist);
*k_store_sublist = g_list_append(*k_store_sublist, ptr);
}
@@ -590,7 +593,7 @@ phone_type_i_to_v(Icontact_phone_type i_phone_type)
{
GList *vcard_types = NULL;
- if (i_phone_type == ICONTACT_PHONE_PRIMARY) // one param value
+ if (i_phone_type == ICONTACT_PHONE_PRIMARY) /* one param value */
{
vcard_types = g_list_append(vcard_types, (gchar*)"PREF");
}
@@ -638,7 +641,7 @@ phone_type_i_to_v(Icontact_phone_type i_phone_type)
{
vcard_types = g_list_append(vcard_types, (gchar*)"VOICE");
}
- else if (i_phone_type == ICONTACT_PHONE_HOME_1) // two param values
+ else if (i_phone_type == ICONTACT_PHONE_HOME_1) /* two param values */
{
vcard_types = g_list_append(vcard_types, (gchar*)"HOME");
vcard_types = g_list_append(vcard_types, (gchar*)"VOICE");
@@ -658,7 +661,7 @@ phone_type_i_to_v(Icontact_phone_type i_phone_type)
vcard_types = g_list_append(vcard_types, (gchar*)"WORK");
vcard_types = g_list_append(vcard_types, (gchar*)"FAX");
}
- else // default
+ else /* default */
{
vcard_types = g_list_append(vcard_types, (gchar*)"PREF");
}
diff --git a/src/libekolabconv/main/src/evolution/event-e-to-i.c b/src/libekolabconv/main/src/evolution/event-e-to-i.c
index 11c79c3..216f913 100644
--- a/src/libekolabconv/main/src/evolution/event-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/event-e-to-i.c
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-#include "evolution.h" // public interface of this file
+#include "evolution.h" /* public interface of this file */
#include "priv-evolution.h"
#include "../logging.h"
@@ -77,13 +77,13 @@ process_event_e_to_i(const ECalComponentWithTZ *ectz, I_event *i_event, GError *
{
g_assert(error != NULL && *error == NULL);
ECalComponent *e_cal_comp = ectz->maincomp;
- //log_debug("\nconvert_ECalComponent_to_ievent is called...");
+ /* log_debug("\nconvert_ECalComponent_to_ievent is called..."); */
if (e_cal_comp == NULL || e_cal_component_get_vtype(e_cal_comp) != E_CAL_COMPONENT_EVENT)
return;
conv_incidence_e_to_i(ectz, i_event->incidence);
- // show_time_as
+ /* show_time_as */
ECalComponentTransparency *e_transp = g_new0(ECalComponentTransparency, 1);
e_cal_component_get_transparency(e_cal_comp, e_transp);
if (e_transp)
@@ -91,16 +91,17 @@ process_event_e_to_i(const ECalComponentWithTZ *ectz, I_event *i_event, GError *
g_free(e_transp);
- // end_date
+ /* end_date */
ECalComponentDateTime *e_end_date = g_new0(ECalComponentDateTime, 1);
e_cal_component_get_dtend (e_cal_comp, e_end_date);
if (e_end_date && e_end_date->value) {
localtime_to_utc(e_end_date, ectz->timezone);
i_event->end_date = new_date_or_datetime();
if (e_end_date->value->is_date) {
- // need to subtract one day from end date because of the
- // different interpretation by evolution (shows exclusive)
- // and kolab clients (shows inclusive)
+ /* need to subtract one day from end date because of the
+ * different interpretation by evolution (shows exclusive)
+ * and kolab clients (shows inclusive)
+ */
struct icaldurationtype duration = icaldurationtype_null_duration();
duration.days = 1;
duration.is_neg = TRUE;
diff --git a/src/libekolabconv/main/src/evolution/event-i-to-e.c b/src/libekolabconv/main/src/evolution/event-i-to-e.c
index 8c327f9..7afa007 100644
--- a/src/libekolabconv/main/src/evolution/event-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/event-i-to-e.c
@@ -65,17 +65,17 @@ conv_I_event_to_ECalComponentWithTZ (I_event **i_event_ptr, GError **error)
I_event *i_event = *i_event_ptr;
if (i_event) {
- // type
+ /* type */
e_cal_component_set_new_vtype (e_cal_comp, E_CAL_COMPONENT_EVENT);
- // incidence & common
+ /* incidence & common */
conv_incidence_i_to_e(ectz, i_event->incidence);
- // show_time_as
+ /* show_time_as */
if (i_event->show_time_as)
e_cal_component_set_transparency(e_cal_comp, show_time_as_to_transparency(i_event->show_time_as));
- // end_date
+ /* end_date */
if (i_event->end_date && (i_event->end_date->date || i_event->end_date->date_time)) {
ECalComponentDateTime *ed = g_new0(ECalComponentDateTime, 1);
ed->value = g_new0(struct icaltimetype, 1);
@@ -86,9 +86,10 @@ conv_I_event_to_ECalComponentWithTZ (I_event **i_event_ptr, GError **error)
utc_to_localtime(ed, i_event->incidence->common->vtimezone);
if (ed->value->is_date) {
- // need to add one day to the end date because of the
- // different interpretation by evolution (shows exclusive)
- // and kolab clients (shows inclusive)
+ /* need to add one day to the end date because of the
+ * different interpretation by evolution (shows exclusive)
+ * and kolab clients (shows inclusive)
+ */
struct icaldurationtype duration = icaldurationtype_null_duration();
duration.days = 1;
*ed->value = icaltime_add(*ed->value, duration);
diff --git a/src/libekolabconv/main/src/evolution/evolution-util.c b/src/libekolabconv/main/src/evolution/evolution-util.c
index a56cc4f..684b9c3 100644
--- a/src/libekolabconv/main/src/evolution/evolution-util.c
+++ b/src/libekolabconv/main/src/evolution/evolution-util.c
@@ -112,33 +112,34 @@ datetime_i_to_e(time_t *date_time, icaltimetype *t, gboolean is_utc)
void
utc_to_localtime(ECalComponentDateTime *date_time, gchar *vtimezone)
{
- // get icaltimezone for UTC
+ /* get icaltimezone for UTC */
icaltimezone *utc = icaltimezone_get_utc_timezone();
- if (vtimezone == NULL) { // localtime is UTC
- // this step is needed to set the "Z" suffix in
- // ICalendar timestamp, e.g. "20101104T111300Z"
+ if (vtimezone == NULL) { /* localtime is UTC */
+ /* this step is needed to set the "Z" suffix in
+ * ICalendar timestamp, e.g. "20101104T111300Z"
+ */
if (date_time->tzid != NULL)
g_free ((gpointer)(date_time->tzid));
date_time->tzid = g_strdup(icaltimezone_get_tzid(utc));
date_time->value->is_utc = 1;
} else {
- // deserialize vtimezone
+ /* deserialize vtimezone */
ECalComponent *local_tz = e_cal_component_new_from_string(vtimezone);
- // get icaltimezone for localtime
+ /* get icaltimezone for localtime */
icaltimezone *ical_tz = ecalcomponent_tz_get_icaltimezone(local_tz);
- // is this really needed? probably not, but who knows...
-// date_time->tzid = g_strdup(icaltimezone_get_tzid(ical_tz));
+ /* is this really needed? probably not, but who knows... */
+ /* date_time->tzid = g_strdup(icaltimezone_get_tzid(ical_tz)); */
date_time->tzid = icaltimezone_get_tzid(ical_tz);
date_time->value->is_utc = (strcmp(date_time->tzid, icaltimezone_get_tzid(utc)) != 0) ? 0 : 1;
- // ...convert time
+ /* ...convert time */
icaltimezone_convert_time(date_time->value, utc, ical_tz);
- // free unused data structures
- g_object_unref(local_tz); // recursively frees its components
+ /* free unused data structures */
+ g_object_unref(local_tz); /* recursively frees its components */
g_free(ical_tz);
}
}
@@ -154,23 +155,23 @@ utc_to_localtime(ECalComponentDateTime *date_time, gchar *vtimezone)
void
localtime_to_utc(ECalComponentDateTime *date_time, ECalComponent *local_tz)
{
- if (date_time->value->is_utc || local_tz == NULL) // local_tz == UTC
+ if (date_time->value->is_utc || local_tz == NULL) /* local_tz == UTC */
return;
- // get icaltimezone for localtime
+ /* get icaltimezone for localtime */
icaltimezone *ical_tz = ecalcomponent_tz_get_icaltimezone(local_tz);
- // get icaltimezone for UTC
+ /* get icaltimezone for UTC */
icaltimezone *utc = icaltimezone_get_utc_timezone();
- // ...convert time
+ /* ...convert time */
icaltimezone_convert_time(date_time->value, ical_tz, utc);
+#if 0
+ icaltimezone_free(utc, 1);
+ icaltimezone_free_builtin_timezones();
+#endif
-// icaltimezone_free(utc, 1);
-// icaltimezone_free_builtin_timezones();
-
-
- // free unused data structures
+ /* free unused data structures */
g_free(ical_tz);
}
@@ -180,8 +181,9 @@ localtime_to_utc(ECalComponentDateTime *date_time, ECalComponent *local_tz)
icaltimezone*
ecalcomponent_tz_get_icaltimezone(ECalComponent *ecal_tz)
{
- // icalcomponent_get_timezone() does not work as advertised,
- // therefore it's a bit more complicated...
+ /* icalcomponent_get_timezone() does not work as advertised,
+ * therefore it's a bit more complicated...
+ */
icalcomponent *icalcomp = e_cal_component_get_icalcomponent(ecal_tz);
icaltimezone *ical_tz = icaltimezone_new();
icaltimezone_set_component(ical_tz, icalcomp);
diff --git a/src/libekolabconv/main/src/evolution/priv-common-e-to-i.c b/src/libekolabconv/main/src/evolution/priv-common-e-to-i.c
index f6f420e..a743e63 100644
--- a/src/libekolabconv/main/src/evolution/priv-common-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/priv-common-e-to-i.c
@@ -45,7 +45,7 @@ get_vtimezone (const ECalComponentWithTZ *ectz)
icalcomponent *icc = e_cal_component_get_icalcomponent (ectz->timezone);
- // uid and dtstamp are not needed (nor wanted) in timezone block
+ /* uid and dtstamp are not needed (nor wanted) in timezone block */
icalproperty *uid = icalcomponent_get_first_property(icc, ICAL_UID_PROPERTY);
icalcomponent_remove_property (icc, uid);
free(uid);
@@ -116,7 +116,7 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
gchar* mime_type = NULL;
gchar* label = NULL;
- // iterate over all parameters of the attachment property
+ /* iterate over all parameters of the attachment property */
int i, pc = icalproperty_count_parameters(prop);
icalparameter *para;
for (i = 0; i < pc; i++) {
@@ -126,10 +126,10 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
icalparameter_kind kind = icalparameter_isa(para);
icalparameter_value xvalue = icalparameter_get_value(para);
if (kind == ICAL_VALUE_PARAMETER && xvalue == ICAL_VALUE_BINARY)
- binary = TRUE; // not a link attachment
- else if (kind == ICAL_FMTTYPE_PARAMETER) // found mime type
+ binary = TRUE; /* not a link attachment */
+ else if (kind == ICAL_FMTTYPE_PARAMETER) /* found mime type */
mime_type = (gchar*) icalparameter_get_xvalue(para);
- else if (xvalue == ICAL_VALUE_X) { // found attachment name
+ else if (xvalue == ICAL_VALUE_X) { /* found attachment name */
const char* name = icalparameter_get_xname(para);
const char* value = icalparameter_get_xvalue(para);
if (name && strcmp(name, ICONTACT_KOLAB_STORE_ATTACHMENT_NAME) == 0)
@@ -137,7 +137,7 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
}
}
- if (binary) { // if not a linked attachment add data to struct
+ if (binary) { /* if not a linked attachment add data to struct */
Kolab_conv_mail_part *mpart = g_new0(Kolab_conv_mail_part, 1);
if (label != NULL) {
if (inln)
@@ -148,13 +148,13 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
}
if (mime_type != NULL)
mpart->mime_type = strdup(mime_type);
- // add data and length
+ /* add data and length */
gchar* pname = (gchar*) icalproperty_get_value_as_string(prop);
if (pname) {
gsize outlen;
mpart->data = (gchar*) g_base64_decode (pname, &outlen);
mpart->length = outlen;
- // add created mail part to the attachment list
+ /* add created mail part to the attachment list */
i_common->kolab_attachment_store = g_list_append(i_common->kolab_attachment_store, mpart);
}
}
@@ -171,7 +171,7 @@ conv_common_e_to_i (const ECalComponentWithTZ *ectz, I_common *i_common)
sensitivity_e_to_i(ectz->maincomp, i_common);
link_attachments_e_to_i(ectz->maincomp, i_common);
- // handle description/body
+ /* handle description/body */
GSList *descr_list = NULL;
e_cal_component_get_description_list ((ECalComponent*) ectz->maincomp, &descr_list);
@@ -181,31 +181,31 @@ conv_common_e_to_i (const ECalComponentWithTZ *ectz, I_common *i_common)
e_cal_component_free_text_list(descr_list);
}
- //******************************************SET UID************************************
+ /* ******************************************SET UID************************************ */
const gchar *uid;
e_cal_component_get_uid (ectz->maincomp, &uid);
if (uid)
i_common->uid = g_string_new (uid);
- //******************************************SET CATEGORIES************************************
+ /* ******************************************SET CATEGORIES************************************ */
const gchar *categories;
e_cal_component_get_categories (ectz->maincomp, &categories);
if (categories)
i_common->categories = g_string_new (categories);
- //******************************************SET DATES (CREATION, LASTMODIFICATION, START, END etc.)************************************
+ /* ******************************************SET DATES (CREATION, LASTMODIFICATION, START, END etc.)************************************ */
struct icaltimetype *lastModifiedDate;
e_cal_component_get_last_modified (ectz->maincomp, &lastModifiedDate);
i_common->last_modified_datetime = new_date_or_datetime();
if (lastModifiedDate)
- //log_debug("ICalDate %d-%d-%d-%d-%d-%d", lastModifiedDate->year, lastModifiedDate->month, lastModifiedDate->day, lastModifiedDate->hour, lastModifiedDate->minute, lastModifiedDate->second);
+ /* log_debug("ICalDate %d-%d-%d-%d-%d-%d", lastModifiedDate->year, lastModifiedDate->month, lastModifiedDate->day, lastModifiedDate->hour, lastModifiedDate->minute, lastModifiedDate->second); */
date_or_datetime_e_to_i (lastModifiedDate, i_common->last_modified_datetime);
else {
- // Set lastModifiedDate to current system time
+ /* Set lastModifiedDate to current system time */
i_common->last_modified_datetime->date_time = g_new0(time_t, 1);
*(i_common->last_modified_datetime->date_time) = time(NULL);
}
@@ -218,24 +218,24 @@ conv_common_e_to_i (const ECalComponentWithTZ *ectz, I_common *i_common)
if (createdDate)
date_or_datetime_e_to_i (createdDate, i_common->creation_datetime);
else {
- // Set createdDate to current system time
+ /* Set createdDate to current system time */
i_common->creation_datetime->date_time = g_new0(time_t, 1);
*(i_common->creation_datetime->date_time) = time(NULL);
}
g_free(createdDate);
- //******************************************SET ATTACHMENT LIST*******************************************************************************
+ /* ******************************************SET ATTACHMENT LIST******************************************************************************* */
- // iterate over all ical properties
+ /* iterate over all ical properties */
icalcomponent *icomp = e_cal_component_get_icalcomponent (ectz->maincomp);
icalproperty *prop = icalcomponent_get_first_property(icomp, ICAL_ANY_PROPERTY);
while (prop != NULL) {
icalproperty_kind kind = icalproperty_isa(prop);
gchar *pname = (gchar*) icalproperty_get_x_name(prop);
- if (ICAL_ATTACH_PROPERTY == kind) // found kolab inline or link attachment
+ if (ICAL_ATTACH_PROPERTY == kind) /* found kolab inline or link attachment */
add_e_attachment_parameters(prop, i_common, TRUE);
- else if (pname && strcmp(pname, ICONTACT_KOLAB_STORE_ATTACHMENT) == 0) // found hidden kolab attachment
+ else if (pname && strcmp(pname, ICONTACT_KOLAB_STORE_ATTACHMENT) == 0) /* found hidden kolab attachment */
add_e_attachment_parameters(prop, i_common, FALSE);
prop = icalcomponent_get_next_property(icomp, ICAL_ANY_PROPERTY);
}
diff --git a/src/libekolabconv/main/src/evolution/priv-common-i-to-e.c b/src/libekolabconv/main/src/evolution/priv-common-i-to-e.c
index e5d0645..8ecc540 100644
--- a/src/libekolabconv/main/src/evolution/priv-common-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/priv-common-i-to-e.c
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-#include <libxml/HTMLparser.h> // HTML parsing
+#include <libxml/HTMLparser.h> /* HTML parsing */
#include "priv-evolution.h"
#include "evolution-util.h"
@@ -50,21 +50,21 @@ conv_common_i_to_e (ECalComponentWithTZ *ectz, I_common *common)
if (common->body) {
gchar *description = NULL;
- // parse HTML if given
+ /* parse HTML if given */
if (common->is_html_richtext == TRUE) {
description = g_strdup("");
xmlChar *body_text = (xmlChar*)common->body->str;
if (body_text != NULL) {
xmlParserCtxtPtr p = xmlCreateDocParserCtxt(body_text);
- // comment "xmlCtxtUseOptions" to show errors and warnings
- xmlCtxtUseOptions (p, 96); // Enum xmlParserOption: XML_PARSE_NOERROR = 32 : suppress error reports | XML_PARSE_NOWARNING = 64 : suppress warning reports
+ /* comment "xmlCtxtUseOptions" to show errors and warnings */
+ xmlCtxtUseOptions (p, 96); /* Enum xmlParserOption: XML_PARSE_NOERROR = 32 : suppress error reports | XML_PARSE_NOWARNING = 64 : suppress warning reports */
- if (xmlParseDocument(p) != -1) { // -1 = error while parsing
- xmlParseDocument(p); // parse document
+ if (xmlParseDocument(p) != -1) { /* -1 = error while parsing */
+ xmlParseDocument(p); /* parse document */
- if (p->myDoc != NULL) { // go on if xml conform text with nodes was found
- htmlNodePtr root = xmlDocGetRootElement(p->myDoc); // set ptr to root node of document
+ if (p->myDoc != NULL) { /* go on if xml conform text with nodes was found */
+ htmlNodePtr root = xmlDocGetRootElement(p->myDoc); /* set ptr to root node of document */
if (root != NULL)
find_html_body(root, &description);
}
@@ -72,7 +72,7 @@ conv_common_i_to_e (ECalComponentWithTZ *ectz, I_common *common)
xmlFreeParserCtxt(p);
}
}
- else // set description if no html-description parsed
+ else /* set description if no html-description parsed */
description = common->body->str;
if (description) {
@@ -92,7 +92,7 @@ conv_common_i_to_e (ECalComponentWithTZ *ectz, I_common *common)
if (common->categories)
e_cal_component_set_categories (ectz->maincomp, common->categories->str);
- //e_cal_component_set_classification (eCalComp, getClassificationFromSensitivity( ievent->incidence->common->sensitivity ) );
+ /* e_cal_component_set_classification (eCalComp, getClassificationFromSensitivity( ievent->incidence->common->sensitivity ) ); */
if (common->creation_datetime && (common->creation_datetime->date || common->creation_datetime->date_time)) {
struct icaltimetype *creationDate = g_new(icaltimetype, 1);
@@ -108,7 +108,7 @@ conv_common_i_to_e (ECalComponentWithTZ *ectz, I_common *common)
g_free(lastModifiedDate);
}
-// e_set_vtimezone_block (&ectz->timezone, common->vtimezone);
+ /* e_set_vtimezone_block (&ectz->timezone, common->vtimezone); */
if (common->vtimezone)
ectz->timezone = e_cal_component_new_from_string(common->vtimezone);
}
@@ -136,8 +136,8 @@ kolab_attachment_store_i_to_e (ECalComponent* e_cal_comp, I_common *icommon)
while (list != NULL) {
Kolab_conv_mail_part *mpart = ((Kolab_conv_mail_part *) list->data);
- // check if the name of the attachment is stored in the inline
- // attachment names list
+ /* check if the name of the attachment is stored in the inline */
+ /* attachment names list */
GList *names = icommon->inline_attachment_names;
gboolean hidden = TRUE;
for (; names; names = names->next) {
@@ -158,9 +158,9 @@ kolab_attachment_store_i_to_e (ECalComponent* e_cal_comp, I_common *icommon)
g_free(b64enc);
icalproperty_set_value(prop, ival);
} else {
- //ATTACH;VALUE=BINARY;FMTTYPE=image/gif;ENCODING=BASE64;X-LABEL=blablubb:
+ /* ATTACH;VALUE=BINARY;FMTTYPE=image/gif;ENCODING=BASE64;X-LABEL=blablubb: */
- // create attach property with base64 content
+ /* create attach property with base64 content */
gchar *b64enc = g_base64_encode ((guchar*) mpart->data, mpart->length);
icalattach *a = icalattach_new_from_data(b64enc, icalattach_free_g_string, NULL);
@@ -169,24 +169,24 @@ kolab_attachment_store_i_to_e (ECalComponent* e_cal_comp, I_common *icommon)
}
- // add value type
+ /* add value type */
icalparameter *param = icalparameter_new_value(ICAL_VALUE_BINARY);
icalproperty_add_parameter(prop, param);
- // add mime type
+ /* add mime type */
if (mpart->mime_type) {
param = icalparameter_new_fmttype(mpart->mime_type);
icalproperty_add_parameter(prop, param);
}
- // add encoding
+ /* add encoding */
param = icalparameter_new_encoding(ICAL_ENCODING_BASE64);
icalproperty_add_parameter(prop, param);
- // add name
+ /* add name */
if (mpart->name) {
param = icalparameter_new_x(mpart->name);
icalparameter_set_xname(param, ICONTACT_KOLAB_STORE_ATTACHMENT_NAME);
icalproperty_add_parameter(prop, param);
}
- // add property to component
+ /* add property to component */
icalcomponent_add_property(icomp, prop);
kolabconv_free_kmail_part((void **) &mpart);
@@ -245,20 +245,20 @@ add_node_contents (htmlNodePtr element, gchar **description)
htmlNodePtr node;
for (node = element; node != NULL; node = node->next) {
if (node->content != NULL) {
- // calculate needed memory
- // TODO: Maybe block allocation (blocksize?)
+ /* calculate needed memory */
+ /* TODO: Maybe block allocation (blocksize?) */
size_t actual_memory = 0, additional_needed_memory = 0;
actual_memory = (strlen(*description)) + (sizeof(gchar));
additional_needed_memory = strlen((gchar*)node->content);
- // size up memory
+ /* size up memory */
*description = (gchar*) g_realloc (*description, actual_memory + additional_needed_memory);
- // attach new content
+ /* attach new content */
*description = strcat (*description, (gchar*)node->content);
}
- if (node->children != NULL) // recurse subnotes
+ if (node->children != NULL) /* recurse subnotes */
add_node_contents(node->children, description);
}
}
@@ -272,9 +272,9 @@ find_html_body (htmlNodePtr element, gchar **description)
htmlNodePtr node;
for (node = element; node != NULL; node = node->next)
if (node->type == XML_ELEMENT_NODE) {
- if (strcmp((gchar*)node->name, "body") == 0) // parse complete content
+ if (strcmp((gchar*)node->name, "body") == 0) /* parse complete content */
add_node_contents(node, description);
- if (node->children != NULL) // recurse subnotes
+ if (node->children != NULL) /* recurse subnotes */
find_html_body(node->children, description);
}
}
diff --git a/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c b/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c
index bf19e5b..b3fd214 100644
--- a/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c
+++ b/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c
@@ -112,11 +112,11 @@ i_evo_store_add_cal(I_common *i_common, const ECalComponentWithTZ *ectz)
{
icalcomponent *icomp = e_cal_component_get_icalcomponent (ectz->maincomp);
- //TODO: Add properties which should be preserved and which are missing below.
+ /* TODO: Add properties which should be preserved and which are missing below. */
i_evo_store_add(i_common, icomp, ICAL_ORGANIZER_PROPERTY);
i_evo_store_add(i_common, icomp, ICAL_URL_PROPERTY);
i_evo_store_add_by_string(i_common, icomp, "X-EVOLUTION-RECIPIENTS");
-// evo_store_add(icommon, icomp, ICAL_RECURRENCEID_PROPERTY);
+ /* evo_store_add(icommon, icomp, ICAL_RECURRENCEID_PROPERTY); */
}
/**
@@ -139,14 +139,15 @@ i_evo_store_add_cal_note(I_common *i_common, const ECalComponentWithTZ *ectz)
void
i_evo_store_add_contact(EContact *e_contact, I_common *i_common)
{
- //TODO: Add properties which should be preserved and which are missing below.
+ /* TODO: Add properties which should be preserved and which are missing below. */
i_evo_store_add_contact_by_name(e_contact, i_common, "X-MOZILLA-HTML");
i_evo_store_add_contact_by_name(e_contact, i_common, "CALURI");
- // XXX: Reconsider how to handle X-EVOLUTION-FILE-AS
- // file-as is a string for sorting in evolution. It has higher priority as full name.
- // You can set it manually. If you create a contact or delete field in VCard it is
- // always set to: "lastname, forename". Put in Evolution Store or better let write default value?
- // evo_store_add_contact_by_name(e_contact, i_common, "X-EVOLUTION-FILE-AS");
+ /* XXX: Reconsider how to handle X-EVOLUTION-FILE-AS
+ * file-as is a string for sorting in evolution. It has higher priority as full name.
+ * You can set it manually. If you create a contact or delete field in VCard it is
+ * always set to: "lastname, forename". Put in Evolution Store or better let write default value?
+ */
+ /* evo_store_add_contact_by_name(e_contact, i_common, "X-EVOLUTION-FILE-AS"); */
i_evo_store_add_contact_by_name(e_contact, i_common, "X-EVOLUTION-VIDEO-URL");
i_evo_store_add_contact_by_name(e_contact, i_common, "MAILER");
i_evo_store_add_contact_by_name(e_contact, i_common, "KEY");
@@ -154,7 +155,7 @@ i_evo_store_add_contact(EContact *e_contact, I_common *i_common)
i_evo_store_add_contact_by_name(e_contact, i_common, "X-EVOLUTION-LIST-SHOW_ADDRESSES");
i_evo_store_add_contact_by_name(e_contact, i_common, "X-SIP");
i_evo_store_add_contact_by_name(e_contact, i_common, "X-EVOLUTION-BOOK-URI");
-// i_evo_store_add_contact_by_name(e_contact, i_common, "ICSCALENDAR"); // XXX: What is stored in this field? could this lead to data inconsistencies?
+ /* i_evo_store_add_contact_by_name(e_contact, i_common, "ICSCALENDAR"); XXX: What is stored in this field? could this lead to data inconsistencies? */
}
/**
@@ -239,14 +240,14 @@ e_kolab_store_add_field_group(ECalComponentWithTZ *ectz, I_common *i_common, gpo
{
if (i_common->kolab_store) {
icalcomponent *icomp = e_cal_component_get_icalcomponent (ectz->maincomp);
- //Add a param in kolab_store for each element in the list icontact->kolab_store
+ /* Add a param in kolab_store for each element in the list icontact->kolab_store */
GList *list = kolab_store_get_element_list(i_common, parent_ptr);
for (list = g_list_last (list); list != NULL; list = list->prev) {
icalproperty *prop = icalproperty_new_x("");
icalproperty_set_x_name(prop, ICONTACT_KOLAB_STORE);
icalparameter *para = icalparameter_new_encoding(ICAL_ENCODING_BASE64);
icalproperty_add_parameter(prop, para);
- if (parent_ptr != i_common) { // sub element field? => store id
+ if (parent_ptr != i_common) { /* sub element field? => store id */
gchar id_str[5];
sprintf (id_str, "%li", (glong) parent_ptr);
para = icalparameter_new_x(id_str);
diff --git a/src/libekolabconv/main/src/evolution/priv-incidence-e-to-i.c b/src/libekolabconv/main/src/evolution/priv-incidence-e-to-i.c
index 27e4653..807ef02 100644
--- a/src/libekolabconv/main/src/evolution/priv-incidence-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/priv-incidence-e-to-i.c
@@ -55,13 +55,13 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
{
conv_common_e_to_i (ectz, i_incidence->common);
- //******************************************SET LOCATION************************************
+ /* ******************************************SET LOCATION************************************ */
const gchar *location;
e_cal_component_get_location(ectz->maincomp, &location);
if (location)
i_incidence->location = g_string_new(location);
- //******************************************SET SUMMARY************************************
+ /* ******************************************SET SUMMARY************************************ */
ECalComponentText *summary = g_new0(ECalComponentText, 1);
e_cal_component_get_summary (ectz->maincomp, summary);
if (summary && summary->value && *summary->value)
@@ -71,7 +71,7 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
g_free(summary);
- //******************************************SET ORGANIZER************************************
+ /* ******************************************SET ORGANIZER************************************ */
ECalComponentOrganizer *e_cal_comp_org = g_new0(ECalComponentOrganizer, 1);
e_cal_component_get_organizer(ectz->maincomp, e_cal_comp_org);
if (e_cal_comp_org->cn)
@@ -91,20 +91,20 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
e_cal_component_free_datetime(start_date);
g_free(start_date);
- //******************************************SET ALARM / ADVANCED ALARM *****************************
+ /* ******************************************SET ALARM / ADVANCED ALARM ***************************** */
if (e_cal_component_has_alarms(ectz->maincomp)) {
- //ECalComponentAlarms *eCalCompAlm = g_new0(ECalComponentAlarms, 1);
+ /* ECalComponentAlarms *eCalCompAlm = g_new0(ECalComponentAlarms, 1); */
GList *alarm_list = e_cal_component_get_alarm_uids(ectz->maincomp);
while (alarm_list) {
gchar *alarm_uid = ((gchar *)alarm_list->data);
ECalComponentAlarm *ecalcomp_alarm = e_cal_component_get_alarm(ectz->maincomp, alarm_uid);
if (ecalcomp_alarm) {
- // new Alarm object to append later at i_incidence list
+ /* new Alarm object to append later at i_incidence list */
Alarm *alarm = g_new0(Alarm, 1);
- // type / action
+ /* type / action */
ECalComponentAlarmAction action;
e_cal_component_alarm_get_action (ecalcomp_alarm, &action);
alarm->type = alarm_type_e_to_i(action);
@@ -116,7 +116,7 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
g_free(text);
}
if (alarm->type == I_ALARM_TYPE_AUDIO) {
- // set audio-file url
+ /* set audio-file url */
icalattach *attach;
e_cal_component_alarm_get_attach (ecalcomp_alarm, &attach);
alarm->audio_file = g_string_new(icalattach_get_url(attach));
@@ -124,12 +124,12 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
if (alarm->type == I_ALARM_TYPE_PROCEDURE) {
alarm = new_alarm(I_ALARM_TYPE_PROCEDURE);
- // set program
+ /* set program */
icalattach *attach;
e_cal_component_alarm_get_attach (ecalcomp_alarm, &attach);
alarm->proc_param->program = g_string_new(icalattach_get_url(attach));
- //set arguments
+ /* set arguments */
ECalComponentText *text = g_new0(ECalComponentText, 1);
e_cal_component_alarm_get_description(ecalcomp_alarm, text);
alarm->proc_param->arguments = g_string_new(text->value);
@@ -138,20 +138,20 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
if (alarm->type == I_ALARM_TYPE_EMAIL) {
alarm = new_alarm(I_ALARM_TYPE_EMAIL);
- // set mail text
+ /* set mail text */
ECalComponentText *text = g_new0(ECalComponentText, 1);
e_cal_component_alarm_get_description(ecalcomp_alarm, text);
alarm->email_param->mail_text = g_string_new(text->value);
g_free(text);
- // set mail addresses
+ /* set mail addresses */
GSList *attendee_list = NULL;
e_cal_component_alarm_get_attendee_list(ecalcomp_alarm, &attendee_list);
for (; attendee_list; attendee_list = attendee_list->next) {
ECalComponentAttendee *ca = (ECalComponentAttendee *) attendee_list->data;
gchar* value = ca->value;
- if (g_str_has_prefix(value, "MAILTO:"))// increase pointer by 7 to cut off prefix
+ if (g_str_has_prefix(value, "MAILTO:"))/* increase pointer by 7 to cut off prefix */
value +=7;
alarm->email_param->addresses = g_list_append(
@@ -162,56 +162,58 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
generic_g_slist_free(&attendee_list, free_attendee);
}
- // trigger
+ /* trigger */
ECalComponentAlarmTrigger *trigger = g_new0(ECalComponentAlarmTrigger, 1);
e_cal_component_alarm_get_trigger (ecalcomp_alarm, trigger);
if (trigger->type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START)
- alarm->start_offset = (icaldurationtype_as_int(trigger->u.rel_duration)/60); // (/60) as_int returns seconds, but kolab saved minutes
+ alarm->start_offset = (icaldurationtype_as_int(trigger->u.rel_duration)/60); /* (/60) as_int returns seconds, but kolab saved minutes */
if (trigger->type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END)
- alarm->end_offset = (icaldurationtype_as_int(trigger->u.rel_duration)/60); // (/60) as_int returns seconds, but kolab saved minutes
+ alarm->end_offset = (icaldurationtype_as_int(trigger->u.rel_duration)/60); /* (/60) as_int returns seconds, but kolab saved minutes */
if (trigger->type == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE)
{
- // TODO: Maybe calculate a relative trigger from incidence->startdate and evolution absolute trigger->u.abs_time -abs_time is icaltimetype, calculate in minutes?
- // XXX: Not tested! & Both, Evolution and Kontact do not provide absolute alarm trigger. Just iCal secifies it.
- // // convert icaltimetype to date_time/time_t for use with time.h
- // Date_or_datetime *evo_date_time = NULL;
- // time_t *evo_abs_time = NULL;
- // i_cal_time_type_to_date_or_datetime(&trigger->u.abs_time, evo_date_time);
- // evo_abs_time = evo_date_time->date_time;
- //
- //
- // if (incidence->startDate->date_time != NULL)
- // {
- // // calculate difference in seconds with difftime when startDate is already date_time/time_t
- // time_t *i_start_time = incidence->startDate->date_time;
- // double diff = 0.0;
- // diff = difftime(*evo_abs_time, *i_start_time); // returns seconds?
- // }
- // else if (incidence->startDate->date != NULL)
- // {
- // // convert startDate from GDate to date_time/time_t and then calculate difference
- // struct tm *stm = NULL;
- //
- // /* First convert to a 'struct tm' */
- // g_date_to_struct_tm(incidence->startDate->date, stm); // gdate + 0:00:00
- //
- // /* Then convert to number of seconds */
- // time_t *i_start_time = NULL;
- // i_start_time = mktime(stm);
- //
- // double diff = 0.0;
- // diff = difftime(*evo_abs_time, *i_start_time); // returns seconds?
- // }
+ /* TODO: Maybe calculate a relative trigger from incidence->startdate and evolution absolute trigger->u.abs_time -abs_time is icaltimetype, calculate in minutes?
+ * XXX: Not tested! & Both, Evolution and Kontact do not provide absolute alarm trigger. Just iCal secifies it.
+ * convert icaltimetype to date_time/time_t for use with time.h
+ */
+#if 0
+ Date_or_datetime *evo_date_time = NULL;
+ time_t *evo_abs_time = NULL;
+ i_cal_time_type_to_date_or_datetime(&trigger->u.abs_time, evo_date_time);
+ evo_abs_time = evo_date_time->date_time;
+
+ if (incidence->startDate->date_time != NULL)
+ {
+ /* calculate difference in seconds with difftime when startDate is already date_time/time_t */
+ time_t *i_start_time = incidence->startDate->date_time;
+ double diff = 0.0;
+ diff = difftime(*evo_abs_time, *i_start_time); /* returns seconds? */
+ }
+ else if (incidence->startDate->date != NULL)
+ {
+ /* convert startDate from GDate to date_time/time_t and then calculate difference */
+ struct tm *stm = NULL;
+
+ /* First convert to a 'struct tm' */
+ g_date_to_struct_tm(incidence->startDate->date, stm); /* gdate + 0:00:00 */
+
+ /* Then convert to number of seconds */
+ time_t *i_start_time = NULL;
+ i_start_time = mktime(stm);
+
+ double diff = 0.0;
+ diff = difftime(*evo_abs_time, *i_start_time); /* returns seconds? */
+ }
+#endif
}
g_free(trigger);
- // repeat (count & interval)
+ /* repeat (count & interval) */
ECalComponentAlarmRepeat *repeat = g_new0(ECalComponentAlarmRepeat, 1);
e_cal_component_alarm_get_repeat (ecalcomp_alarm, repeat);
if (repeat->repetitions)
alarm->repeat_count = repeat->repetitions;
if (icaldurationtype_is_null_duration(repeat->duration) == 0)
- alarm->repeat_interval = (icaldurationtype_as_int(repeat->duration)/60); // (/60) as_int returns seconds, but kolab saved minutes
+ alarm->repeat_interval = (icaldurationtype_as_int(repeat->duration)/60); /* (/60) as_int returns seconds, but kolab saved minutes */
i_incidence->advanced_alarm = g_list_append( i_incidence->advanced_alarm, (Alarm *) alarm);
@@ -225,7 +227,7 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
generic_g_list_free(&alarm_list, free_alarm);
}
- //******************************************SET ATTENDEE LIST*******************************************************************************
+ /* ******************************************SET ATTENDEE LIST******************************************************************************* */
GSList *attendee_list = NULL;
ECalComponentAttendee *ca;
@@ -239,12 +241,12 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
attendee->display_name = g_string_new(ca->cn);
if (g_str_has_prefix(ca->value, "MAILTO:"))
- attendee->smtp_address = g_string_new(ca->value+7); // increase pointer by 7 to cut off prefix
+ attendee->smtp_address = g_string_new(ca->value+7); /* increase pointer by 7 to cut off prefix */
else
attendee->smtp_address = g_string_new(ca->value);
attendee->request_response = ca->rsvp;
- // TODO: Incidence: invitation_sent: get from kolab-store?
+ /* TODO: Incidence: invitation_sent: get from kolab-store? */
attendee->role = incidence_role_e_to_i(ca->role);
attendee->status = incidence_status_e_to_i(ca->status);
attendee->cutype = incidence_cutype_e_to_i(ca->cutype);
@@ -412,8 +414,8 @@ recurrence_type_e_to_i (struct icalrecurrencetype *rec_type)
static void
recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
{
- //******************************************SET RECURRENCE*******************************************************************************
- //******************************************SET RECURRENCE EXCLUSIONS********************************************************************
+ /* ******************************************SET RECURRENCE******************************************************************************* */
+ /* ******************************************SET RECURRENCE EXCLUSIONS******************************************************************** */
GSList *exdate_list;
e_cal_component_get_exdate_list (ectz->maincomp, &exdate_list);
if (exdate_list)
@@ -431,7 +433,7 @@ recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
exdate_list = exdate_list->next;
}
g_slist_free(exdate_list);
- //******************************************SET RECURRENCE CYCLE********************************************************************
+ /* ******************************************SET RECURRENCE CYCLE******************************************************************** */
GSList *rec_list = NULL;
e_cal_component_get_rrule_list (ectz->maincomp, &rec_list);
@@ -446,7 +448,7 @@ recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
add_recurrence_subfields (i_incidence, rec_type);
- // remapping of missing I_REC_CYCLE_YEARLY_WEEKDAY support in evolution
+ /* remapping of missing I_REC_CYCLE_YEARLY_WEEKDAY support in evolution */
if (rec_type->freq == ICAL_MONTHLY_RECURRENCE
&& rec_type->by_day[0] != ICAL_RECURRENCE_ARRAY_MAX
&& rec_type->by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX
@@ -474,17 +476,18 @@ recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
i_incidence->recurrence->month = ts->tm_mon + 1;
i_incidence->recurrence->day_number = ts->tm_mday;
}
-
-// icalcomponent *icomp = e_cal_component_get_icalcomponent(ectz->maincomp);
-// icalcomponent_kind ical_kind = icalcomponent_isa(icomp);
-// if (ical_kind == ICAL_VTODO_COMPONENT) {
-// ECalComponentDateTime *dt;
-// e_cal_component_get_due(ectz->maincomp, dt);
-// if (dt) {
-// i_incidence->recurrence->month = dt->value->month;
-// i_incidence->recurrence->day_number = dt->value->day;
-// }
-// }
+#if 0
+ icalcomponent *icomp = e_cal_component_get_icalcomponent(ectz->maincomp);
+ icalcomponent_kind ical_kind = icalcomponent_isa(icomp);
+ if (ical_kind == ICAL_VTODO_COMPONENT) {
+ ECalComponentDateTime *dt;
+ e_cal_component_get_due(ectz->maincomp, dt);
+ if (dt) {
+ i_incidence->recurrence->month = dt->value->month;
+ i_incidence->recurrence->day_number = dt->value->day;
+ }
+ }
+#endif
}
g_free(rec_type);
@@ -511,9 +514,11 @@ add_recurrence_subfields (I_incidence *i_incidence, struct icalrecurrencetype *r
i_incidence->recurrence->day_number = rec_type->by_set_pos[0];
recurrence_set_by_weekday(rec_type, i_incidence->recurrence);
} else if (i_incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_MONTHDAY) {
- // disabled, cannot be properly handled by Evolution
-// recurrence_set_by_month_day(rec_type, i_incidence);
-// recurrence_set_by_month(rec_type, i_incidence->recurrence);
+ /* disabled, cannot be properly handled by Evolution */
+#if 0
+ recurrence_set_by_month_day(rec_type, i_incidence);
+ recurrence_set_by_month(rec_type, i_incidence->recurrence);
+#endif
} else if (i_incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_YEARDAY) {
recurrence_set_by_year_day(rec_type, i_incidence->recurrence);
} else if (i_incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY) {
@@ -588,7 +593,7 @@ recurrence_set_range(struct icalrecurrencetype *rec_type, Recurrence *recurrence
recurrence->range_number = g_new0(gint, 1);
*recurrence->range_number = rec_type->count;
} else {
- // infinite recurrence
+ /* infinite recurrence */
}
}
diff --git a/src/libekolabconv/main/src/evolution/priv-incidence-i-to-e.c b/src/libekolabconv/main/src/evolution/priv-incidence-i-to-e.c
index a11709b..71c9bd8 100644
--- a/src/libekolabconv/main/src/evolution/priv-incidence-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/priv-incidence-i-to-e.c
@@ -41,7 +41,7 @@ static icalparameter_role incidence_role_i_to_e (Incidence_role role);
static void recurrence_set_by_month_day(struct icalrecurrencetype *rec_type, const Recurrence *recurrence);
static void recurrence_set_range(struct icalrecurrencetype *rec_type, const Recurrence *recurrence);
static void recurrence_set_by_year_day(struct icalrecurrencetype *rec_type, const Recurrence *recurrence);
-//static void recurrence_set_by_month(struct icalrecurrencetype *rec_type, const Recurrence *recurrence);
+/* static void recurrence_set_by_month(struct icalrecurrencetype *rec_type, const Recurrence *recurrence); */
static void recurrence_set_by_set_pos(struct icalrecurrencetype *rec_type, const Recurrence *recurrence);
static void recurrence_set_by_day(struct icalrecurrencetype *rec_type, gint weekdays);
@@ -72,7 +72,7 @@ conv_incidence_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
ECalComponentOrganizer *ecal_comp_org;
ecal_comp_org = g_new0(ECalComponentOrganizer, 1);
- ecal_comp_org->language = NULL; //g_strdup("Language");
+ ecal_comp_org->language = NULL; /* g_strdup("Language"); */
ecal_comp_org->sentby = NULL;
ecal_comp_org->cn = g_strdup(i_incidence->organizer_display_name->str);
ecal_comp_org->value = g_strdup(i_incidence->organizer_smtp_address->str);
@@ -85,7 +85,7 @@ conv_incidence_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
- //********************************ectz->maincomp**SET DATES (CREATION, LASTMODIFICATION, START, END etc.)************************************
+ /* ********************************ectz->maincomp**SET DATES (CREATION, LASTMODIFICATION, START, END etc.)************************************ */
if (i_incidence->start_date) {
ECalComponentDateTime st;
@@ -103,7 +103,7 @@ conv_incidence_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
e_cal_component_free_datetime(&st);
}
- //******************************************SET ATTENDEE LIST*******************************************************************************
+ /* ******************************************SET ATTENDEE LIST******************************************************************************* */
if (i_incidence->attendee) {
GSList *attendee_list = NULL;
GSList *attendee_list_ptr = NULL;
@@ -118,12 +118,12 @@ conv_incidence_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
ca->cn = g_strdup( attendee->display_name->str );
ca->value = g_strdup( attendee->smtp_address->str );
ca->rsvp = attendee->request_response;
- // TODO: Incidence: attendee->invitation_sent;
+ /* TODO: Incidence: attendee->invitation_sent; */
ca->role = incidence_role_i_to_e( attendee->role );
ca->status = incidence_status_i_to_e ( attendee->status);
ca->cutype = incidence_cutype_i_to_e ( attendee->cutype);
- // TODO: Fields Still remaining: 1. ca->cutype;2. ca->delfrom; 3. ca->delto; 4. ca->language; 5. ca->member; 6. ca->sentby;
+ /* TODO: Fields Still remaining: 1. ca->cutype;2. ca->delfrom; 3. ca->delto; 4. ca->language; 5. ca->member; 6. ca->sentby; */
attendee_list = g_slist_append (attendee_list, ca);
@@ -168,7 +168,7 @@ struct icaldurationtyp* create_duration(gint minutes)
void
alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
{
- //******************************************SET ALARM / ADVANCED ALARM *****************************
+ /* ******************************************SET ALARM / ADVANCED ALARM ***************************** */
if (i_incidence->advanced_alarm) {
GList *alarm_list = i_incidence->advanced_alarm;
@@ -177,10 +177,10 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
ECalComponentAlarm *e_alarm = e_cal_component_alarm_new();
Alarm *i_alarm = (Alarm *) alarm_list->data;
- // type / action
+ /* type / action */
e_cal_component_alarm_set_action(e_alarm, alarm_type_i_to_e(i_alarm->type));
- // action dependent fields
+ /* action dependent fields */
if (i_alarm->type == I_ALARM_TYPE_DISPLAY) {
ECalComponentText *text = g_new0(ECalComponentText, 1);
if(i_alarm->display_text)
@@ -202,11 +202,11 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
icalattach_unref(attach);
}
if (i_alarm->type == I_ALARM_TYPE_PROCEDURE && i_alarm->proc_param->program) {
- // set program
+ /* set program */
gchar *procedure_url = g_strdup(i_alarm->proc_param->program->str);
icalattach *attach = icalattach_new_from_url(procedure_url);
e_cal_component_alarm_set_attach (e_alarm, attach);
- //set arguments
+ /* set arguments */
if (i_alarm->proc_param->arguments) {
ECalComponentText *text = g_new0(ECalComponentText, 1);
text->value = g_strdup(i_alarm->proc_param->arguments->str);
@@ -217,7 +217,7 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
icalattach_unref(attach);
}
if (i_alarm->type == I_ALARM_TYPE_EMAIL) {
- // set email text
+ /* set email text */
if (i_alarm->email_param->mail_text) {
ECalComponentText *text = g_new0(ECalComponentText, 1);
text->value = g_strdup(i_alarm->email_param->mail_text->str);
@@ -225,7 +225,7 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
g_free(text);
}
- // set mail recipients
+ /* set mail recipients */
GSList *attendee_list = NULL;
ECalComponentAttendee *ca;
GList *temp = i_alarm->email_param->addresses;
@@ -243,7 +243,7 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
e_cal_component_free_attendee_list(attendee_list);
}
- // trigger
+ /* trigger */
ECalComponentAlarmTrigger *trigger = g_new0(ECalComponentAlarmTrigger, 1);
if (i_alarm->start_offset) {
trigger->type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
@@ -261,7 +261,7 @@ alarm_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
}
g_free(trigger);
- // repeat (count & interval)
+ /* repeat (count & interval) */
ECalComponentAlarmRepeat *repeat = g_new0(ECalComponentAlarmRepeat, 1);
if (i_alarm->repeat_count)
repeat->repetitions = i_alarm->repeat_count;
@@ -358,7 +358,7 @@ weekday_i_to_e(gint *weekdays)
static icalrecurrencetype_frequency
frequency_i_to_e(Recurrence *recurrence)
{
- // I_REC_CYCLE_YEARLY_WEEKDAY is mapped to ICAL_MONTHLY_RECURRENCE (repeated every 12th month)
+ /* I_REC_CYCLE_YEARLY_WEEKDAY is mapped to ICAL_MONTHLY_RECURRENCE (repeated every 12th month) */
if (recurrence) {
switch (recurrence->recurrence_cycle) {
@@ -372,7 +372,7 @@ frequency_i_to_e(Recurrence *recurrence)
return ICAL_MONTHLY_RECURRENCE;
case I_REC_CYCLE_YEARLY_MONTHDAY:
case I_REC_CYCLE_YEARLY_YEARDAY:
- // I_REC_CYCLE_YEARLY_WEEKDAY is mapped to monthly every 12th month!!
+ /* I_REC_CYCLE_YEARLY_WEEKDAY is mapped to monthly every 12th month!! */
return ICAL_YEARLY_RECURRENCE;
default:
return ICAL_NO_RECURRENCE;
@@ -390,7 +390,7 @@ recurrence_fields_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
if(i_incidence->recurrence == NULL)
return;
- //******************************************SET RECURRENCE EXCLUSIONS*******************************************************************************
+ /* ******************************************SET RECURRENCE EXCLUSIONS******************************************************************************* */
GSList *exdate_list = NULL;
GList *excl_list = i_incidence->recurrence->exclusion;
@@ -416,14 +416,15 @@ recurrence_fields_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
g_list_free(excl_list);
e_cal_component_commit_sequence (ectz->maincomp);
- //******************************************SET RECURRENCE RULES*******************************************************************************
+ /* ******************************************SET RECURRENCE RULES******************************************************************************* */
GSList *recur_list = NULL;
struct icalrecurrencetype *rec_type = g_new0(struct icalrecurrencetype, 1);
icalrecurrencetype_clear(rec_type);
- // I_REC_CYCLE_YEARLY_WEEKDAY gets special treatment: yearly recurrence on the n-th day
- // of a month is mapped to a monthly recurrence every twelvth month...
+ /* I_REC_CYCLE_YEARLY_WEEKDAY gets special treatment: yearly recurrence on the n-th day
+ * of a month is mapped to a monthly recurrence every twelvth month...
+ */
rec_type->freq = frequency_i_to_e(i_incidence->recurrence);
recurrence_set_range(rec_type, i_incidence->recurrence);
@@ -448,10 +449,13 @@ recurrence_fields_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
break;
case I_REC_CYCLE_YEARLY_MONTHDAY:
- // deactivated. month and monthday cannot be handled by evolution
- // mapping is done by startdate
-// recurrence_set_by_month_day(rec_type, i_incidence->recurrence);
-// recurrence_set_by_month(rec_type, i_incidence->recurrence);
+ /* deactivated. month and monthday cannot be handled by evolution
+ * mapping is done by startdate
+ */
+#if 0
+ recurrence_set_by_month_day(rec_type, i_incidence->recurrence);
+ recurrence_set_by_month(rec_type, i_incidence->recurrence);
+#endif
break;
case I_REC_CYCLE_YEARLY_YEARDAY:
recurrence_set_by_year_day(rec_type, i_incidence->recurrence);
@@ -564,7 +568,7 @@ recurrence_set_range(struct icalrecurrencetype *rec_type, const Recurrence *recu
} else if (recurrence->range_number) {
rec_type->count = *(recurrence->range_number);
} else {
- // infinite recurrence
+ /* infinite recurrence */
}
}
@@ -580,24 +584,26 @@ recurrence_set_by_year_day(struct icalrecurrencetype *rec_type, const Recurrence
}
}
+#if 0
/**
* TODO: write comment
*/
-//static void
-//recurrence_set_by_month(struct icalrecurrencetype *rec_type, const Recurrence *recurrence)
-//{
-// if (recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY) {
-// if (recurrence->day_number >= -5 && recurrence->day_number <= 5 && recurrence->day_number != 0) {
-// rec_type->by_month[0] = recurrence->month;
-// rec_type->by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
-// }
-// } else {
-// if (recurrence->day_number >= 1 && recurrence->day_number <= 31) {
-// rec_type->by_month[0] = recurrence->month;
-// rec_type->by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
-// }
-// }
-//}
+static void
+recurrence_set_by_month(struct icalrecurrencetype *rec_type, const Recurrence *recurrence)
+{
+ if (recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY) {
+ if (recurrence->day_number >= -5 && recurrence->day_number <= 5 && recurrence->day_number != 0) {
+ rec_type->by_month[0] = recurrence->month;
+ rec_type->by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ }
+ } else {
+ if (recurrence->day_number >= 1 && recurrence->day_number <= 31) {
+ rec_type->by_month[0] = recurrence->month;
+ rec_type->by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ }
+ }
+}
+#endif
/**
* Convert the internal recurrence day to evolution recurrence week day
diff --git a/src/libekolabconv/main/src/evolution/task-e-to-i.c b/src/libekolabconv/main/src/evolution/task-e-to-i.c
index fcbe517..2325b7a 100644
--- a/src/libekolabconv/main/src/evolution/task-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/task-e-to-i.c
@@ -62,21 +62,21 @@ conv_ECalComponentWithTZ_to_I_task (const ECalComponentWithTZ *ectz, GError **er
if (ectz) {
ECalComponent *e_cal_comp = ectz->maincomp;
- //log_debug("\nconvert_ECalComponent_to_itask is called...");
+ /* log_debug("\nconvert_ECalComponent_to_itask is called..."); */
if (e_cal_comp == NULL || e_cal_component_get_vtype (e_cal_comp) != E_CAL_COMPONENT_TODO)
return i_task;
- // Incidence
+ /* Incidence */
conv_incidence_e_to_i (ectz, i_task->incidence);
- // Priority
+ /* Priority */
gint * priority;
e_cal_component_get_priority (e_cal_comp, &priority);
if (priority)
i_task->priority = *priority;
e_cal_component_free_priority(priority);
- // I_TASK_COMPLETED
+ /* I_TASK_COMPLETED */
gint *percent;
e_cal_component_get_percent (e_cal_comp, &percent);
if (percent == 0)
@@ -84,13 +84,13 @@ conv_ECalComponentWithTZ_to_I_task (const ECalComponentWithTZ *ectz, GError **er
else
i_task->completed = (guint) *percent;
- // Incidence_status
+ /* Incidence_status */
icalproperty_status * prop = g_new0(icalproperty_status, 1);
e_cal_component_get_status (e_cal_comp, prop);
i_task->status = task_status_e_to_i(*prop);
g_free(prop);
- // due_date
+ /* due_date */
ECalComponentDateTime *due_date = g_new0(ECalComponentDateTime, 1);
e_cal_component_get_due (e_cal_comp, due_date);
if (due_date && due_date->value) {
@@ -101,7 +101,7 @@ conv_ECalComponentWithTZ_to_I_task (const ECalComponentWithTZ *ectz, GError **er
e_cal_component_free_datetime(due_date);
g_free (due_date);
- // completed date
+ /* completed date */
ECalComponentDateTime *completed_date = g_new0(ECalComponentDateTime, 1);
e_cal_component_get_completed(e_cal_comp, &completed_date->value);
if (completed_date && completed_date->value)
diff --git a/src/libekolabconv/main/src/evolution/task-i-to-e.c b/src/libekolabconv/main/src/evolution/task-i-to-e.c
index cc639b9..c7796ca 100644
--- a/src/libekolabconv/main/src/evolution/task-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/task-i-to-e.c
@@ -73,9 +73,9 @@ conv_I_task_to_ECalComponentWithTZ (I_task **i_task_ptr, GError **error)
conv_incidence_i_to_e(ectz, i_task->incidence);
if (i_task->priority >= 0 && i_task->priority <= 9)
- // normal priority will be calculated from xkcal
+ /* normal priority will be calculated from xkcal */
e_cal_component_set_priority(e_cal_comp, &i_task->priority);
- if (i_task->completed <= 100) // guint is always >= 0
+ if (i_task->completed <= 100) /* guint is always >= 0 */
e_cal_component_set_percent(e_cal_comp, (gint*) &i_task->completed);
if (i_task->status)
e_cal_component_set_status(e_cal_comp, task_status_i_to_e(i_task->status));
diff --git a/src/libekolabconv/main/src/kolab-conv.c b/src/libekolabconv/main/src/kolab-conv.c
index e3ef23b..3546cd4 100644
--- a/src/libekolabconv/main/src/kolab-conv.c
+++ b/src/libekolabconv/main/src/kolab-conv.c
@@ -101,7 +101,7 @@ kolabconv_cal_util_freebusy_new_fb_url (const gchar *servername,
gboolean use_ssl,
Kolab_conv_freebusy_type listtype)
{
- // TODO: Improve me!
+ /* TODO: Improve me! */
gchar *url_string;
gchar *protocol;
@@ -168,7 +168,7 @@ kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (const gchar *ics_string,
g_return_val_if_fail (err == NULL || *err == NULL, NULL);
- // TODO: sanity-check incoming data
+ /* TODO: sanity-check incoming data */
if (nbytes > 0) {
icalcomp_ics = (icalcomponent *) e_cal_util_parse_ics_string(ics_string);
@@ -244,9 +244,9 @@ kolabconv_initialize (void)
void
kolabconv_shutdown (void)
{
- // TODO: Check whether libxml needs to be shut down explicitly. (or any other libs)
+ /* TODO: Check whether libxml needs to be shut down explicitly. (or any other libs) */
- // free datastructure for ical builtin timezones
+ /* free datastructure for ical builtin timezones */
icaltimezone_free_builtin_timezones();
}
@@ -266,12 +266,12 @@ kolabconv_kcontact_to_econtact (const Kolab_conv_mail* kmail, GError** error)
{
log_kolab_mail("input data:", kmail);
EContact *econtact = NULL;
- // create icontact
+ /* create icontact */
I_contact *icontact = conv_kolab_conv_mail_to_I_contact(kmail, error);
- // create evolution contact if success
+ /* create evolution contact if success */
if (*error == NULL)
econtact = conv_I_contact_to_EContact(&icontact, error);
- // icontact is freed in the above operation already
+ /* icontact is freed in the above operation already */
log_evolution_vcard("output data:", econtact);
return econtact;
}
@@ -293,12 +293,12 @@ kolabconv_econtact_to_kcontact (const EContact* econtact, GError** error)
{
log_evolution_vcard("input data:", econtact);
Kolab_conv_mail *kmail = NULL;
- // create icontact
+ /* create icontact */
I_contact *icontact = conv_EContact_to_I_contact(econtact, error);
- // create kolab contact mail if success
+ /* create kolab contact mail if success */
if (*error == NULL)
kmail = conv_I_contact_to_kolab_conv_mail(&icontact, error);
- // icontact is freed in the above operation already
+ /* icontact is freed in the above operation already */
log_kolab_mail("output data:", kmail);
return kmail;
}
@@ -319,12 +319,12 @@ kolabconv_kevent_to_eevent (const Kolab_conv_mail* kmail, GError** error)
{
log_kolab_mail("input data:", kmail);
ECalComponentWithTZ *eevent = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_event *ievent = conv_kolab_conv_mail_to_I_event(kmail, error);
- // create evolution pim object if success
+ /* create evolution pim object if success */
if (*error == NULL)
eevent = conv_I_event_to_ECalComponentWithTZ(&ievent, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_evolution_ical("output data:", eevent);
return eevent;
}
@@ -346,12 +346,12 @@ kolabconv_eevent_to_kevent (const ECalComponentWithTZ* ecalcomp, GError** error)
{
log_evolution_ical("input data:", ecalcomp);
Kolab_conv_mail *kmail = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_event *ievent = conv_ECalComponentWithTZ_to_I_event(ecalcomp, error);
- // create kolab mail if success
+ /* create kolab mail if success */
if (*error == NULL)
kmail = conv_I_event_to_kolab_conv_mail(&ievent, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_kolab_mail("output data:", kmail);
return kmail;
}
@@ -372,12 +372,12 @@ kolabconv_ktask_to_etask (const Kolab_conv_mail* kmail, GError** error)
{
log_kolab_mail("input data:", kmail);
ECalComponentWithTZ *etask = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_task *itask = conv_kolab_conv_mail_to_I_task(kmail, error);
- // create evolution pim object if success
+ /* create evolution pim object if success */
if (*error == NULL)
etask = conv_I_task_to_ECalComponentWithTZ(&itask, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_evolution_ical("output data:", etask);
return etask;
}
@@ -399,12 +399,12 @@ kolabconv_etask_to_ktask (const ECalComponentWithTZ* ecalcomp, GError** error)
{
log_evolution_ical("input data:", ecalcomp);
Kolab_conv_mail *kmail = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_task *itask = conv_ECalComponentWithTZ_to_I_task(ecalcomp, error);
- // create kolab mail if success
+ /* create kolab mail if success */
if (*error == NULL)
kmail = conv_I_task_to_kolab_conv_mail(&itask, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_kolab_mail("output data:", kmail);
return kmail;
}
@@ -425,12 +425,12 @@ kolabconv_knote_to_enote (const Kolab_conv_mail* kmail, GError** error)
{
log_kolab_mail("input data:", kmail);
ECalComponentWithTZ *enote = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_note *inote = conv_kolab_conv_mail_to_I_note(kmail, error);
- // create evolution pim object if success
+ /* create evolution pim object if success */
if (*error == NULL)
enote = conv_I_note_to_ECalComponentWithTZ(&inote, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_evolution_ical("output data:", enote);
return enote;
}
@@ -452,12 +452,12 @@ kolabconv_enote_to_knote (const ECalComponentWithTZ* ecalcomp, GError** error)
{
log_evolution_ical("input data:", ecalcomp);
Kolab_conv_mail *kmail = NULL;
- // create internal pim struct
+ /* create internal pim struct */
I_note *inote = conv_ECalComponentWithTZ_to_I_note(ecalcomp, error);
- // create kolab mail if success
+ /* create kolab mail if success */
if (*error == NULL)
kmail = conv_I_note_to_kolab_conv_mail(&inote, error);
- // internal pim struct is freed in the above operation already
+ /* internal pim struct is freed in the above operation already */
log_kolab_mail("output data:", kmail);
return kmail;
}
@@ -546,7 +546,7 @@ kolabconv_free_kmail(Kolab_conv_mail *kmail)
*
* free Kolab_conv_mail_part.
*/
-//void kolabconv_free_kmail_part(Kolab_conv_mail_part **mailpart)
+/* void kolabconv_free_kmail_part(Kolab_conv_mail_part **mailpart) */
void kolabconv_free_kmail_part(void **mailpart)
{
if (mailpart && *mailpart) {
diff --git a/src/libekolabconv/main/src/kolab-conv.h b/src/libekolabconv/main/src/kolab-conv.h
index f385c27..149b118 100644
--- a/src/libekolabconv/main/src/kolab-conv.h
+++ b/src/libekolabconv/main/src/kolab-conv.h
@@ -97,20 +97,20 @@ typedef enum {
*/
typedef struct {
- gchar *name; // name of the mail part
- gchar *mime_type; // mimetype of the mail part
- guint length; // size of the data of the mail part
- gchar *data; // the data of the mail part
+ gchar *name; /* name of the mail part */
+ gchar *mime_type; /* mimetype of the mail part */
+ guint length; /* size of the data of the mail part */
+ gchar *data; /* the data of the mail part */
} Kolab_conv_mail_part;
typedef struct {
Kolab_conv_mail_part *mail_parts;
- guint length; // number of mail parts
+ guint length; /* number of mail parts */
} Kolab_conv_mail;
typedef struct {
ECalComponent *maincomp;
- ECalComponent *timezone; // can be null for UTC
+ ECalComponent *timezone; /* can be null for UTC */
} ECalComponentWithTZ;
/**
@@ -167,7 +167,7 @@ ECalComponent* kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (
void kolabconv_free_econtact(EContact *econtact);
void kolabconv_free_ecalendar(ECalComponentWithTZ *ecalcomp);
void kolabconv_free_kmail(Kolab_conv_mail *kmail);
-//void kolabconv_free_kmail_part(Kolab_conv_mail_part **mailpart);
+/* void kolabconv_free_kmail_part(Kolab_conv_mail_part **mailpart); */
void kolabconv_free_kmail_part(void **mailpart);
#endif /* KOLABCONV_H_ */
diff --git a/src/libekolabconv/main/src/kolab/contact-i-to-k.c b/src/libekolabconv/main/src/kolab/contact-i-to-k.c
index 20f0d11..68661de 100644
--- a/src/libekolabconv/main/src/kolab/contact-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/contact-i-to-k.c
@@ -24,9 +24,9 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
#include "../util.h"
-#include <libxml/tree.h> // XML parsing
+#include <libxml/tree.h> /* XML parsing */
/*
* Prototypes for static functions
@@ -75,22 +75,24 @@ process_contact_i_to_k (I_contact **i_contact_ptr)
log_debug("\nXml Text:\n%s",xml_text);
- //ADD XML mailPart
+ /* ADD XML mailPart */
mail_part = g_new0(Kolab_conv_mail_part, 1);
mail_part->data = xml_text;
mail_part->length = strlen (xml_text);
mail_part->mime_type = g_strdup ("application/x-vnd.kolab.contact");
- mail_part->name = g_strdup ("kolab-common1.xml");//Change it after adding a field in contact.h
- //mailPart->order = 1; //Change it after adding a field in contact.h
+ mail_part->name = g_strdup ("kolab-common1.xml"); /* Change it after adding a field in contact.h */
+ /* mailPart->order = 1; Change it after adding a field in contact.h */
mail_part_list = g_list_append (mail_part_list, (Kolab_conv_mail_part *) mail_part);
- //ADD Picture Attachment
+ /* ADD Picture Attachment */
if (i_contact->photo != NULL) {
-// mail_part = clone_kolab_conv_mail_part(i_contact->photo);
-// mail_part = i_contact->photo;
+#if 0
+ mail_part = clone_kolab_conv_mail_part(i_contact->photo);
+ mail_part = i_contact->photo;
+#endif
mail_part_list = g_list_append (mail_part_list, i_contact->photo);
- i_contact->photo = NULL; // so that free_i_contact() doesn't free the struct
+ i_contact->photo = NULL; /* so that free_i_contact() doesn't free the struct */
}
mail_part_list = g_list_concat(mail_part_list, g_list_copy(i_contact->common->kolab_attachment_store));
@@ -124,7 +126,7 @@ i_contact_to_xml (const I_contact* i_contact)
doc = xmlNewDoc(BAD_CAST "1.0");
root_node = xmlNewNode(NULL, BAD_CAST KLB_CNT);
add_property (root_node, "version", "1.0");
- //xmlNodeSetContent(root_node, BAD_CAST "content");
+ /* xmlNodeSetContent(root_node, BAD_CAST "content"); */
xmlDocSetRootElement (doc, root_node);
common_i_to_k(root_node, i_contact->common);
@@ -200,17 +202,17 @@ i_contact_to_xml (const I_contact* i_contact)
{
if (strcmp(phone_nr->number, phone_nr_next->number) == 0
&& phone_nr->type != ICONTACT_PHONE_PRIMARY
- && phone_nr_next->type == ICONTACT_PHONE_PRIMARY ) // TODO: Reconsider if primary number is still next element after reconverting from evolution, or if it has to be searched in the whole list.
+ && phone_nr_next->type == ICONTACT_PHONE_PRIMARY ) /* TODO: Reconsider if primary number is still next element after reconverting from evolution, or if it has to be searched in the whole list. */
{
if (phone_nr->type == ICONTACT_PHONE_BUSINESS_1)
{
- phone_nr->type = ICONTACT_PHONE_BUSINESS_2; // business 2 = business 1 + primary
- iterator = iterator->next; // -primary
+ phone_nr->type = ICONTACT_PHONE_BUSINESS_2; /* business 2 = business 1 + primary */
+ iterator = iterator->next; /* -primary */
}
else if (phone_nr->type == ICONTACT_PHONE_HOME_1)
{
- phone_nr->type = ICONTACT_PHONE_HOME_2; // home 2 = home 1 + primary
- iterator = iterator->next; // -primary
+ phone_nr->type = ICONTACT_PHONE_HOME_2; /* home 2 = home 1 + primary */
+ iterator = iterator->next; /* -primary */
}
}
}
@@ -227,7 +229,7 @@ i_contact_to_xml (const I_contact* i_contact)
}
g_list_free(iterator);
- // E-Mails
+ /* E-Mails */
iterator = i_contact->emails;
while (iterator != NULL) {
@@ -237,7 +239,7 @@ i_contact_to_xml (const I_contact* i_contact)
if (email->smtp_address)
add_child_node (node, KLB_CNT_EMAIL_SMTP_ADDRESS, email->smtp_address->str);
- // display name and unknown elements in kolab store
+ /* display name and unknown elements in kolab store */
i_kolab_store_get_xml_nodes(i_contact->common, email, node);
iterator = iterator->next;
@@ -245,7 +247,7 @@ i_contact_to_xml (const I_contact* i_contact)
g_list_free(iterator);
- // Addresses
+ /* Addresses */
iterator = i_contact->addresses;
while (iterator != NULL) {
Address *address = ((Address *) iterator->data);
@@ -253,7 +255,7 @@ i_contact_to_xml (const I_contact* i_contact)
node = add_child_node (root_node, KLB_CNT_ADDRESS_LIST, NULL);
if (address->type)
add_child_node (node, KLB_CNT_ADDRESS_TYPE, address_type_i_to_k(address->type));
- //add_child_node(node, "x-kde-type", anAddress->address_type);
+ /* add_child_node(node, "x-kde-type", anAddress->address_type); */
if (address->street)
add_child_node (node, KLB_CNT_ADDRESS_STREET, address->street->str);
if (address->pobox)
@@ -274,7 +276,7 @@ i_contact_to_xml (const I_contact* i_contact)
}
g_list_free(iterator);
- // GEO
+ /* GEO */
if (i_contact->latitude >= -90 && i_contact->latitude <= 90
&& i_contact->longitude >= -180 && i_contact->longitude <= 180) {
gchar *lat = g_strdup_printf("%.16f", i_contact->latitude);
@@ -287,32 +289,32 @@ i_contact_to_xml (const I_contact* i_contact)
i_kolab_store_get_xml_nodes(i_contact->common, i_contact->common, root_node);
- //Add x-custom fields in xmltree from the custom-list of icontact.
+ /* Add x-custom fields in xmltree from the custom-list of icontact. */
iterator = i_contact->custom_list;
while (iterator != NULL) {
Custom * custom_field = ((Custom *) iterator->data);
- //log_debug("\nCustom field to be put in xml is: app=%s, name=%s, value=%s\n",
- //customField->app->str, customField->name->str, customField->value->str);
+ /* log_debug("\nCustom field to be put in xml is: app=%s, name=%s, value=%s\n", */
+ /* customField->app->str, customField->name->str, customField->value->str); */
node = add_child_node (root_node, KLBX_CNT_X_CUSTOM_LIST, NULL);
add_property (node, KLBX_CNT_X_CUSTOM_VALUE, custom_field->value->str);
add_property (node, KLBX_CNT_X_CUSTOM_APP, custom_field->app->str);
add_property (node, KLBX_CNT_X_CUSTOM_NAME, custom_field->name->str);
- //Add x-custom node to the main xml tree node.
+ /* Add x-custom node to the main xml tree node. */
xmlAddChild (root_node, node);
iterator = iterator->next;
}
g_list_free(iterator);
- //Convert xml to a string
+ /* Convert xml to a string */
xmlDocDumpFormatMemoryEnc (doc, &xml_buf, &buf_size, "UTF-8", 1);
g_string_append (xml_string, (gchar*) xml_buf);
- //log_debug("%s", (gchar *) xml_buf);
+ /* log_debug("%s", (gchar *) xml_buf); */
- //free associated memory.
+ /* free associated memory. */
xmlFree (xml_buf);
xmlFreeDoc (doc);
diff --git a/src/libekolabconv/main/src/kolab/contact-k-to-i.c b/src/libekolabconv/main/src/kolab/contact-k-to-i.c
index 503c464..e469008 100644
--- a/src/libekolabconv/main/src/kolab/contact-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/contact-k-to-i.c
@@ -32,7 +32,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
#include "../util.h"
/*
@@ -72,14 +72,14 @@ conv_kolab_conv_mail_to_I_contact (const Kolab_conv_mail* k_contact, GError** er
if (*error != NULL)
return NULL;
- // get parsed kolab XML
+ /* get parsed kolab XML */
I_contact *i_contact = new_i_contact ();
xmlDocPtr doc = util_get_kolab_xml_part(k_contact, &i_contact->common->kolab_attachment_store, error);
if (*error != NULL)
return NULL;
- // find root node
+ /* find root node */
xmlNodePtr node = NULL, n_ptr;
for (n_ptr = doc->children; n_ptr != NULL; n_ptr = n_ptr->next)
if (n_ptr->type == XML_ELEMENT_NODE &&
@@ -127,8 +127,8 @@ conv_kolab_conv_mail_to_I_contact (const Kolab_conv_mail* k_contact, GError** er
static void
process_contact_k_to_i (I_contact *i_contact, const xmlNodePtr node, GError** error)
{
- // iterate over all child elements of event_node an process them
- xmlNodePtr n_ptr; // used in for loop
+ /* iterate over all child elements of event_node an process them */
+ xmlNodePtr n_ptr; /* used in for loop */
for (n_ptr = node->children; n_ptr != NULL; n_ptr = n_ptr->next) {
if (n_ptr->type == XML_ELEMENT_NODE) {
gboolean node_processed = read_contact_element(i_contact, n_ptr, error);
@@ -157,13 +157,13 @@ static void
process_attachments_k_to_i (I_contact* i_contact, GError** error)
{
g_assert(error != NULL && *error == NULL);
- //iteration of kolabXmlMailArray for adding attachments
+ /* iteration of kolabXmlMailArray for adding attachments */
GList *attach = i_contact->common->kolab_attachment_store;
while (attach) {
Kolab_conv_mail_part *mail_part = attach->data;
-// if (i_contact->picture_name && strcmp (i_contact->picture_name->str, mail_part->name) == 0) {
+ /* if (i_contact->picture_name && strcmp (i_contact->picture_name->str, mail_part->name) == 0) { */
if (i_contact->photo && i_contact->photo->name && strcmp (i_contact->photo->name, mail_part->name) == 0) {
g_free(i_contact->photo->name);
g_free(i_contact->photo);
@@ -192,7 +192,7 @@ static gboolean
read_contact_element(I_contact *i_contact, xmlNodePtr node, GError **error)
{
if (common_k_to_i(i_contact->common, node, error)) {
- return handle_sensitivity(i_contact, node); // node processed if it is not sensitivity
+ return handle_sensitivity(i_contact, node); /* node processed if it is not sensitivity */
} else if (*error != NULL)
return FALSE;
@@ -201,7 +201,7 @@ read_contact_element(I_contact *i_contact, xmlNodePtr node, GError **error)
handle_element_string(KLB_CNT_FREE_BUSY_URL, &i_contact->free_busy_url, node) ||
handle_element_string(KLB_CNT_ORGANIZATION, &i_contact->organization, node) ||
handle_element_string(KLB_CNT_WEB_PAGE, &i_contact->web_page, node) ||
- // im-address: not available in Evolution, written in kolab store
+ /* im-address: not available in Evolution, written in kolab store */
handle_element_string(KLB_CNT_DEPARTMENT, &i_contact->department, node) ||
handle_element_string(KLB_CNT_OFFICE_LOCATION, &i_contact->office_location, node) ||
handle_element_string(KLB_CNT_PROFESSION, &i_contact->profession, node) ||
@@ -213,14 +213,15 @@ read_contact_element(I_contact *i_contact, xmlNodePtr node, GError **error)
handle_element_date(KLB_CNT_BIRTHDAY, &i_contact->birthday, node) ||
handle_element_date(KLB_CNT_ANNIVERSARY, &i_contact->anniversary, node) ||
handle_picture_name(i_contact, node) ||
-// handle_element_string(KLB_CNT_PICTURE, &i_contact->picture_name, node) ||
- // children: not available in Evolution, written in kolab store
- // gender: not available in Evolution, written in kolab store
- // language: not available in Evolution, written in kolab store
+ /* handle_element_string(KLB_CNT_PICTURE, &i_contact->picture_name, node) || */
+ /* children: not available in Evolution, written in kolab store
+ * gender: not available in Evolution, written in kolab store
+ * language: not available in Evolution, written in kolab store
+ */
handle_element_phone (i_contact, node) ||
handle_element_email (i_contact, node) ||
handle_element_address (i_contact, node) ||
- // preferred address: not available in Evolution, written in kolab store
+ /* preferred address: not available in Evolution, written in kolab store */
handle_element_double (KLB_CNT_LATITUDE, &i_contact->latitude, node) ||
handle_element_double (KLB_CNT_LONGITUDE, &i_contact->longitude, node) ||
handle_element_string(KLB_CNT_NAME_SUFFIX, &i_contact->suffix, node) ||
@@ -231,10 +232,11 @@ static gboolean
handle_sensitivity(I_contact *i_contact, xmlNodePtr node)
{
if (strcmp ((gchar*) node->name, KLB_CMN_SENSITIVITY) != 0)
- return TRUE; // Not sensitivity node, so node is processed.
+ return TRUE; /* Not sensitivity node, so node is processed. */
- // Otherwise it is the sensitivity node and will be reset to null,
- // and returned false for not processed, that it will be put in kolab store.
+ /* Otherwise it is the sensitivity node and will be reset to null,
+ * and returned false for not processed, that it will be put in kolab store.
+ */
i_contact->common->sensitivity = ICOMMON_SENSITIVITY_NULL;
return FALSE;
}
@@ -243,18 +245,19 @@ static gboolean
handle_picture_name (I_contact *i_contact, xmlNodePtr node)
{
if (strcmp ((gchar*) node->name, KLB_CNT_PICTURE) != 0)
- return FALSE; // Not a photo_name node
+ return FALSE; /* Not a photo_name node */
char* picture_name = xml_get_node_text(node);
- // create mail part and set name if not empty
+ /* create mail part and set name if not empty */
if (*picture_name) {
i_contact->photo = g_new0(Kolab_conv_mail_part, 1);
i_contact->photo->name = g_strdup_printf("%s", picture_name);
}
-// else
-// i_contact->photo = NULL;
-
+#if 0
+ else
+ i_contact->photo = NULL;
+#endif
return TRUE;
}
@@ -279,15 +282,16 @@ handle_element_custom (I_contact *i_contact, const xmlNodePtr node)
if (xmlHasProp (node, (xmlChar*) KLBX_CNT_X_CUSTOM_NAME))
node_name = xmlGetProp (node, (xmlChar*) KLBX_CNT_X_CUSTOM_NAME);
- // split value string if delimiter is available
- // Kontact saves values of datasets from the same type in same xml tag value with delimiter
+ /* split value string if delimiter is available
+ * Kontact saves values of datasets from the same type in same xml tag value with delimiter
+ */
gchar *str = (gchar*)node_value;
- gchar *delim = "\356\200\200"; // î separator written by Kontact (=EE=84=A0)
+ gchar *delim = "\356\200\200"; /* î separator written by Kontact (=EE=84=A0) */
gchar **tokens = str_split(str, delim);
gint i;
for (i = 0; tokens[i]; ++i) {
- //Add a new custom field to the contact object member custom_list
+ /* Add a new custom field to the contact object member custom_list */
Custom *custom_field = g_new (Custom, 1);
custom_field->value = g_string_new(tokens[i]);
custom_field->app = g_string_new ((gchar *) node_app);
@@ -295,7 +299,7 @@ handle_element_custom (I_contact *i_contact, const xmlNodePtr node)
i_contact->custom_list = g_list_append (i_contact->custom_list, (Custom *) custom_field);
- //printf("%i: '%s'\n", i, tokens[i]);
+ /* printf("%i: '%s'\n", i, tokens[i]); */
}
free_str_tokens(tokens);
@@ -325,7 +329,7 @@ handle_element_phone (I_contact *i_contact, const xmlNodePtr node)
if (strcmp ((gchar*) node->name, KLB_CNT_PHONE_LIST) != 0)
return FALSE;
- const guint max_numbers = 8; // maximum values that can be shown by evolution, remaining numbers in kolab-store
+ const guint max_numbers = 8; /* maximum values that can be shown by evolution, remaining numbers in kolab-store */
xmlNodePtr text = node->children;
xmlNodePtr child = NULL;
@@ -347,33 +351,33 @@ handle_element_phone (I_contact *i_contact, const xmlNodePtr node)
} while (text->next != NULL);
- // special case for combined types with primary
+ /* special case for combined types with primary */
if (phone_nr->type == ICONTACT_PHONE_BUSINESS_2 || phone_nr->type == ICONTACT_PHONE_HOME_2) {
- // if type that has to be saved a two nodes, there must be 2 free places in array
+ /* if type that has to be saved a two nodes, there must be 2 free places in array */
if (g_list_length(i_contact->phone_numbers) < max_numbers-1) {
- if (phone_nr->type == ICONTACT_PHONE_BUSINESS_2) // business 2 = business 1 & primary
+ if (phone_nr->type == ICONTACT_PHONE_BUSINESS_2) /* business 2 = business 1 & primary */
phone_nr->type = ICONTACT_PHONE_BUSINESS_1;
- else if (phone_nr->type == ICONTACT_PHONE_HOME_2) // home 2 = home 1 & primary
+ else if (phone_nr->type == ICONTACT_PHONE_HOME_2) /* home 2 = home 1 & primary */
phone_nr->type = ICONTACT_PHONE_HOME_1;
i_contact->phone_numbers = g_list_append (i_contact->phone_numbers, (Phone_number *) phone_nr);
- // additional primary node // + primary
+ /* additional primary node */ /* + primary */
Phone_number *primary_phone = g_new0 (Phone_number, 1);
primary_phone->type = ICONTACT_PHONE_PRIMARY;
primary_phone->number = g_strdup(phone_nr->number);
i_contact->phone_numbers = g_list_append (i_contact->phone_numbers, (Phone_number *) primary_phone);
} else {
- // array full, put in kolab store
+ /* array full, put in kolab store */
free_phone_number((void **) &phone_nr);
i_kolab_store_add_xml_element(i_contact->common, i_contact->common, node);
}
} else if (g_list_length(i_contact->phone_numbers) < max_numbers) {
- // if normal type, saved as one node, there must be 1 free place in array
+ /* if normal type, saved as one node, there must be 1 free place in array */
i_contact->phone_numbers = g_list_append (i_contact->phone_numbers, (Phone_number *) phone_nr);
} else {
- // array full, put in kolab store
+ /* array full, put in kolab store */
free_phone_number((void **) &phone_nr);
i_kolab_store_add_xml_element(i_contact->common, i_contact->common, node);
}
@@ -468,16 +472,16 @@ handle_element_address (I_contact *i_contact, const xmlNodePtr node)
i_kolab_store_add_xml_element(i_contact->common, address, child);
text = child->next;
- //log_debug("\nBBB: %s-%s-%s-%s",text->name, text->content, child->name, child->content);
- //log_debug("\nAAA%s", (char *)text->next);
+ /* log_debug("\nBBB: %s-%s-%s-%s",text->name, text->content, child->name, child->content); */
+ /* log_debug("\nAAA%s", (char *)text->next); */
} while (text->next != NULL);
- // test if element of same type still in address list (evolution can just handle one of each type)
+ /* test if element of same type still in address list (evolution can just handle one of each type) */
if (g_list_find_custom(i_contact->addresses, &address->type, (GCompareFunc)strcmp)) {
- // TODO Remove, if needed, child-element from store, because in this case full address will be put in kolab store.
- // g_hash_table_remove(i_contact->common->kolab_store, child);
- return FALSE; // return element not handled, then will be put in kolab store
+ /* TODO Remove, if needed, child-element from store, because in this case full address will be put in kolab store. */
+ /* g_hash_table_remove(i_contact->common->kolab_store, child); */
+ return FALSE; /* return element not handled, then will be put in kolab store */
}
else
{
@@ -499,8 +503,8 @@ handle_contact_name (I_contact *i_contact, xmlNodePtr node)
if (strcmp ((gchar*) node->name, KLB_CNT_NAME) != 0)
return FALSE;
- // iterate over all child elements of node an process them
- xmlNodePtr n_ptr; // used in for loop
+ /* iterate over all child elements of node an process them */
+ xmlNodePtr n_ptr; /* used in for loop */
for (n_ptr = node->children; n_ptr != NULL; n_ptr = n_ptr->next) {
if (n_ptr->type == XML_ELEMENT_NODE) {
if(
@@ -508,7 +512,7 @@ handle_contact_name (I_contact *i_contact, xmlNodePtr node)
handle_element_string(KLB_CNT_NAME_MIDDLE_NAMES, &i_contact->middle_names, n_ptr) ||
handle_element_string(KLB_CNT_NAME_LAST_NAME, &i_contact->last_name, n_ptr) ||
handle_element_string(KLB_CNT_NAME_FULL_NAME, &i_contact->full_name, n_ptr) ||
- // TODO: Contact: <initials> ?!!!
+ /* TODO: Contact: <initials> ?!!! */
handle_element_string(KLB_CNT_NAME_PREFIX, &i_contact->prefix, n_ptr) ||
handle_element_string(KLB_CNT_NAME_SUFFIX, &i_contact->suffix, n_ptr)
)
diff --git a/src/libekolabconv/main/src/kolab/event-i-to-k.c b/src/libekolabconv/main/src/kolab/event-i-to-k.c
index 68a2fd7..d8dca10 100644
--- a/src/libekolabconv/main/src/kolab/event-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/event-i-to-k.c
@@ -25,7 +25,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
#include "../util.h"
/*
@@ -48,16 +48,16 @@ conv_I_event_to_kolab_conv_mail (I_event **i_event_ptr, GError **error)
Kolab_conv_mail_part *mail_part;
gchar * xml_text = i_event_to_xml(i_event);
- //log_debug("\n\nXml Text:\n%s",xmlText);
+ /* log_debug("\n\nXml Text:\n%s",xmlText); */
- //ADD XML mailPart
+ /* ADD XML mailPart */
mail_part = g_new0(Kolab_conv_mail_part, 1);
mail_part->data = xml_text;
mail_part->length = strlen(xml_text);
- // static strings must be copied because they will get freed later
+ /* static strings must be copied because they will get freed later */
mail_part->mime_type = strdup("application/x-vnd.kolab.event");
- mail_part->name = strdup("kolab-common1.xml"); //Change it after adding a field in contact.h
- //mailPart->order = 1; //Change it after adding a field in contact.h
+ mail_part->name = strdup("kolab-common1.xml"); /* Change it after adding a field in contact.h */
+ /* mailPart->order = 1; Change it after adding a field in contact.h */
mail_part_list = g_list_append(mail_part_list, mail_part);
@@ -83,7 +83,7 @@ i_event_to_xml(const I_event *i_event)
doc = xmlNewDoc(BAD_CAST "1.0");
root_node = xmlNewNode(NULL, BAD_CAST KLB_EVENT);
add_property (root_node, "version", "1.0");
- //xmlNodeSetContent(root_node, BAD_CAST "content");
+ /* xmlNodeSetContent(root_node, BAD_CAST "content"); */
xmlDocSetRootElement(doc, root_node);
conv_incidence_i_to_k(root_node, i_event->incidence);
@@ -97,12 +97,12 @@ i_event_to_xml(const I_event *i_event)
}
i_kolab_store_get_xml_nodes(i_event->incidence->common, i_event->incidence->common, root_node);
- //Convert xml to a string
+ /* Convert xml to a string */
xmlDocDumpFormatMemoryEnc(doc, &xml_buf, &buf_size, "UTF-8", 1);
g_string_append(xml_string, (gchar*) xml_buf);
- //log_debug("%s", (char *) xmlbuff);
+ /* log_debug("%s", (char *) xmlbuff); */
- // Free associated memory.
+ /* Free associated memory. */
xmlFree(xml_buf);
xmlFreeDoc(doc);
@@ -124,17 +124,15 @@ show_time_as_to_kolab_string (Show_time_as show_time_as)
return KLB_EVENT_SHOW_TIME_AS_FREE;
break;
case SHOW_TIME_AS_TENTATIVE:
- return KLB_EVENT_SHOW_TIME_AS_BUSY; // KLB_EVENT_SHOW_TIME_AS_TENTATIVE;
+ return KLB_EVENT_SHOW_TIME_AS_BUSY; /* KLB_EVENT_SHOW_TIME_AS_TENTATIVE; */
break;
case SHOW_TIME_AS_BUSY:
return KLB_EVENT_SHOW_TIME_AS_BUSY;
break;
case SHOW_TIME_AS_OUT_OF_OFFICE:
- return KLB_EVENT_SHOW_TIME_AS_BUSY; // KLB_EVENT_SHOW_TIME_AS_OUT_OF_OFFICE;
+ return KLB_EVENT_SHOW_TIME_AS_BUSY; /* KLB_EVENT_SHOW_TIME_AS_OUT_OF_OFFICE; */
break;
default:
return KLB_EVENT_SHOW_TIME_AS_BUSY;
}
}
-
-
diff --git a/src/libekolabconv/main/src/kolab/event-k-to-i.c b/src/libekolabconv/main/src/kolab/event-k-to-i.c
index cd65f20..f02c065 100644
--- a/src/libekolabconv/main/src/kolab/event-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/event-k-to-i.c
@@ -32,7 +32,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
/*
* Prototypes for static functions
@@ -65,14 +65,14 @@ conv_kolab_conv_mail_to_I_event (const Kolab_conv_mail *k_event, GError **error)
if (*error != NULL)
return NULL;
- // get parsed kolab XML
+ /* get parsed kolab XML */
I_event *ievent = new_i_event ();
xmlDocPtr doc = util_get_kolab_xml_part(k_event, &ievent->incidence->common->kolab_attachment_store, error);
if (*error != NULL)
return NULL;
- // find root node
+ /* find root node */
xmlNodePtr node = NULL, n;
for (n = doc->children; n != NULL; n = n->next)
if (n->type == XML_ELEMENT_NODE && g_strcmp0((gchar*)n->name, KLB_EVENT) == 0)
@@ -105,14 +105,15 @@ conv_kolab_conv_mail_to_I_event (const Kolab_conv_mail *k_event, GError **error)
static void
read_event(I_event *ievent, xmlNodePtr node, GError **error)
{
- xmlNodePtr rec_ptr = NULL; // pointer used to temporarily store recurrence node
+ xmlNodePtr rec_ptr = NULL; /* pointer used to temporarily store recurrence node */
- xmlNodePtr n_ptr; // used in for loop
+ xmlNodePtr n_ptr; /* used in for loop */
for (n_ptr = node->children; n_ptr != NULL; n_ptr = n_ptr->next) {
if (n_ptr->type == XML_ELEMENT_NODE) {
- // save recurrence node in case recurrence has to be
- // stored in kolabstore due to missing start_date
+ /* save recurrence node in case recurrence has to be
+ * stored in kolabstore due to missing start_date
+ */
if (strcmp ((gchar*) node->name, KLB_INC_RECURRENCE) == 0)
rec_ptr = node;
@@ -126,7 +127,7 @@ read_event(I_event *ievent, xmlNodePtr node, GError **error)
log_debug("ignored XML node with name %s", n_ptr->name);
}
- // cannot be properly converted back from evolution, therefore => kolabstore
+ /* cannot be properly converted back from evolution, therefore => kolabstore */
if (ievent->incidence
&& ievent->incidence->recurrence
&& !ievent->incidence->start_date
@@ -138,7 +139,7 @@ read_event(I_event *ievent, xmlNodePtr node, GError **error)
i_kolab_store_add_xml_element(ievent->incidence->common, ievent->incidence->common, rec_ptr);
}
- //TODO: Validate ievent. (log warnings / create error if necessary)
+ /* TODO: Validate ievent. (log warnings / create error if necessary) */
}
@@ -155,11 +156,11 @@ handle_element_show_time_as (I_event *i_event, xmlNodePtr node)
if (g_strcmp0((gchar*) value, KLB_EVENT_SHOW_TIME_AS_FREE) == 0)
i_event->show_time_as = SHOW_TIME_AS_FREE;
else if (g_strcmp0((gchar*) value, KLB_EVENT_SHOW_TIME_AS_TENTATIVE) == 0)
- i_event->show_time_as = SHOW_TIME_AS_BUSY; // SHOW_TIME_AS_TENTATIVE;
+ i_event->show_time_as = SHOW_TIME_AS_BUSY; /* SHOW_TIME_AS_TENTATIVE; */
else if (g_strcmp0((gchar*) value, KLB_EVENT_SHOW_TIME_AS_BUSY) == 0)
i_event->show_time_as = SHOW_TIME_AS_BUSY;
else if (g_strcmp0((gchar*) value, KLB_EVENT_SHOW_TIME_AS_OUT_OF_OFFICE) == 0)
- i_event->show_time_as = SHOW_TIME_AS_BUSY; // SHOW_TIME_AS_OUT_OF_OFFICE;
+ i_event->show_time_as = SHOW_TIME_AS_BUSY; /* SHOW_TIME_AS_OUT_OF_OFFICE; */
else {
i_event->show_time_as = SHOW_TIME_AS_BUSY;
log_warn("illegal show_time_as value '%s' - set to default: Busy", value);
diff --git a/src/libekolabconv/main/src/kolab/kolab-constants.h b/src/libekolabconv/main/src/kolab/kolab-constants.h
index cc8ef3e6..c8c5c78 100644
--- a/src/libekolabconv/main/src/kolab/kolab-constants.h
+++ b/src/libekolabconv/main/src/kolab/kolab-constants.h
@@ -42,7 +42,7 @@
* [1] http://kolab.org/doc/kolabformat-2.0rc7-html/
*/
-// ------------------------------------------------------------- common fields {
+/* ------------------------------------------------------------- common fields { */
#define KLB_CMN_UID "uid"
#define KLB_CMN_BODY "body"
@@ -50,7 +50,7 @@
#define KLB_CMN_CREATION_DATE "creation-date"
#define KLB_CMN_LAST_MODIFICATION_DATE "last-modification-date"
-// tag from Kontact, showing if body text is with or without html
+/* tag from Kontact, showing if body text is with or without html */
#define KLBX_CMN_RICHTEXT "knotes-richtext"
#define KLB_CMN_SENSITIVITY "sensitivity"
@@ -66,11 +66,11 @@
#define KLB_CMN_EVO_STORE "x-kolabconv-store"
-// ------------------------------------------------------- own timezone fields }
+/* ------------------------------------------------------- own timezone fields } */
-// ------------------------------------------------------------- common fields }
+/* ------------------------------------------------------------- common fields } */
-// ---------------------------------------------------------- incidence fields {
+/* ---------------------------------------------------------- incidence fields { */
#define KLB_INC_SUMMARY "summary"
#define KLB_INC_LOCATION "location"
@@ -86,7 +86,7 @@
#define KLB_INC_START_DATE "start-date"
#define KLB_INC_ALARM "alarm"
-// ----------------------------------------------------- advanced alarm fields {
+/* ----------------------------------------------------- advanced alarm fields { */
/* advanced alarm fields are not defined in the kolab format specification
* see: http://www.kolab.org/pipermail/kolab-format/2008-September/000873.html
@@ -113,7 +113,7 @@
#define KLBX_INC_ADV_ALARM_REPEAT_COUNT "repeat-count"
#define KLBX_INC_ADV_ALARM_REPEAT_INTERVAL "repeat-interval"
-// ----------------------------------------------------- advanced alarm fields }
+/* ----------------------------------------------------- advanced alarm fields } */
#define KLB_INC_RECURRENCE "recurrence"
@@ -188,7 +188,7 @@
/** not part of the kolab format specification but written by kontact */
#define KLBX_INC_ATTENDEE_INVITATION_SENT "invitation-sent"
-// evolution alarm
+/* evolution alarm */
#define KLBC_INC_X_EVOLUTION_ALARM_UID "x-evolution-alarm-uid"
#define KLBC_INC_DESCRIPTION "description"
#define KLBC_INC_ACTION "action"
@@ -200,13 +200,15 @@
#define KLBC_INC_CUTYPE "cutype"
#define KLBC_INC_LANGUAGE "language"
-//Undecided fields
-//#define INCIDENCE_PILOT_SYNC_STATUS "pilot-sync-status"
-//#define INCIDENCE_DESCRIPTION ""
+/* Undecided fields */
+#if 0
+#define INCIDENCE_PILOT_SYNC_STATUS "pilot-sync-status"
+#define INCIDENCE_DESCRIPTION ""
+#endif
-// ---------------------------------------------------------- incidence fields }
+/* ---------------------------------------------------------- incidence fields } */
-// ------------------------------------------------------------ contact fields {
+/* ------------------------------------------------------------ contact fields { */
#define KLB_CNT "contact"
@@ -241,7 +243,7 @@
#define KLB_CNT_GENDER "gender"
#define KLB_CNT_LANGUAGE "language"
-#define KLB_CNT_PHONE_LIST "phone" // phone list
+#define KLB_CNT_PHONE_LIST "phone" /* phone list */
#define KLB_CNT_PHONE_TYPE "type"
#define KLB_CNT_PHONE_TYPE_ASSISTANT "assistant"
#define KLB_CNT_PHONE_TYPE_BUSINESS_1 "business1"
@@ -263,14 +265,14 @@
#define KLB_CNT_PHONE_TYPE_TTYTDD "ttytdd"
#define KLB_CNT_PHONE_NUMBER "number"
-#define KLB_CNT_EMAIL_LIST "email" // email list
+#define KLB_CNT_EMAIL_LIST "email" /* email list */
#define KLB_CNT_EMAIL_DISPLAY_NAME "display-name"
#define KLB_CNT_EMAIL_SMTP_ADDRESS "smtp-address"
#define KLBC_CNT_EMAIL_TYPE "x-evolution-email-type"
#define KLBC_CNT_EMAIL_X_EVOLUTION_UI_SLOT "x-evolution-ui-slot"
#define KLBC_CNT_EMAIL_X_MOZILLA_HTML "x-mozilla-html"
-#define KLB_CNT_ADDRESS_LIST "address" // address list
+#define KLB_CNT_ADDRESS_LIST "address" /* address list */
#define KLB_CNT_ADDRESS_TYPE "type"
#define KLB_CNT_ADDRESS_TYPE_HOME "home"
#define KLB_CNT_ADDRESS_TYPE_BUSINESS "business"
@@ -283,7 +285,7 @@
#define KLBX_CNT_ADDRESS_POBOX "pobox"
#define KLB_CNT_PREFERRED_ADDRESS "preferred-address"
-// GEO
+/* GEO */
#define KLB_CNT_LATITUDE "latitude"
#define KLB_CNT_LONGITUDE "longitude"
@@ -315,9 +317,9 @@
#define KLBC_CNT_X_EVOLUTION_LIST_SHOW_ADDRESSES "x-evolution-list-show-addresses"
-// ------------------------------------------------------------ contact fields }
+/* ------------------------------------------------------------ contact fields } */
-// -------------------------------------------------------------- event fields {
+/* -------------------------------------------------------------- event fields { */
#define KLB_EVENT "event"
@@ -346,9 +348,9 @@
#define KLBC_INCIDENCE_ATTENDEE_TYPE_RESOURCE "resource"
#define KLBC_INCIDENCE_ATTENDEE_TYPE_ROOM "room"
-// -------------------------------------------------------------- event fields }
+/* -------------------------------------------------------------- event fields } */
-// --------------------------------------------------------------- task fields {
+/* --------------------------------------------------------------- task fields { */
#define KLB_TASK "task"
@@ -366,9 +368,9 @@
#define KLBX_TASK_COMPLETED_DATE "x-completed-date"
-// --------------------------------------------------------------- task fields }
+/* --------------------------------------------------------------- task fields } */
-// --------------------------------------------------------------- note fields {
+/* --------------------------------------------------------------- note fields { */
#define KLB_NOTE "note"
@@ -376,6 +378,6 @@
#define KLB_NOTE_BACKGROUND_COLOR "background-color"
#define KLB_NOTE_FOREGROUND_COLOR "foreground-color"
-// --------------------------------------------------------------- note fields }
+/* --------------------------------------------------------------- note fields } */
#endif /* KOLAB_CONSTANTS_H_ */
diff --git a/src/libekolabconv/main/src/kolab/kolab-util.c b/src/libekolabconv/main/src/kolab/kolab-util.c
index 5525e0d..7e96e11 100644
--- a/src/libekolabconv/main/src/kolab/kolab-util.c
+++ b/src/libekolabconv/main/src/kolab/kolab-util.c
@@ -134,20 +134,20 @@ datetime_to_string (const time_t *time, gchar *date_string)
xmlDocPtr
util_get_kolab_xml_part(const Kolab_conv_mail *klb_mail, GList **other_parts, GError **error)
{
- // check input paramters
+ /* check input paramters */
if (klb_mail == NULL) {
g_set_error(error, KOLABCONV_ERROR_READ_KOLAB,
KOLABCONV_ERROR_READ_KOLAB_INPUT_IS_NULL,
"kolab mail struct must not be null");
return NULL;
}
- // iterate over mail parts, search kolab xml part, parse and return it
+ /* iterate over mail parts, search kolab xml part, parse and return it */
xmlDocPtr doc = NULL;
guint i;
for (i = 0; i < klb_mail->length; i++) {
Kolab_conv_mail_part *mail_part = klb_mail->mail_parts + i;
if (g_str_has_prefix(mail_part->mime_type, KOLAB_MESSAGE_MIMETYPE_PREFIX)) {
- // found kolab xml part => parse it in memory
+ /* found kolab xml part => parse it in memory */
doc = xmlReadMemory (mail_part->data, (int) mail_part->length, NULL, NULL, 0);
if (doc == NULL) {
g_set_error(error, KOLABCONV_ERROR_READ_KOLAB,
@@ -155,10 +155,10 @@ util_get_kolab_xml_part(const Kolab_conv_mail *klb_mail, GList **other_parts, GE
"xml parser returned null for data part %d", i);
return NULL;
}
- } else // part must be cloned here because it will be freed when converting from internal
+ } else /* part must be cloned here because it will be freed when converting from internal */
*other_parts = g_list_append(*other_parts, clone_kolab_conv_mail_part(mail_part));
}
- if (doc == NULL) // no kolab xml part could be found
+ if (doc == NULL) /* no kolab xml part could be found */
g_set_error(error, KOLABCONV_ERROR_READ_KOLAB,
KOLABCONV_ERROR_READ_KOLAB_MISSING_XML_PART,
"kolab mail struct has no kolab xml data part");
@@ -176,7 +176,7 @@ util_get_kolab_xml_part(const Kolab_conv_mail *klb_mail, GList **other_parts, GE
gchar*
xml_get_node_text(xmlNodePtr node)
{
- // get text content form node
+ /* get text content form node */
gchar* value = NULL;
xmlNodePtr n;
for (n = node->children; n != NULL; n = n->next) {
@@ -185,8 +185,9 @@ xml_get_node_text(xmlNodePtr node)
else
log_warn("tag %s is not a simple text element as expected", node->name);
}
- // if node has no text content set value to empty string to be able to
- // differentiate between an existing and a not existing element
+ /* if node has no text content set value to empty string to be able to
+ * differentiate between an existing and a not existing element
+ */
return value == NULL ? "" : value;
}
@@ -211,7 +212,7 @@ handle_element_GList_String (gchar* list_name, gchar* element_name, GList **stor
if (g_strcmp0 ((gchar *) node->name, list_name) != 0)
return FALSE;
- xmlNodePtr element_node; // used in for loop
+ xmlNodePtr element_node; /* used in for loop */
for (element_node = node->children; element_node != NULL; element_node = element_node->next) {
if (element_node->type == XML_ELEMENT_NODE) {
if (g_strcmp0 ((gchar *) element_node->name, element_name) == 0) {
@@ -240,14 +241,15 @@ handle_element_chars (gchar* name, gchar **store, xmlNodePtr node)
if (g_strcmp0 ((gchar *) node->name, name) != 0)
return FALSE;
- // GString store is expected NULL. If not, maybe the element
- // unexpectedly occurs multiple times => warn and reassign
+ /* GString store is expected NULL. If not, maybe the element
+ * unexpectedly occurs multiple times => warn and reassign
+ */
if (*store != NULL) {
log_warn("multiple assignment of string variable");
g_free(*store);
}
- // create gchar with the text content of the node
+ /* create gchar with the text content of the node */
*store = g_strdup_printf("%s", xml_get_node_text(node));
return TRUE;
}
@@ -269,8 +271,9 @@ handle_element_string (gchar* name, GString **store, xmlNodePtr node)
if (!handle_element_chars (name, &value, node))
return FALSE;
- // GString store is expected NULL. If not, maybe the element
- // unexpectedly occurs multiple times => warn and reassign
+ /* GString store is expected NULL. If not, maybe the element
+ * unexpectedly occurs multiple times => warn and reassign
+ */
if (*store != NULL) {
log_warn("multiple assignment of string variable");
g_string_free(*store, TRUE);
@@ -310,7 +313,7 @@ handle_element_integer (gchar* name, gint *store, xmlNodePtr node)
errno = 0;
*store = strtol(value, &p, 10);
if (errno != 0 || *p != 0 || p == value)
- log_warn("illegal integer value in element %s", name); //TODO: error handling
+ log_warn("illegal integer value in element %s", name); /* TODO: error handling */
return TRUE;
}
@@ -326,7 +329,7 @@ handle_element_double (gchar* name, gdouble *store, xmlNodePtr node)
errno = 0;
*store = strtod(value, &p);
if (errno != 0 || *p != 0 || p == value)
- log_warn("illegal double value in element %s", name); //TODO error handling
+ log_warn("illegal double value in element %s", name); /* TODO error handling */
return TRUE;
}
@@ -365,8 +368,9 @@ handle_element_date_or_datetime (gchar* name, Date_or_datetime** store, xmlNodeP
if (g_strcmp0 ((gchar *) node->name, name) != 0)
return FALSE;
- // store is expected NULL. If not, maybe the element
- // unexpectedly occurs multiple times => warn and reassign
+ /* store is expected NULL. If not, maybe the element
+ * unexpectedly occurs multiple times => warn and reassign
+ */
if (*store != NULL)
log_warn("multiple assignment of string variable");
else
@@ -377,7 +381,7 @@ handle_element_date_or_datetime (gchar* name, Date_or_datetime** store, xmlNodeP
g_debug ("**** handle_element_date_or_datetime() node: %s - value: '%s'", node->name, value);
if (strlen (value) < 12) {
- //Populate only date
+ /* Populate only date */
gchar** date_tokens = g_strsplit (value, "-", -1);
if (*date_tokens == NULL) {
*store = NULL;
@@ -395,14 +399,14 @@ handle_element_date_or_datetime (gchar* name, Date_or_datetime** store, xmlNodeP
g_strfreev(date_tokens);
} else {
- // convert string to 'struct tm'
- if (value[10] == 'T') // remove 'T' in iso timestamp if neccessary
+ /* convert string to 'struct tm' */
+ if (value[10] == 'T') /* remove 'T' in iso timestamp if neccessary */
value[10] = ' ';
struct tm t;
- strptime(value, "%Y-%m-%d %H:%M:%S", &t); // string to tm
+ strptime(value, "%Y-%m-%d %H:%M:%S", &t); /* string to tm */
- time_t tt = time_gm(&t); // tm to seconds
+ time_t tt = time_gm(&t); /* tm to seconds */
g_debug ("**** handle_element_date_or_datetime() tt: '%lu'", tt);
@@ -421,8 +425,9 @@ handle_element_datetime (gchar* name, time_t** store, xmlNodePtr node) {
if (g_strcmp0 ((gchar *) node->name, name) != 0)
return FALSE;
- // store is expected NULL. If not, maybe the element
- // unexpectedly occurs multiple times => warn and reassign
+ /* store is expected NULL. If not, maybe the element
+ * unexpectedly occurs multiple times => warn and reassign
+ */
if (*store != NULL)
log_warn("multiple assignment of string variable");
else
@@ -430,19 +435,19 @@ handle_element_datetime (gchar* name, time_t** store, xmlNodePtr node) {
gchar *value = xml_get_node_text(node);
- // convert string to 'struct tm'
- if (value[10] == 'T') // remove 'T' in iso timestamp if neccessary
+ /* convert string to 'struct tm' */
+ if (value[10] == 'T') /* remove 'T' in iso timestamp if neccessary */
value[10] = ' ';
struct tm t;
- strptime(value, "%Y-%m-%d %H:%M:%S", &t); // string to tm
+ strptime(value, "%Y-%m-%d %H:%M:%S", &t); /* string to tm */
- **store = time_gm(&t); // tm to seconds
+ **store = time_gm(&t); /* tm to seconds */
return TRUE;
}
-// XML-TREE manipulation functions
+/* XML-TREE manipulation functions */
/*
* converts a GList of strings to xml nodes with the same name below one node
@@ -515,7 +520,7 @@ printKolabXmlMailPartArray(const GList* kolabconvMailArray)
gint i=1;
while(iterator != NULL){
log_debug("\n\nFile no. %d", i);
- //log_debug("\n\tOrder: %d", ((Kolab_conv_mail_part*)iterator->data)->order );
+ /* log_debug("\n\tOrder: %d", ((Kolab_conv_mail_part*)iterator->data)->order ); */
log_debug("\n\tMimeType: %s", ((Kolab_conv_mail_part*)iterator->data)->mime_type );
log_debug("\n\tName: %s", ((Kolab_conv_mail_part*)iterator->data)->name );
log_debug("\n\tLength: %d", ((Kolab_conv_mail_part*)iterator->data)->length );
@@ -558,7 +563,7 @@ printXMLTree (xmlNodePtr node, int depth)
xmlNodePtr
add_child_node (xmlNodePtr root_node, gchar *child_name, gchar *child_contents)
{
- // xmlNewTextChild() implicitly converts reserved XML characters (e.g. '&') to entities
+ /* xmlNewTextChild() implicitly converts reserved XML characters (e.g. '&') to entities */
return xmlNewTextChild (root_node, NULL, BAD_CAST child_name, BAD_CAST child_contents);
}
@@ -569,9 +574,11 @@ add_property (xmlNodePtr node, gchar *propertyName, gchar *propertyContents)
}
-/** This formats a UTC offset as "+HHMM" or "+HHMMSS".
- buffer should have space for 8 characters. */
-// copied form libical/src/libical/icaltimezone.c
+/**
+ * This formats a UTC offset as "+HHMM" or "+HHMMSS".
+ * buffer should have space for 8 characters.
+ * (copied form libical/src/libical/icaltimezone.c)
+ */
void
format_utc_offset (gint utc_offset, gchar *buffer)
{
diff --git a/src/libekolabconv/main/src/kolab/kolab-util.h b/src/libekolabconv/main/src/kolab/kolab-util.h
index b902405..0de3e4a 100644
--- a/src/libekolabconv/main/src/kolab/kolab-util.h
+++ b/src/libekolabconv/main/src/kolab/kolab-util.h
@@ -26,18 +26,20 @@
#ifndef KOLAB_UTIL_H_
#define KOLAB_UTIL_H_
-#include <glib.h> // GError
-#include <libxml/tree.h> // XML parsing
-#include "../kolab-conv.h" // Kolab mail struct
-#include "../structs/common.h" // Date_or_datetime struct
-
-//typedef enum {
-// KOLAB_EVOLUTION_COMMON_XML_TAG = 1,
-// KOLAB_XML_TAG,
-// EVOLUTION_XML_TAG,
-// EVOLUTION_EXTENDED_XML_TAG,
-// UNDEFINED_XML_TAG
-//} xml_tag_type;
+#include <glib.h> /* GError */
+#include <libxml/tree.h> /* XML parsing */
+#include "../kolab-conv.h" /* Kolab mail struct */
+#include "../structs/common.h" /* Date_or_datetime struct */
+
+#if 0
+typedef enum {
+ KOLAB_EVOLUTION_COMMON_XML_TAG = 1,
+ KOLAB_XML_TAG,
+ EVOLUTION_XML_TAG,
+ EVOLUTION_EXTENDED_XML_TAG,
+ UNDEFINED_XML_TAG
+} xml_tag_type;
+#endif
GDate* string_to_g_date (gchar *dateString);
@@ -56,7 +58,7 @@ xmlDocPtr util_get_kolab_xml_part(const Kolab_conv_mail *kmail, GList **other_pa
gboolean handle_element_date_or_datetime (gchar* name, Date_or_datetime** store, xmlNodePtr node);
gboolean handle_element_datetime (gchar* name, time_t** store, xmlNodePtr node);
-// xml functions
+/* xml functions */
void convert_GList_String_to_xmlNodes (GList *string_list, gchar* node_name, xmlNodePtr node);
gchar* convert_xmlNode_to_String (const xmlNodePtr node);
void log_xml_part (Kolab_conv_mail *kolab_mail);
diff --git a/src/libekolabconv/main/src/kolab/kolab.h b/src/libekolabconv/main/src/kolab/kolab.h
index 52ac466..e6287cf 100644
--- a/src/libekolabconv/main/src/kolab/kolab.h
+++ b/src/libekolabconv/main/src/kolab/kolab.h
@@ -26,9 +26,9 @@
#ifndef KOLAB_H_
#define KOLAB_H_
-#include <glib.h> // GError
-#include "../kolab-conv.h" // Kolab mail struct
-// internal structures
+#include <glib.h> /* GError */
+#include "../kolab-conv.h" /* Kolab mail struct */
+/* internal structures */
#include "../structs/event.h"
#include "../structs/task.h"
#include "../structs/contact.h"
diff --git a/src/libekolabconv/main/src/kolab/note-i-to-k.c b/src/libekolabconv/main/src/kolab/note-i-to-k.c
index 6f01ae4..518fabe 100644
--- a/src/libekolabconv/main/src/kolab/note-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/note-i-to-k.c
@@ -24,7 +24,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
#include "../util.h"
/*
@@ -69,7 +69,7 @@ i_note_to_xml(const I_note *i_note)
doc = xmlNewDoc(BAD_CAST "1.0");
root_node = xmlNewNode(NULL, BAD_CAST KLB_NOTE);
add_property(root_node, "version", "1.0");
- //xmlNodeSetContent(root_node, BAD_CAST "content");
+ /* xmlNodeSetContent(root_node, BAD_CAST "content"); */
xmlDocSetRootElement(doc, root_node);
common_i_to_k(root_node, i_note->common);
@@ -79,7 +79,7 @@ i_note_to_xml(const I_note *i_note)
i_kolab_store_get_xml_nodes(i_note->common, i_note->common, root_node);
- //Convert xml to a string
+ /* Convert xml to a string */
xmlDocDumpFormatMemoryEnc(doc, &xml_buf, &buf_size, "UTF-8", 1);
g_string_append(xml_string, (gchar*) xml_buf);
@@ -101,15 +101,15 @@ i_note_to_xml_mail_part (I_note **i_note_ptr)
Kolab_conv_mail_part *mail_part;
gchar *xml_text = i_note_to_xml(i_note);
- //log_debug("\n\nXml Text:\n%s",xmlText);
+ /* log_debug("\n\nXml Text:\n%s",xmlText); */
- //ADD XML mailPart
+ /* ADD XML mailPart */
mail_part = g_new0(Kolab_conv_mail_part, 1);
mail_part->data = g_strdup(xml_text);
mail_part->length = strlen(xml_text);
mail_part->mime_type = g_strdup("application/x-vnd.kolab.note");
- mail_part->name = g_strdup("kolab-common1.xml"); //Change it after adding a field in contact.h
- //mailPart->order = 1; //Change it after adding a field in contact.h
+ mail_part->name = g_strdup("kolab-common1.xml"); /* Change it after adding a field in contact.h */
+ /* mailPart->order = 1; Change it after adding a field in contact.h */
mail_part_list = g_list_append(mail_part_list, (Kolab_conv_mail_part *)mail_part);
diff --git a/src/libekolabconv/main/src/kolab/note-k-to-i.c b/src/libekolabconv/main/src/kolab/note-k-to-i.c
index 50c5d33..01e8822 100644
--- a/src/libekolabconv/main/src/kolab/note-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/note-k-to-i.c
@@ -31,7 +31,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
/**
* All note specific elements from kolab are handled in this function.
@@ -64,8 +64,8 @@ read_note_element(I_note *i_note, xmlNodePtr node, GError **error)
static void
read_note(I_note *i_note, xmlNodePtr node, GError **error)
{
- // iterate over all child elements of note_node an process them
- xmlNodePtr n_ptr; // used in for loop
+ /* iterate over all child elements of note_node an process them */
+ xmlNodePtr n_ptr; /* used in for loop */
for (n_ptr = node->children; n_ptr != NULL; n_ptr = n_ptr->next) {
if (n_ptr->type == XML_ELEMENT_NODE) {
gboolean node_processed = read_note_element(i_note, n_ptr, error);
@@ -76,7 +76,7 @@ read_note(I_note *i_note, xmlNodePtr node, GError **error)
} else
log_debug("ignored XML node with name %s", n_ptr->name);
}
- //TODO: Validate inote. (log warnings / create error if necessary)
+ /* TODO: Validate inote. (log warnings / create error if necessary) */
}
/**
@@ -90,10 +90,10 @@ conv_kolab_conv_mail_to_I_note (const Kolab_conv_mail *knote, GError **error)
if (*error != NULL)
return NULL;
- // get parsed kolab XML
+ /* get parsed kolab XML */
I_note *i_note = new_i_note();
xmlDocPtr doc = util_get_kolab_xml_part(knote, &i_note->common->kolab_attachment_store, error);
- // find root node
+ /* find root node */
xmlNodePtr node = NULL, n;
for (n = doc->children; n != NULL; n = n->next)
if (n->type == XML_ELEMENT_NODE && strcmp ((gchar*)n->name, KLB_NOTE) == 0)
diff --git a/src/libekolabconv/main/src/kolab/priv-common-i-to-k.c b/src/libekolabconv/main/src/kolab/priv-common-i-to-k.c
index acb2010..56c616a 100644
--- a/src/libekolabconv/main/src/kolab/priv-common-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/priv-common-i-to-k.c
@@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-#include "priv-kolab.h" // public part of this file
+#include "priv-kolab.h" /* public part of this file */
/**
@@ -46,9 +46,9 @@ sensitivity_i_to_k (Sensitivity sensitivity)
case ICOMMON_SENSITIVITY_CONFIDENTIAL:
return KLB_CMN_SENSITIVITY_CONFIDENTIAL;
case ICOMMON_SENSITIVITY_NULL:
- return KLB_CMN_SENSITIVITY_PUBLIC; // value doesn't matter, because if case is ICOMMON_SENSITIVITY_NULL the tag is not written
+ return KLB_CMN_SENSITIVITY_PUBLIC; /* value doesn't matter, because if case is ICOMMON_SENSITIVITY_NULL the tag is not written */
default:
- return KLB_CMN_SENSITIVITY_PUBLIC; // default value
+ return KLB_CMN_SENSITIVITY_PUBLIC; /* default value */
}
}
@@ -123,7 +123,7 @@ common_i_to_k(xmlNodePtr root_node, I_common *i_common)
{
if (i_common == NULL)
return;
- //Construct children of root node.
+ /* Construct children of root node. */
add_child_node(root_node, KLB_CMN_PRODUCT_ID, KOLABCONV_PRODUCT_ID);
g_assert(i_common->uid);
add_child_node(root_node, KLB_CMN_UID, i_common->uid->str );
@@ -142,17 +142,17 @@ common_i_to_k(xmlNodePtr root_node, I_common *i_common)
g_free(modified_string);
}
if(i_common->sensitivity)
- if (i_common->sensitivity != ICOMMON_SENSITIVITY_NULL) // if its ICOMMON_SENSITIVITY_NULL it is either in kolab store or has never been there
+ if (i_common->sensitivity != ICOMMON_SENSITIVITY_NULL) /* if its ICOMMON_SENSITIVITY_NULL it is either in kolab store or has never been there */
add_child_node(root_node, KLB_CMN_SENSITIVITY, sensitivity_i_to_k(i_common->sensitivity));
if(i_common->vtimezone)
add_child_node(root_node, KLB_CMN_VTIMEZONE, i_common->vtimezone);
if(i_common->is_html_richtext)
add_child_node(root_node, KLBX_CMN_RICHTEXT, i_common->is_html_richtext == TRUE ? "true" : "false" );
- // add link attachments to the kolab xml
+ /* add link attachments to the kolab xml */
GList *lsl = i_common->link_attachments;
for (; lsl; lsl=lsl->next)
add_child_node(root_node, KLB_CMN_LINK_ATTACHMENT, (gchar*)lsl->data);
- // add inline attachment names to the kolab xml
+ /* add inline attachment names to the kolab xml */
lsl = i_common->inline_attachment_names;
for (; lsl; lsl=lsl->next)
add_child_node(root_node, KLB_CMN_INLINE_ATTACHMENT, (gchar*)lsl->data);
diff --git a/src/libekolabconv/main/src/kolab/priv-incidence-i-to-k.c b/src/libekolabconv/main/src/kolab/priv-incidence-i-to-k.c
index 784cb75..cb3dbce 100644
--- a/src/libekolabconv/main/src/kolab/priv-incidence-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/priv-incidence-i-to-k.c
@@ -45,21 +45,21 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
if (i_incidence == NULL)
return;
- // common
+ /* common */
common_i_to_k(root_node, i_incidence->common);
- //pilot-sync-status
- // summary
+ /* pilot-sync-status */
+ /* summary */
if(i_incidence->summary)
add_child_node(root_node, KLB_INC_SUMMARY, i_incidence->summary->str );
- // location
+ /* location */
if(i_incidence->location)
add_child_node(root_node, KLB_INC_LOCATION, i_incidence->location->str );
xmlNodePtr node;
- // organizer
- node = add_child_node(root_node, KLB_INC_ORGANIZER, NULL); // always write organizer node because kolab store could hold sub elements
+ /* organizer */
+ node = add_child_node(root_node, KLB_INC_ORGANIZER, NULL); /* always write organizer node because kolab store could hold sub elements */
if (i_incidence->organizer_display_name )
add_child_node( node, KLB_INC_DISPLAY_NAME, i_incidence->organizer_display_name->str);
if (i_incidence->organizer_smtp_address )
@@ -67,13 +67,13 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
i_kolab_store_get_xml_nodes(i_incidence->common, (gpointer) KOLAB_STORE_PTR_INC_ORGANIZER, node);
- // start-date
+ /* start-date */
if (i_incidence->start_date ) {
gchar *start_str = date_or_datetime_to_string(i_incidence->start_date);
add_child_node(root_node, KLB_INC_START_DATE, start_str);
g_free(start_str);
}
- // advanced_alarm
+ /* advanced_alarm */
if (i_incidence->advanced_alarm) {
xmlNodePtr simple_alarm_node;
simple_alarm_node = add_child_node(root_node, KLB_INC_ALARM, NULL);
@@ -86,25 +86,25 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
Alarm *alarm_element = ((Alarm *)iterator->data);
if (alarm_element->type == I_ALARM_TYPE_DISPLAY
- && alarm_element->display_text == NULL // if display text is set its no simple alarm
- && alarm_element->start_offset // must have a minute value
- && !alarm_element->end_offset // must be null
- && !alarm_element->repeat_count // must be null
- && !alarm_element->repeat_interval // must be null
- && iterator->prev == NULL) // only first element can be simple alarm
+ && alarm_element->display_text == NULL /* if display text is set its no simple alarm */
+ && alarm_element->start_offset /* must have a minute value */
+ && !alarm_element->end_offset /* must be null */
+ && !alarm_element->repeat_count /* must be null */
+ && !alarm_element->repeat_interval /* must be null */
+ && iterator->prev == NULL) /* only first element can be simple alarm */
{
- // simple alarm
- //add_child_node(root_node, KLB_INC_ALARM, int_to_string(alarm_element->start_offset));
+ /* simple alarm */
+ /* add_child_node(root_node, KLB_INC_ALARM, int_to_string(alarm_element->start_offset)); */
gchar * node_content = g_strdup_printf("%i", alarm_element->start_offset);
xmlNodeAddContent(simple_alarm_node, (xmlChar*) node_content);
if (iterator->next == NULL) {
- // remove set advanced-alarms node if no node follows after the simple one.
+ /* remove set advanced-alarms node if no node follows after the simple one. */
xmlUnlinkNode(node);
xmlFreeNode(node);
}
g_free(node_content);
} else {
- // advanced alarm
+ /* advanced alarm */
xmlNodePtr element_node;
element_node = add_child_node(node, KLB_INC_ALARM, NULL);
@@ -166,7 +166,7 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
}
}
- // common in adv. alarm
+ /* common in adv. alarm */
if (alarm_element->start_offset) {
gchar *child_content = g_strdup_printf("%i", alarm_element->start_offset);
add_child_node(element_node, KLBX_INC_ADV_ALARM_START_OFFSET, child_content);
@@ -192,21 +192,21 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
iterator = iterator->next;
}
if (simple_alarm_node->children == NULL) {
- // remove simple alarm when its not set (children == NULL)
+ /* remove simple alarm when its not set (children == NULL) */
xmlUnlinkNode(simple_alarm_node);
xmlFreeNode(simple_alarm_node);
}
g_list_free(iterator);
}
- // recurrence
+ /* recurrence */
if (i_incidence->recurrence) {
node = add_child_node(root_node, KLB_INC_RECURRENCE, NULL);
recurrence_i_to_k(i_incidence->recurrence, node);
i_kolab_store_get_xml_nodes(i_incidence->common, (gpointer) KOLAB_STORE_PTR_INC_RECURRENCE, node);
}
- // attendee
+ /* attendee */
GList *iterator;
iterator = i_incidence->attendee;
@@ -237,7 +237,7 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_ROOM);
break;
case I_INC_CUTYPE_UNDEFINED:
- // nothing to do (default case)
+ /* nothing to do (default case) */
break;
default:
g_assert(FALSE);
@@ -340,7 +340,7 @@ incidence_status_i_to_k (Incidence_status status)
static void
weekday_i_to_k (xmlNodePtr node, gint weekdays)
{
- if (!weekdays) // nothing to add => exit
+ if (!weekdays) /* nothing to add => exit */
return;
if (weekdays & I_COMMON_MONDAY)
add_child_node(node, KLB_INC_RCR_DAY, KLB_INC_RCR_DAY_MONDAY);
diff --git a/src/libekolabconv/main/src/kolab/priv-incidence-k-to-i.c b/src/libekolabconv/main/src/kolab/priv-incidence-k-to-i.c
index d07d112..706c76c 100644
--- a/src/libekolabconv/main/src/kolab/priv-incidence-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/priv-incidence-k-to-i.c
@@ -31,9 +31,9 @@
* The related header file is: k-abstract.h
*/
-#include "priv-kolab.h" // public part of this file
+#include "priv-kolab.h" /* public part of this file */
#include "../util.h"
-#include <libxml/tree.h> // XML parsing
+#include <libxml/tree.h> /* XML parsing */
/*
* prototypes for static functions
@@ -77,14 +77,14 @@ conv_incidence_k_to_i(I_incidence *i_incidence, xmlNodePtr node, GError **error)
else if (*error != NULL)
return FALSE;
- return handle_element_string(KLB_INC_SUMMARY, &i_incidence->summary, node) || // summary
- handle_element_string(KLB_INC_LOCATION, &i_incidence->location, node) || // location // creator
- handle_incidence_organizer(i_incidence, node) || // organizer
- handle_element_date_or_datetime(KLB_INC_START_DATE, &i_incidence->start_date, node) || // start-date
- handle_incidence_alarm(i_incidence, node) || // alarm
- handle_incidence_advanced_alarm(i_incidence, node) || // advanced_alarm
- handle_incidence_recurrence(i_incidence, node) || // recurrence
- handle_incidence_attendee(i_incidence, node); // attendee
+ return handle_element_string(KLB_INC_SUMMARY, &i_incidence->summary, node) || /* summary */
+ handle_element_string(KLB_INC_LOCATION, &i_incidence->location, node) || /* location */
+ handle_incidence_organizer(i_incidence, node) || /* organizer */
+ handle_element_date_or_datetime(KLB_INC_START_DATE, &i_incidence->start_date, node) || /* start-date */
+ handle_incidence_alarm(i_incidence, node) || /* alarm */
+ handle_incidence_advanced_alarm(i_incidence, node) || /* advanced_alarm */
+ handle_incidence_recurrence(i_incidence, node) || /* recurrence */
+ handle_incidence_attendee(i_incidence, node); /* attendee */
}
@@ -241,13 +241,13 @@ handle_incidence_alarm(I_incidence *incidence, xmlNodePtr node)
if (strcmp ((gchar *) node->name, KLB_INC_ALARM) != 0)
return FALSE;
- if (node->type == XML_ELEMENT_NODE) { // Alarm_type type
+ if (node->type == XML_ELEMENT_NODE) { /* Alarm_type type */
Alarm *adv_alarm = new_alarm(alarm_type_k_to_i("KLBX_INC_ADV_ALARM_TYPE_DISPLAY_TEXT"));
- // start_offset
+ /* start_offset */
handle_element_integer(KLB_INC_ALARM, &adv_alarm->start_offset, node);
- // add advanced_alarm to list
+ /* add advanced_alarm to list */
incidence->advanced_alarm = g_list_append(incidence->advanced_alarm, (gpointer) adv_alarm);
}
return TRUE;
@@ -267,7 +267,7 @@ handle_incidence_advanced_alarm (I_incidence *incidence, xmlNodePtr node)
if (strcmp ((gchar *) node->name, KLBX_INC_ADV_ALARM) != 0)
return FALSE;
- xmlNodePtr alarm_node; // used in for loop
+ xmlNodePtr alarm_node; /* used in for loop */
for (alarm_node = node->children; alarm_node != NULL; alarm_node = alarm_node->next) {
if (alarm_node->type == XML_ELEMENT_NODE) {
@@ -276,11 +276,11 @@ handle_incidence_advanced_alarm (I_incidence *incidence, xmlNodePtr node)
Alarm *adv_alarm = new_alarm(alarm_type_k_to_i(type));
g_free(type);
- xmlNodePtr alarm_attribute; // used in for loop
+ xmlNodePtr alarm_attribute; /* used in for loop */
for (alarm_attribute = alarm_node->children; alarm_attribute != NULL; alarm_attribute = alarm_attribute->next) {
if (alarm_attribute->type == XML_ELEMENT_NODE) {
- // handle advanced alarm type dependent attributes
+ /* handle advanced alarm type dependent attributes */
gboolean handled = FALSE;
if (adv_alarm->type == I_ALARM_TYPE_DISPLAY) {
handled = handle_element_string(KLBX_INC_ADV_ALARM_TYPE_DISPLAY_TEXT, &adv_alarm->display_text, alarm_attribute);
@@ -296,14 +296,14 @@ handle_incidence_advanced_alarm (I_incidence *incidence, xmlNodePtr node)
handled |= handle_element_GList_String(KLBX_INC_ADV_ALARM_TYPE_EMAIL_ATTACHMENTS, KLBX_INC_ADV_ALARM_TYPE_EMAIL_ATTACHMENTS_ATT, &adv_alarm->email_param->attachments, alarm_attribute);
}
- // handle advanced alarm common attributes
- if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_START_OFFSET) == 0) { // start_offset
+ /* handle advanced alarm common attributes */
+ if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_START_OFFSET) == 0) { /* start_offset */
handle_element_integer(KLBX_INC_ADV_ALARM_START_OFFSET, &adv_alarm->start_offset, alarm_attribute);
- } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_END_OFFSET) == 0) { // end_offset
+ } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_END_OFFSET) == 0) { /* end_offset */
handle_element_integer(KLBX_INC_ADV_ALARM_END_OFFSET, &adv_alarm->end_offset, alarm_attribute);
- } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_REPEAT_COUNT) == 0) { // repeat_count
+ } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_REPEAT_COUNT) == 0) { /* repeat_count */
handle_element_integer(KLBX_INC_ADV_ALARM_REPEAT_COUNT, &adv_alarm->repeat_count, alarm_attribute);
- } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_REPEAT_INTERVAL) == 0) { // repeat_interval
+ } else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_REPEAT_INTERVAL) == 0) { /* repeat_interval */
handle_element_integer(KLBX_INC_ADV_ALARM_REPEAT_INTERVAL, &adv_alarm->repeat_interval, alarm_attribute);
} else if (strcmp ((gchar *) alarm_attribute->name, KLBX_INC_ADV_ALARM_TYPE_EMAIL_ADDRESSES) == 0) {
} else if (!handled)
@@ -311,7 +311,7 @@ handle_incidence_advanced_alarm (I_incidence *incidence, xmlNodePtr node)
}
}
- // add advanced_alarm to list
+ /* add advanced_alarm to list */
incidence->advanced_alarm = g_list_append(incidence->advanced_alarm, (gpointer) adv_alarm);
}
}
@@ -484,8 +484,9 @@ handle_incidence_recurrence (I_incidence *incidence, xmlNodePtr node)
if (strcmp ((gchar*) node->name, KLB_INC_RECURRENCE) != 0)
return FALSE;
- // recurrence struct ptr is expected NULL. If not, maybe the element
- // unexpectedly occurs multiple times => warn and reassign
+ /* recurrence struct ptr is expected NULL. If not, maybe the element
+ * unexpectedly occurs multiple times => warn and reassign
+ */
if (incidence->recurrence != NULL) {
log_warn("multiple assignment of recurrence");
g_free(incidence->recurrence);
@@ -494,8 +495,8 @@ handle_incidence_recurrence (I_incidence *incidence, xmlNodePtr node)
incidence->recurrence = new_recurrence ();
incidence->recurrence->recurrence_cycle = handle_incidence_recurrence_cycle(node);
- // iterate over all child elements of node an process them
- xmlNodePtr n; // used in for loop
+ /* iterate over all child elements of node an process them */
+ xmlNodePtr n; /* used in for loop */
for (n = node->children; n != NULL; n = n->next) {
if (n->type == XML_ELEMENT_NODE) {
if (handle_incidence_recurrence_weekdays((guint *) &incidence->recurrence->weekdays, n)
@@ -525,7 +526,7 @@ handle_incidence_attendee(I_incidence *incidence, xmlNodePtr node)
Attendee *attendee = g_new0(Attendee, 1);
- xmlNodePtr n; // used in for loop
+ xmlNodePtr n; /* used in for loop */
for (n = node->children; n != NULL; n = n->next) {
if (n->type == XML_ELEMENT_NODE) {
if (strcmp ((gchar *) n->name, KLB_INC_DISPLAY_NAME) == 0) {
@@ -553,7 +554,7 @@ handle_incidence_attendee(I_incidence *incidence, xmlNodePtr node)
}
}
xmlFree(n);
- // add attendee to list
+ /* add attendee to list */
incidence->attendee = g_list_append(incidence->attendee, (gpointer) attendee);
return TRUE;
@@ -569,8 +570,8 @@ handle_incidence_organizer (I_incidence *i_incidence, xmlNodePtr node)
{
if (strcmp ((gchar*) node->name, KLB_INC_ORGANIZER) != 0)
return FALSE;
- // iterate over all child elements of node an process them
- xmlNodePtr n; // used in for loop
+ /* iterate over all child elements of node an process them */
+ xmlNodePtr n; /* used in for loop */
for (n = node->children; n != NULL; n = n->next) {
if (n->type == XML_ELEMENT_NODE) {
if (handle_element_string(KLB_INC_DISPLAY_NAME, &i_incidence->organizer_display_name, n)
@@ -583,5 +584,3 @@ handle_incidence_organizer (I_incidence *i_incidence, xmlNodePtr node)
xmlFree(n);
return TRUE;
}
-
-
diff --git a/src/libekolabconv/main/src/kolab/priv-kolab-preserve.c b/src/libekolabconv/main/src/kolab/priv-kolab-preserve.c
index d056840..2581ca4 100644
--- a/src/libekolabconv/main/src/kolab/priv-kolab-preserve.c
+++ b/src/libekolabconv/main/src/kolab/priv-kolab-preserve.c
@@ -105,18 +105,18 @@ i_kolab_store_get_xml_nodes(I_common *i_common, gpointer parent_ptr, xmlNodePtr
xmlDocPtr xml_doc = xmlReadMemory (xml_str, (int) strlen (xml_str), "kolab.xml", NULL, 0);
if (xml_doc == NULL) {
- // Failed to parse
+ /* Failed to parse */
log_debug ("\nError parsing xmlSubTree: %s", xml_str);
continue;
}
- xmlNodePtr node; // used in for loop
+ xmlNodePtr node; /* used in for loop */
for (node = xml_doc->children; node != NULL; node = node->next)
if (node->type == XML_ELEMENT_NODE)
break;
- //Add subXmlTree node to the main xml tree node.
+ /* Add subXmlTree node to the main xml tree node. */
xmlAddChild (parent_node, xmlCopyNode (node, 1));
xmlFreeDoc (xml_doc);
diff --git a/src/libekolabconv/main/src/kolab/priv-kolab.h b/src/libekolabconv/main/src/kolab/priv-kolab.h
index d57b491..48f2791 100644
--- a/src/libekolabconv/main/src/kolab/priv-kolab.h
+++ b/src/libekolabconv/main/src/kolab/priv-kolab.h
@@ -38,14 +38,14 @@
#define KOLAB_ABSTRACT_H_
-#include <glib.h> // GError
+#include <glib.h> /* GError */
#include <libxml/tree.h>
#include "kolab-util.h"
#include "kolab-constants.h"
-// internal abstract structures
+/* internal abstract structures */
#include "../structs/common.h"
#include "../structs/incidence.h"
-// internal structures
+/* internal structures */
#include "../structs/event.h"
#include "../structs/task.h"
#include "../structs/contact.h"
diff --git a/src/libekolabconv/main/src/kolab/task-i-to-k.c b/src/libekolabconv/main/src/kolab/task-i-to-k.c
index 4a89a00..105e7aa 100644
--- a/src/libekolabconv/main/src/kolab/task-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/task-i-to-k.c
@@ -23,7 +23,7 @@
*/
#include "priv-kolab.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
#include "../util.h"
/**
@@ -65,27 +65,28 @@ i_task_to_xml (const I_task *i_task) {
doc = xmlNewDoc(BAD_CAST "1.0");
root_node = xmlNewNode(NULL, BAD_CAST KLB_TASK);
add_property(root_node, "version", "1.0");
- //xmlNodeSetContent(root_node, BAD_CAST "content");
+ /* xmlNodeSetContent(root_node, BAD_CAST "content"); */
xmlDocSetRootElement(doc, root_node);
conv_incidence_i_to_k(root_node, i_task->incidence);
if (i_task->priority >= 0 && i_task->priority <= 9) {
- // if a detailed priority value exists and is valid
+ /* if a detailed priority value exists and is valid */
- // set detailed priority
+ /* set detailed priority */
gchar *kcal_str = g_strdup_printf("%i", i_task->priority);
add_child_node (root_node, KLBX_TASK_KCAL_PRIORITY, kcal_str);
g_free(kcal_str);
- // set normal priority from detailed priority
- // (necessary for valid kolab standard and kontact also writes both)
+ /* set normal priority from detailed priority
+ * (necessary for valid kolab standard and kontact also writes both)
+ */
gchar *str = g_strdup_printf("%i", priority_xkcal_to_k(i_task->priority));
add_child_node (root_node, KLB_TASK_PRIORITY, str);
g_free(str);
}
- if (i_task->completed <= 100) { // i_task->completed is unsigned therfore >= 0 is implicit
+ if (i_task->completed <= 100) { /* i_task->completed is unsigned therfore >= 0 is implicit */
gchar *str = g_strdup_printf("%i", i_task->completed);
add_child_node (root_node, KLB_TASK_COMPLETED, str);
g_free(str);
@@ -108,12 +109,12 @@ i_task_to_xml (const I_task *i_task) {
i_kolab_store_get_xml_nodes(i_task->incidence->common, i_task->incidence->common, root_node);
- //Convert xml to a string
+ /* Convert xml to a string */
xmlDocDumpFormatMemoryEnc(doc, &xml_buf, &buf_size, "UTF-8", 1);
g_string_append(xml, (gchar*) xml_buf);
- //log_debug("%s", (char *) xmlbuff);
+ /* log_debug("%s", (char *) xmlbuff); */
- // Free associated memory.
+ /* Free associated memory. */
xmlFree(xml_buf);
xmlFreeDoc(doc);
@@ -136,15 +137,15 @@ conv_I_task_to_kolab_conv_mail (I_task **i_task_ptr, GError **error)
Kolab_conv_mail_part *mail_part;
gchar *xml = i_task_to_xml(i_task);
- //log_debug("\n\nXml Text:\n%s",xmlText);
+ /* log_debug("\n\nXml Text:\n%s",xmlText); */
- //ADD XML mailPart
+ /* ADD XML mailPart */
mail_part = g_new0(Kolab_conv_mail_part, 1);
mail_part->data = g_strdup(xml);
mail_part->length = strlen(xml);
mail_part->mime_type = g_strdup("application/x-vnd.kolab.task");
- mail_part->name = g_strdup("kolab-common1.xml"); //Change it after adding a field in contact.h
- //mailPart->order = 1; //Change it after adding a field in contact.h
+ mail_part->name = g_strdup("kolab-common1.xml"); /* Change it after adding a field in contact.h */
+ /* mailPart->order = 1; Change it after adding a field in contact.h */
mail_part_list = g_list_append(mail_part_list, (Kolab_conv_mail_part *)mail_part);
diff --git a/src/libekolabconv/main/src/kolab/task-k-to-i.c b/src/libekolabconv/main/src/kolab/task-k-to-i.c
index 01d5423..a222ca6 100644
--- a/src/libekolabconv/main/src/kolab/task-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/task-k-to-i.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include "priv-kolab.h"
#include "../util.h"
-#include "kolab.h" // public part of this file
+#include "kolab.h" /* public part of this file */
/*
@@ -55,11 +55,11 @@ conv_kolab_conv_mail_to_I_task (const Kolab_conv_mail *k_task, GError **error)
if (*error != NULL)
return NULL;
- // get parsed kolab XML
+ /* get parsed kolab XML */
I_task *i_task = new_i_task();
xmlDocPtr doc = util_get_kolab_xml_part(k_task, &i_task->incidence->common->kolab_attachment_store, error);
- // find root node
+ /* find root node */
xmlNodePtr node = NULL, n;
for (n = doc->children; n != NULL; n = n->next)
if (n->type == XML_ELEMENT_NODE && strcmp ((gchar*)n->name, KLB_TASK) == 0)
@@ -90,14 +90,15 @@ conv_kolab_conv_mail_to_I_task (const Kolab_conv_mail *k_task, GError **error)
static void
read_task(I_task *i_task, xmlNodePtr task_node, GError **error)
{
- xmlNodePtr rec_ptr = NULL; // pointer used to temporarily store recurrence node
+ xmlNodePtr rec_ptr = NULL; /* pointer used to temporarily store recurrence node */
- // iterate over all child elements of event_node an process them
- xmlNodePtr node; // used in for loop
+ /* iterate over all child elements of event_node an process them */
+ xmlNodePtr node; /* used in for loop */
for (node = task_node->children; node != NULL; node = node->next) {
if (node->type == XML_ELEMENT_NODE) {
- // save recurrence node in case recurrence has to be
- // stored in kolabstore due to missing start_date
+ /* save recurrence node in case recurrence has to be
+ * stored in kolabstore due to missing start_date
+ */
if (strcmp ((gchar*) node->name, KLB_INC_RECURRENCE) == 0)
rec_ptr = node;
@@ -113,7 +114,7 @@ read_task(I_task *i_task, xmlNodePtr task_node, GError **error)
log_debug("ignored XML node with name %s", node->name);
}
- // cannot be properly converted back from evolution when startdate is missing, therefore => kolabstore
+ /* cannot be properly converted back from evolution when startdate is missing, therefore => kolabstore */
if (i_task->incidence
&& i_task->incidence->recurrence
&& !i_task->incidence->start_date
@@ -126,7 +127,7 @@ read_task(I_task *i_task, xmlNodePtr task_node, GError **error)
i_kolab_store_add_xml_element(i_task->incidence->common, i_task->incidence->common, rec_ptr);
}
- //TODO: Validate itask. (log warnings / create error if necessary)
+ /* TODO: Validate itask. (log warnings / create error if necessary) */
}
@@ -142,8 +143,8 @@ read_task_element(I_task *i_task, xmlNodePtr node, GError **error)
else if (*error != NULL)
return FALSE;
return
- handle_element_priority(KLB_TASK_PRIORITY, &i_task->priority, node) || // calculate and overwrite detailed priority from normal priority when detailed priority not set yet
- handle_element_integer(KLBX_TASK_KCAL_PRIORITY, &i_task->priority, node) || // always read and overwrite detailed priority
+ handle_element_priority(KLB_TASK_PRIORITY, &i_task->priority, node) || /* calculate and overwrite detailed priority from normal priority when detailed priority not set yet */
+ handle_element_integer(KLBX_TASK_KCAL_PRIORITY, &i_task->priority, node) || /* always read and overwrite detailed priority */
handle_element_integer(KLB_TASK_COMPLETED, (gint*)&i_task->completed, node) ||
handle_element_status(i_task, node) ||
handle_element_date_or_datetime(KLB_TASK_DUE_DATE, &i_task->due_date, node) ||
@@ -195,12 +196,12 @@ handle_element_priority (gchar* name, gint *store, xmlNodePtr node)
gchar *value = xml_get_node_text(node);
g_debug ("**** handle_element_priority() node: %s - value: %s", node->name, value);
gchar *p;
- if (*store == -1) // already set?
+ if (*store == -1) /* already set? */
{
errno = 0;
*store = priority_k_to_xkcal(strtol(value, &p, 10));
if (errno != 0 || *p != 0 || p == value)
- log_warn("illegal integer value in element %s", name); //TODO error handling
+ log_warn("illegal integer value in element %s", name); /* TODO error handling */
}
return TRUE;
}
diff --git a/src/libekolabconv/main/src/logging.h b/src/libekolabconv/main/src/logging.h
index ac74952..f437b19 100644
--- a/src/libekolabconv/main/src/logging.h
+++ b/src/libekolabconv/main/src/logging.h
@@ -46,7 +46,7 @@ void log_kolab_mail (const gchar *message, const Kolab_conv_mail *kmail);
#else
-// discard all logging messages in the main library
+/* discard all logging messages in the main library */
#define log_debug(...) do {} while(0)
#define log_warn(...) do {} while(0)
diff --git a/src/libekolabconv/main/src/structs/common.c b/src/libekolabconv/main/src/structs/common.c
index 5f8ce96..f877a1d 100644
--- a/src/libekolabconv/main/src/structs/common.c
+++ b/src/libekolabconv/main/src/structs/common.c
@@ -71,9 +71,9 @@ void
kolab_store_add_element(I_common *i_common, gpointer parent_ptr, gchar *xml_str, gboolean reverse_order)
{
log_debug("add to kolab store: %d, %s", parent_ptr, xml_str);
- if (i_common->kolab_store == NULL) { // initialize kolab store
- // g_direct_hash() : key pointers are used directly as hash value
- // keys/values are not freed automatically when replaced or removed
+ if (i_common->kolab_store == NULL) { /* initialize kolab store */
+ /* g_direct_hash() : key pointers are used directly as hash value */
+ /* keys/values are not freed automatically when replaced or removed */
i_common->kolab_store = g_hash_table_new(g_direct_hash, g_direct_equal);
}
GList *list = g_hash_table_lookup(i_common->kolab_store, parent_ptr);
@@ -130,14 +130,14 @@ void
generic_g_list_free(GList **l, void (*free_func) (void **data))
{
if (l && *l) {
- GList *i = *l; // copy of *l for iteration
+ GList *i = *l; /* copy of *l for iteration */
do {
- free_func(&i->data); // free data elements in list
+ free_func(&i->data); /* free data elements in list */
} while ((i = g_list_next(i)));
- g_list_free(*l); // free list nodes
- *l = NULL; // avoid dangling pointers
+ g_list_free(*l); /* free list nodes */
+ *l = NULL; /* avoid dangling pointers */
}
}
@@ -163,14 +163,14 @@ void
generic_g_slist_free(GSList **l, void (*free_func) (void **data))
{
if (l && *l) {
- GSList *i = *l; // copy of *l for iteration
+ GSList *i = *l; /* copy of *l for iteration */
do {
- free_func(&i->data); // free data elements in list
+ free_func(&i->data); /* free data elements in list */
} while ((i = g_slist_next(i)));
- g_slist_free(*l); // free list nodes
- *l = NULL; // avoid dangling pointers
+ g_slist_free(*l); /* free list nodes */
+ *l = NULL; /* avoid dangling pointers */
}
}
@@ -186,7 +186,7 @@ generic_g_slist_free(GSList **l, void (*free_func) (void **data))
void
free_primitive_data (void **data)
{
- // data doesn't need to be casted
+ /* data doesn't need to be casted */
if (data && *data) {
g_free(*data);
*data = NULL;
@@ -199,9 +199,9 @@ free_primitive_data (void **data)
static gboolean
free_kolab_store_elements(gpointer key, gpointer value, gpointer data)
{
- // keys will be freed somewhere else
- key = NULL; // to supress compiler warnings
- data = NULL; // to supress compiler warnings
+ /* keys will be freed somewhere else */
+ key = NULL; /* to supress compiler warnings */
+ data = NULL; /* to supress compiler warnings */
generic_g_list_free ((GList**) &value, free_primitive_data);
return TRUE;
@@ -227,7 +227,7 @@ void
free_i_common (I_common **i_common)
{
if (i_common && *i_common) {
- I_common *ic = *i_common; // local copy for readability
+ I_common *ic = *i_common; /* local copy for readability */
G_STRING_FREE (ic->product_id);
G_STRING_FREE (ic->uid);
G_STRING_FREE (ic->body);
@@ -236,7 +236,7 @@ free_i_common (I_common **i_common)
free_date_or_datetime (&ic->last_modified_datetime);
g_free(ic->vtimezone);
- g_list_free(ic->kolab_attachment_store); // no need to free content (must be freed outside of the library)
+ g_list_free(ic->kolab_attachment_store); /* no need to free content (must be freed outside of the library) */
ic->kolab_attachment_store = NULL;
generic_g_list_free (&ic->link_attachments, free_primitive_data);
@@ -303,7 +303,7 @@ print_date_or_datetime (const Date_or_datetime *dodt, const gchar *caption)
if (dodt) {
if (dodt->date)
- //log_debug("%s", convertGDateToString( dateOrDateTime->date));
+ /* log_debug("%s", convertGDateToString( dateOrDateTime->date)); */
log_debug("\n\t Date: %d-%d-%d", (dodt->date)->year,
(dodt->date)->month, (dodt->date)->day);
else if (dodt->date_time) {
@@ -329,18 +329,18 @@ print_i_common (const I_common *common)
if (common->categories != NULL)
log_debug ("\nCategories: %s", (common->categories)->str);
if (common->creation_datetime != NULL)
- //log_debug("\nCreationDate: %d-%d-%d", (common->creation_datetime->date)->year, (common->creation_datetime->date)->month, (common->creation_datetime->date)->day);
+ /* log_debug("\nCreationDate: %d-%d-%d", (common->creation_datetime->date)->year, (common->creation_datetime->date)->month, (common->creation_datetime->date)->day); */
print_date_or_datetime (common->creation_datetime, "CreationDate");
if (common->last_modified_datetime != NULL) {
print_date_or_datetime (common->last_modified_datetime, "last_modified_datetime");
}
- //if (common->sensitivity)
+ /* if (common->sensitivity) */
log_debug ("\nSensitivity: %d", common->sensitivity);
-// print_kolab_store (common);
+ /* print_kolab_store (common); */
print_kolab_attachment_store (common);
print_evolution_store (common);
-// print_extended_evolution_store (common);
+ /* print_extended_evolution_store (common); */
}
diff --git a/src/libekolabconv/main/src/structs/common.h b/src/libekolabconv/main/src/structs/common.h
index cedf37c..ffd1ce4 100644
--- a/src/libekolabconv/main/src/structs/common.h
+++ b/src/libekolabconv/main/src/structs/common.h
@@ -47,11 +47,11 @@
#define KOLAB_STORE_PTR_INC_RECURRENCE 1002
-// convenience macros for calling specialized free functions
+/* convenience macros for calling specialized free functions */
#define G_STRING_FREE(x) if ((x) != NULL) g_string_free ((x), 1)
#define G_DATE_FREE(x) if ((x) != NULL) g_date_free (x)
-// G_LIST_FREE(x) has been replaced by generic_g_list_free()
-//#define G_LIST_FREE(x) if ((x) != NULL) g_list_free (x)
+/* G_LIST_FREE(x) has been replaced by generic_g_list_free() */
+/* #define G_LIST_FREE(x) if ((x) != NULL) g_list_free (x) */
@@ -120,10 +120,10 @@ typedef struct{
Date_or_datetime *last_modified_datetime;
Sensitivity sensitivity;
- // help variable for html parsing, written and true by kontact when html parsing needed
+ /* help variable for html parsing, written and true by kontact when html parsing needed */
gboolean is_html_richtext;
- // KPilot synchronization stuff
+ /* KPilot synchronization stuff */
gboolean has_pilot_sync_id;
gboolean has_pilot_sync_status;
gulong pilot_sync_id;
@@ -137,14 +137,14 @@ typedef struct{
*/
GHashTable *kolab_store;
- GList *kolab_attachment_store; //hidden & inline attachments of type Kolab_conv_mail_part
+ GList *kolab_attachment_store; /* hidden & inline attachments of type Kolab_conv_mail_part */
- GList *inline_attachment_names; // elements of type gchar*; names of the kolab_attachment_store elements which are inline and not hidden attachments
+ GList *inline_attachment_names; /* elements of type gchar*; names of the kolab_attachment_store elements which are inline and not hidden attachments */
- GList *link_attachments; // list of gchar* URLs
+ GList *link_attachments; /* list of gchar* URLs */
- gchar *evolution_store; //elements of type char*
- gchar *vtimezone; // complete ICalendar VTIMEZONE block
+ gchar *evolution_store; /* elements of type char* */
+ gchar *vtimezone; /* complete ICalendar VTIMEZONE block */
} I_common;
@@ -166,8 +166,8 @@ void free_i_common (I_common **icommon);
void free_date_or_datetime (Date_or_datetime **dt);
void free_evolution_field(Evolution_field **e_field);
-//void free_timezone (I_timezone **);
-//void free_timezone_date (I_timezone_date **);
+/* void free_timezone (I_timezone **); */
+/* void free_timezone_date (I_timezone_date **); */
/*
*
diff --git a/src/libekolabconv/main/src/structs/contact.c b/src/libekolabconv/main/src/structs/contact.c
index 15d8ac9..e4cbc59 100644
--- a/src/libekolabconv/main/src/structs/contact.c
+++ b/src/libekolabconv/main/src/structs/contact.c
@@ -162,7 +162,7 @@ free_i_contact (I_contact **i_contact)
G_DATE_FREE (ic->birthday);
G_DATE_FREE (ic->anniversary);
-// G_STRING_FREE (ic->picture_name);
+ /* G_STRING_FREE (ic->picture_name); */
kolabconv_free_kmail_part((void **) &ic->photo);
@@ -179,7 +179,7 @@ free_i_contact (I_contact **i_contact)
-// --------------------------- functions for debugging ------------------------------
+/* --------------------------- functions for debugging ------------------------------ */
/**
* print data structure (for debugging)
@@ -292,7 +292,7 @@ append_emails(gpointer element_ptr, gpointer data)
Email *email = element_ptr;
GString *out = data;
g_string_append(out, "email:\n");
-// append_str(out, " display_name", email->display_name);
+ /* append_str(out, " display_name", email->display_name); */
append_str(out, " smtp_address", email->smtp_address);
}
@@ -303,7 +303,7 @@ append_emails(gpointer element_ptr, gpointer data)
void
print_contact (I_contact *c)
{
- //log_debug ("\nPrinting contact object: \n");
+ /* log_debug ("\nPrinting contact object: \n"); */
GString *out = g_string_sized_new(50);
diff --git a/src/libekolabconv/main/src/structs/contact.h b/src/libekolabconv/main/src/structs/contact.h
index aa11fbc..0ece58c 100644
--- a/src/libekolabconv/main/src/structs/contact.h
+++ b/src/libekolabconv/main/src/structs/contact.h
@@ -40,24 +40,24 @@
*/
typedef enum {
ICONTACT_PHONE_TYPE_NULL = 0,
- ICONTACT_PHONE_ASSISTANT, // 1
- ICONTACT_PHONE_BUSINESS_1, // 2
- ICONTACT_PHONE_BUSINESS_2, // 3
- ICONTACT_PHONE_BUSINESS_FAX,// 4
- ICONTACT_PHONE_CALLBACK, // 5
- ICONTACT_PHONE_CAR, // 6
- ICONTACT_PHONE_COMPANY, // 7
- ICONTACT_PHONE_HOME_1, // 8
- ICONTACT_PHONE_HOME_2, // 9
- ICONTACT_PHONE_HOME_FAX, // 10
- ICONTACT_PHONE_ISDN, // 11
- ICONTACT_PHONE_MOBILE, // 12
- ICONTACT_PHONE_OTHER, // 13
- ICONTACT_PHONE_PAGER, // 14
- ICONTACT_PHONE_PRIMARY, // 15
- ICONTACT_PHONE_RADIO, // 16
- ICONTACT_PHONE_TELEX, // 17
- ICONTACT_PHONE_TTYTDD // 18
+ ICONTACT_PHONE_ASSISTANT, /* 01 */
+ ICONTACT_PHONE_BUSINESS_1, /* 02 */
+ ICONTACT_PHONE_BUSINESS_2, /* 03 */
+ ICONTACT_PHONE_BUSINESS_FAX, /* 04 */
+ ICONTACT_PHONE_CALLBACK, /* 05 */
+ ICONTACT_PHONE_CAR, /* 06 */
+ ICONTACT_PHONE_COMPANY, /* 07 */
+ ICONTACT_PHONE_HOME_1, /* 08 */
+ ICONTACT_PHONE_HOME_2, /* 09 */
+ ICONTACT_PHONE_HOME_FAX, /* 10 */
+ ICONTACT_PHONE_ISDN, /* 11 */
+ ICONTACT_PHONE_MOBILE, /* 12 */
+ ICONTACT_PHONE_OTHER, /* 13 */
+ ICONTACT_PHONE_PAGER, /* 14 */
+ ICONTACT_PHONE_PRIMARY, /* 15 */
+ ICONTACT_PHONE_RADIO, /* 16 */
+ ICONTACT_PHONE_TELEX, /* 17 */
+ ICONTACT_PHONE_TTYTDD /* 18 */
} Icontact_phone_type;
/*
@@ -139,14 +139,14 @@ typedef struct {
GDate *birthday;
GDate *anniversary;
-// GString *picture_name; // Name of the kolab attachment which contains the picture
+ /* GString *picture_name; Name of the kolab attachment which contains the picture */
Kolab_conv_mail_part *photo;
- GList *phone_numbers; // elements of type "phone_number"
- GList *emails; // elements of type "Email"
- GList *addresses; // elements of type "Address"
+ GList *phone_numbers; /* elements of type "phone_number" */
+ GList *emails; /* elements of type "Email" */
+ GList *addresses; /* elements of type "Address" */
- GList *custom_list; // elements of type "Custom"
+ GList *custom_list; /* elements of type "Custom" */
#define DEGREE_NOT_SET -999
gdouble latitude;
diff --git a/src/libekolabconv/main/src/structs/event.h b/src/libekolabconv/main/src/structs/event.h
index 9d47261..4ae5f13 100644
--- a/src/libekolabconv/main/src/structs/event.h
+++ b/src/libekolabconv/main/src/structs/event.h
@@ -41,13 +41,13 @@ typedef enum {
typedef struct {
I_incidence *incidence;
- Show_time_as show_time_as; //default busy
- Date_or_datetime *end_date; //default not present
+ Show_time_as show_time_as; /* default busy */
+ Date_or_datetime *end_date; /* default not present */
/*
* <show-time-as>(string, default busy)</show-time-as>
- * <color-label>(string, default none)</color-label>
- * <end-date>(date or datetime, default not present)</end-date>
+ * <color-label>(string, default none)</color-label>
+ * <end-date>(date or datetime, default not present)</end-date>
*/
} I_event;
diff --git a/src/libekolabconv/main/src/structs/incidence.c b/src/libekolabconv/main/src/structs/incidence.c
index b17a7f8..ef1b3ef 100644
--- a/src/libekolabconv/main/src/structs/incidence.c
+++ b/src/libekolabconv/main/src/structs/incidence.c
@@ -102,7 +102,7 @@ free_alarm (void **data)
if (data && *data) {
Alarm *alm = (Alarm *)*data;
- // optional !!! to check
+ /* optional !!! to check */
if (alm->type == I_ALARM_TYPE_DISPLAY && alm->display_text!=NULL) {
G_STRING_FREE (alm->display_text);
} else if (alm->type == I_ALARM_TYPE_AUDIO && alm->audio_file!=NULL) {
@@ -130,13 +130,13 @@ free_recurrence (Recurrence **recurrence)
if (re->range_date!=NULL)
g_date_free (re->range_date);
- // g_free (re->range_date);
+ /* g_free (re->range_date); */
if (re->range_number!=NULL)
g_free (re->range_number);
- // TODO Free exclusion list.
- //generic_g_list_free (&re->exclusion, (void (*) (void **)) free_date_or_datetime);
+ /* TODO Free exclusion list. */
+ /* generic_g_list_free (&re->exclusion, (void (*) (void **)) free_date_or_datetime); */
g_free(re);
*recurrence = NULL;
@@ -299,7 +299,7 @@ print_recurrence (const Recurrence *recurrence)
log_debug ("\n\tDay Number: %d", recurrence->day_number);
if (recurrence->month != I_COMMON_MONTH_NULL)
log_debug ("\n\tMonth: %d", recurrence->month);
- //log_debug ("\n\tRange: %s", convRangeTypeToString (recurrence));
+ /* log_debug ("\n\tRange: %s", convRangeTypeToString (recurrence)); */
if (recurrence->exclusion)
print_exclusion (recurrence->exclusion);
} else
diff --git a/src/libekolabconv/main/src/structs/incidence.h b/src/libekolabconv/main/src/structs/incidence.h
index 5d8a5e6..c83fc3e 100644
--- a/src/libekolabconv/main/src/structs/incidence.h
+++ b/src/libekolabconv/main/src/structs/incidence.h
@@ -69,30 +69,30 @@ typedef enum {
} Alarm_type;
typedef struct{
- GString *display_name; //default ""
- GString *smtp_address; //default ""
- Incidence_status status; //no default
- gboolean request_response; //default true
- gboolean invitation_sent; //default true
- Incidence_role role; //default "required"
+ GString *display_name; /* default "" */
+ GString *smtp_address; /* default "" */
+ Incidence_status status; /* no default */
+ gboolean request_response; /* default true */
+ gboolean invitation_sent; /* default true */
+ Incidence_role role; /* default "required" */
Incidence_cutype cutype;
} Attendee;
typedef struct{
- Recurrence_cycle recurrence_cycle; //enum Recurrence_cycle
- gint interval; //default 1
+ Recurrence_cycle recurrence_cycle; /* enum Recurrence_cycle */
+ gint interval; /* default 1 */
/** Bitfield which combines values of RecurrenceDay enumeration
* can hold values from 0 (no day set) to 127 (all seven days set) */
gint weekdays;
- gint day_number; //no default
- Month month; //no default
+ gint day_number; /* no default */
+ Month month; /* no default */
- // at least one of range_date and range_number must be null.
+ /* at least one of range_date and range_number must be null. */
GDate *range_date;
gint *range_number;
- GList *exclusion; //no default, List of GDate
+ GList *exclusion; /* no default, List of GDate */
} Recurrence;
typedef struct{
@@ -101,42 +101,42 @@ typedef struct{
} Proc_param;
typedef struct{
- GList *addresses; //Elements of type GString containing email addresses
+ GList *addresses; /* Elements of type GString containing email addresses */
GString *subject;
GString *mail_text;
- GList *attachments; //Elements of type GString containing attachments
+ GList *attachments; /* Elements of type GString containing attachments */
} Email_param;
typedef struct{
Alarm_type type;
- // TODO: Incidence: enabled?
- gint start_offset; //to set how many minutes from the event beginning the alarm
- //should trigger, it's relative so negative values are allowed;
- gint end_offset; //to set how many minutes from the event end the alarm should
- //trigger, it's relative so negative values are allowed;
- gint repeat_count; //to set how many times an alarm should be repeated after the first time it got triggered;
- gint repeat_interval; //to set the amount of time between to repetition of the alarm.
-
- // I_INC_ROLE_OPTIONAL Fields
- GString *display_text; //Applicable when type is "display"
- GString *audio_file; //Applicable when type is "audio"
- Proc_param *proc_param; //Applicable when type is "procedure"
- Email_param *email_param; //Applicable when type is "email"
+ /* TODO: Incidence: enabled? */
+ gint start_offset; /* to set how many minutes from the event beginning the alarm */
+ /* should trigger, it's relative so negative values are allowed; */
+ gint end_offset; /* to set how many minutes from the event end the alarm should */
+ /* trigger, it's relative so negative values are allowed; */
+ gint repeat_count; /* to set how many times an alarm should be repeated after the first time it got triggered; */
+ gint repeat_interval; /* to set the amount of time between to repetition of the alarm. */
+
+ /* I_INC_ROLE_OPTIONAL Fields */
+ GString *display_text; /* Applicable when type is "display" */
+ GString *audio_file; /* Applicable when type is "audio" */
+ Proc_param *proc_param; /* Applicable when type is "procedure" */
+ Email_param *email_param; /* Applicable when type is "email" */
} Alarm;
typedef struct{
I_common *common;
- GString *summary; //default ""
- GString *location; //default ""
- GString *organizer_display_name; //default ""
- GString *organizer_smtp_address; //default ""
- Date_or_datetime *start_date; //default not present
- GList *advanced_alarm; //elements of type Alarm, simple alarm is also mapped to adv. alarm and converted back
+ GString *summary; /* default "" */
+ GString *location; /* default "" */
+ GString *organizer_display_name; /* default "" */
+ GString *organizer_smtp_address; /* default "" */
+ Date_or_datetime *start_date; /* default not present */
+ GList *advanced_alarm; /* elements of type Alarm, simple alarm is also mapped to adv. alarm and converted back */
Recurrence *recurrence;
- GList * attendee; //List of type Attendee
+ GList * attendee; /* List of type Attendee */
} I_incidence;
/*
diff --git a/src/libekolabconv/main/src/structs/note.h b/src/libekolabconv/main/src/structs/note.h
index 856067c..41012e9 100644
--- a/src/libekolabconv/main/src/structs/note.h
+++ b/src/libekolabconv/main/src/structs/note.h
@@ -34,7 +34,7 @@
*/
typedef struct {
I_common *common;
- GString *summary; //default empty
+ GString *summary; /* default empty */
} I_note;
/*
diff --git a/src/libekolabconv/main/src/structs/task.h b/src/libekolabconv/main/src/structs/task.h
index a292430..692784f 100644
--- a/src/libekolabconv/main/src/structs/task.h
+++ b/src/libekolabconv/main/src/structs/task.h
@@ -38,14 +38,15 @@ typedef enum {
typedef struct {
I_incidence *incidence;
- // x-kcal-priority (detailed 0-9) saved in priority and normal priority (1-5)
- // will be calculated from it when writing xml
+ /* x-kcal-priority (detailed 0-9) saved in priority and normal priority (1-5)
+ * will be calculated from it when writing xml
+ */
gint priority;
- guint completed; // default 0
- Task_status status; // default not-started
- Date_or_datetime *due_date; // default not present
- time_t *completed_datetime; // default: NULL
+ guint completed; /* default 0 */
+ Task_status status; /* default not-started */
+ Date_or_datetime *due_date; /* default not present */
+ time_t *completed_datetime; /* default: NULL */
} I_task;
I_task *new_i_task (void);
diff --git a/src/libekolabconv/main/src/util.c b/src/libekolabconv/main/src/util.c
index 0d1d00d..e947308 100644
--- a/src/libekolabconv/main/src/util.c
+++ b/src/libekolabconv/main/src/util.c
@@ -45,61 +45,61 @@
*/
gchar **str_split(const gchar *str, const gchar *delim)
{
- const gchar *head = str; // pointer to start of substring
- size_t l = 0; // length of current token
- size_t n_delim = strlen(delim) - 1; // last element of delimiter
+ const gchar *head = str; /* pointer to start of substring */
+ size_t l = 0; /* length of current token */
+ size_t n_delim = strlen(delim) - 1; /* last element of delimiter */
- guint buf_chunk = 16; // number of tokens per allocation
- guint buf_size = 0; // size of currently allocated memory
- guint tokc = 0; // token counter
+ guint buf_chunk = 16; /* number of tokens per allocation */
+ guint buf_size = 0; /* size of currently allocated memory */
+ guint tokc = 0; /* token counter */
- gint is_tok = 0; // true if end of token is reached
+ gint is_tok = 0; /* true if end of token is reached */
- gchar **tokens = NULL; // result array of string tokens
+ gchar **tokens = NULL; /* result array of string tokens */
while (1) {
- // detect and skip delimiter
+ /* detect and skip delimiter */
guint i;
for (i = 0; i <= n_delim; ++i) {
if (str[i] != delim[i])
- break; // no delimiter
+ break; /* no delimiter */
- if (i == n_delim) // delimiter found
+ if (i == n_delim) /* delimiter found */
is_tok = 1;
}
- // handle current token
- if (is_tok || *str == '\0') { // end of current token
- // allocate new memory if neccessary
- if (tokc + 1 >= buf_size) { // +1 for terminating NULL pointer
+ /* handle current token */
+ if (is_tok || *str == '\0') { /* end of current token */
+ /* allocate new memory if neccessary */
+ if (tokc + 1 >= buf_size) { /* +1 for terminating NULL pointer */
buf_size += buf_chunk;
tokens = realloc(tokens, sizeof(gchar*) * buf_size);
}
- // copy current token
+ /* copy current token */
tokens[tokc] = malloc(sizeof(gchar)*l + 1);
if (l) memcpy(tokens[tokc], head, sizeof(gchar) * l);
tokens[tokc][l] = '\0';
++tokc;
- // end of input string
+ /* end of input string */
if (*str == '\0')
break;
- // reset for new token
+ /* reset for new token */
l = 0;
str += n_delim + 1;
head = str;
is_tok = 0;
- } else { // inside current token,
- ++str; // next character
+ } else { /* inside current token, */
+ ++str; /* next character */
++l;
}
}
- // append terminating NULL pointer
+ /* append terminating NULL pointer */
tokens[tokc] = NULL;
return tokens;
@@ -112,9 +112,9 @@ void free_str_tokens(char **tok)
{
gint i;
for (i = 0; tok[i]; ++i)
- free(tok[i]); // free single tokens
+ free(tok[i]); /* free single tokens */
- free(tok); // free array of tokens
+ free(tok); /* free array of tokens */
}
gchar*
trim_all_spaces (gchar* str)
@@ -231,7 +231,7 @@ clone_kolab_conv_mail_part(Kolab_conv_mail_part *mpart)
-//TODO: Work on array directly and do not create a list; remove this operation when done.
+/* TODO: Work on array directly and do not create a list; remove this operation when done. */
GList*
klb_conv_mail_to_g_list (const Kolab_conv_mail* klb_mail)
{
@@ -265,14 +265,15 @@ time_t
time_gm(struct tm *tm)
{
return timegm(tm);
- //TRICKY: more portable code of the above line increases the number of
- // instructions for the unit tests by ca the factor of 2.2.
- // If you get problems with porting the code, it could be helpful
- // to replace the line above by the code below.
-
- /* portable version of BSD timegm(). cf. manpage for timegm():
+ /* TRICKY: more portable code of the above line increases the number of
+ * instructions for the unit tests by ca the factor of 2.2.
+ * If you get problems with porting the code, it could be helpful
+ * to replace the line above by the code below.
+ */
+ /* portable version of BSD timegm(). cf. manpage for timegm(): */
+#if 0
time_t ret;
char *tz;
@@ -286,5 +287,5 @@ time_gm(struct tm *tm)
unsetenv("TZ");
tzset();
return ret;
- */
+#endif
}
diff --git a/src/libekolabconv/test/src/email-parser.c b/src/libekolabconv/test/src/email-parser.c
index 01e8e44..b8bb686 100644
--- a/src/libekolabconv/test/src/email-parser.c
+++ b/src/libekolabconv/test/src/email-parser.c
@@ -28,11 +28,11 @@
#include "../../main/src/util.h"
-//########################################INTERNAL METHODS########################################
+/* ########################################INTERNAL METHODS######################################## */
typedef struct {
- GList *g_mime_objects; //GMimeObject *body;
+ GList *g_mime_objects; /* GMimeObject *body; */
} g_mime_objects_data;
@@ -45,7 +45,7 @@ write_email_to_disk (GMimeMessage *message, const char *folder_name)
char email_file_name[50];
strcpy (email_file_name, folder_name);
- //strcat(emailFileName, "generatedEmail.txt");
+ /* strcat(emailFileName, "generatedEmail.txt"); */
fp = fopen (email_file_name, "w");
@@ -69,7 +69,7 @@ find_email_attachments (GMimeObject *parent, GMimeObject *part, gpointer user_da
(void)parent;
g_mime_objects_data *data = user_data;
- //if (( parent->content_type->content type is text/plain or text/html) and (it's not an attachment))
+ /* if (( parent->content_type->content type is text/plain or text/html) and (it's not an attachment)) */
data->g_mime_objects = g_list_append (data->g_mime_objects, (GMimeObject *) part);
}
@@ -90,15 +90,15 @@ decode_base64_image_string (gchar *str, ssize_t len, gint *image_length)
static void
remove_extra_chars_after_xml_end_tag(gchar *xml_data, gchar *end_tag)
{
- gchar *ptr_to_last_tag = strstr(xml_data, end_tag); // set pointer to first char of end tag
+ gchar *ptr_to_last_tag = strstr(xml_data, end_tag); /* set pointer to first char of end tag */
gint index_to_start_of_last_tag;
- // if tag not found, it's the wrong tag and do nothing
+ /* if tag not found, it's the wrong tag and do nothing */
if (ptr_to_last_tag != NULL) {
index_to_start_of_last_tag = ptr_to_last_tag-xml_data;
- //log_debug("\na= %d, %s", indexToStartOfLastTag, ptrToLastTag);
+ /* log_debug("\na= %d, %s", indexToStartOfLastTag, ptrToLastTag); */
xml_data[index_to_start_of_last_tag+strlen(end_tag)] = '\0';
- //log_debug("\na= %d, %s", indexToStartOfLastTag, ptrToLastTag);
+ /* log_debug("\na= %d, %s", indexToStartOfLastTag, ptrToLastTag); */
}
}
@@ -114,7 +114,7 @@ static gchar
*text_length = g_mime_encoding_quoted_decode_step((guchar*) str, len,
(guchar*) text_data, &state, &save);
- // case analysis workaround for (contact, task, event and note), function does not remove anything if tag not found
+ /* case analysis workaround for (contact, task, event and note), function does not remove anything if tag not found */
remove_extra_chars_after_xml_end_tag(text_data, CONTACT_CLOSING_TAG);
remove_extra_chars_after_xml_end_tag(text_data, TASK_CLOSING_TAG);
remove_extra_chars_after_xml_end_tag(text_data, EVENT_CLOSING_TAG);
@@ -147,12 +147,12 @@ get_content_from_g_mime_object (GMimeObject *g_mime_obj, gint *image_length)
if (((GMimePart*) g_mime_obj)->content->encoding == GMIME_CONTENT_ENCODING_BASE64) {
image_buf = decode_base64_image_string (file_buf, stream_size, image_length);
- //write_binary_file("picture.png", outbuf, imageLength); //streamSize);
+ /* write_binary_file("picture.png", outbuf, imageLength); */ /* streamSize); */
g_free(file_buf);
return image_buf;
} else if (((GMimePart*)g_mime_obj)->content->encoding == GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE) {
image_buf = quoted_printable_to_string(file_buf, image_length);
- //write_binary_file("picture.png", outbuf, imageLength); //streamSize);
+ /* write_binary_file("picture.png", outbuf, imageLength); */ /* streamSize); */
g_free(file_buf);
return image_buf;
} else {
@@ -197,10 +197,10 @@ add_klb_mail_list_to_g_mime_message (GMimeMessage *message, const GList* klb_mai
content = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
g_object_unref (stream);
- //Add base 64 encoding for image types as we want to write image data in base64 format
-// if (strcmp (kolabconvMailPart->mime_type, "image/png") == 0) {
+ /* Add base 64 encoding for image types as we want to write image data in base64 format */
+ /* if (strcmp (kolabconvMailPart->mime_type, "image/png") == 0) { */
g_mime_part_set_content_encoding (mime_part, GMIME_CONTENT_ENCODING_BASE64);
-// }
+ /* } */
/* set the content object on the new mime part */
g_mime_part_set_content_object (mime_part, content);
@@ -216,7 +216,7 @@ add_klb_mail_list_to_g_mime_message (GMimeMessage *message, const GList* klb_mai
iterator = iterator->next;
g_strfreev (tokens);
- // TODO: put following 3 frees in one function in kolab-conv.c and call this one also from kolabconv_free_kmail(...)
+ /* TODO: put following 3 frees in one function in kolab-conv.c and call this one also from kolabconv_free_kmail(...) */
g_free(klb_mail_part->name);
g_free(klb_mail_part->mime_type);
g_free(klb_mail_part->data);
@@ -224,7 +224,7 @@ add_klb_mail_list_to_g_mime_message (GMimeMessage *message, const GList* klb_mai
}
/* now append the message's toplevel part to our multipart */
- //g_mime_multipart_add (multipart, message->mime_part);
+ /* g_mime_multipart_add (multipart, message->mime_part); */
/* now replace the message's toplevel mime part with our new multipart */
g_mime_message_set_mime_part (message, (GMimeObject *) multipart);
@@ -233,7 +233,7 @@ add_klb_mail_list_to_g_mime_message (GMimeMessage *message, const GList* klb_mai
}
-//########################################PUBLIC INTERFACE########################################
+/* ########################################PUBLIC INTERFACE######################################## */
#if 0
void
@@ -243,7 +243,7 @@ g_mime_read_email (gchar *email_file_name)
GMimeStream *main_email_stream = NULL;
GMimeParser *mime_parser = NULL;
GMimeMessage *mime_message = NULL;
- //ssize_t streamSize;
+ /* ssize_t streamSize; */
g_mime_objects_data g_mime_obj_data;
GList *iterator = NULL;
GMimeObject *g_mime_obj;
@@ -257,15 +257,15 @@ g_mime_read_email (gchar *email_file_name)
/* initialize GMime */
g_mime_init (0);
- //Associate GMimeStream tp the file object
- //stream = g_mime_stream_file_new ( fp );
+ /* Associate GMimeStream tp the file object */
+ /* stream = g_mime_stream_file_new ( fp ); */
main_email_stream = g_mime_stream_fs_new (dup (fileno (fp)));
- //Assign a mimeParser to the stream to read it eaisly.
+ /* Assign a mimeParser to the stream to read it eaisly. */
mime_parser = g_mime_parser_new_with_stream (main_email_stream);
printf ("\n*****************STEP 1: Get Main Message**********************************\n");
- //Use mimeParser to get the message part of mimeStream and print a sample e.g. From:
+ /* Use mimeParser to get the message part of mimeStream and print a sample e.g. From: */
mime_message = g_mime_parser_construct_message (mime_parser);
printf ("\nMime Message: Email sent From = %s", mime_message->from);
printf ("\nMime Message: Subject = %s", mime_message->subject);
@@ -274,7 +274,7 @@ g_mime_read_email (gchar *email_file_name)
printf (
"\n\n\n*****************STEP 2: Get all Parts of Message (Attachments)**********************************\n");
- //Using the constructed mimeMessge get all attachments
+ /* Using the constructed mimeMessge get all attachments */
g_mime_obj_data.g_mime_objects = NULL;
g_mime_message_foreach (mime_message, (GMimeObjectForeachFunc) find_email_attachments,
&g_mime_obj_data);
@@ -284,7 +284,7 @@ g_mime_read_email (gchar *email_file_name)
printf (
"\n\n\n*****************STEP 3: Loop through all Attachments**********************************\n");
while (iterator != NULL) {
- //Get the first GMimeObject
+ /* Get the first GMimeObject */
g_mime_obj = ((GMimeObject *) iterator->data);
printf ("\nAttachment #%d", (i + 1));
@@ -334,7 +334,7 @@ read_kolab_email_file(const gchar *filename, GError** error) {
GMimeStream *main_email_stream = NULL;
GMimeParser *mime_parser = NULL;
GMimeMessage *mime_message = NULL;
- //ssize_t streamSize;
+ /* ssize_t streamSize; */
g_mime_objects_data g_mime_obj_data;
GMimeObject *g_mime_obj;
FILE *fp = NULL;
@@ -348,32 +348,32 @@ read_kolab_email_file(const gchar *filename, GError** error) {
/* initialize GMime */
g_mime_init (0);
- //Associate GMimeStream tp the file object
+ /* Associate GMimeStream tp the file object */
main_email_stream = g_mime_stream_fs_new (dup (fileno (fp)));
- //Assign a mimeParser to the stream to read it eaisly.
+ /* Assign a mimeParser to the stream to read it eaisly. */
mime_parser = g_mime_parser_new_with_stream (main_email_stream);
- //Use mimeParser to get the message part of mimeStream and print a sample e.g. From:
+ /* Use mimeParser to get the message part of mimeStream and print a sample e.g. From: */
mime_message = g_mime_parser_construct_message (mime_parser);
- //Using the constructed mimeMessge get all attachments
+ /* Using the constructed mimeMessge get all attachments */
g_mime_obj_data.g_mime_objects = NULL;
g_mime_message_foreach (mime_message, find_email_attachments, &g_mime_obj_data);
iterator = g_mime_obj_data.g_mime_objects;
while (iterator != NULL) {
- //Get the first GMimeObject
+ /* Get the first GMimeObject */
g_mime_obj = ((GMimeObject *) iterator->data);
gchar *type = g_mime_obj->content_type->type;
- //printf("\na %s, %s", gMimeObj->content_type->type, gMimeObj->content_type->subtype);
+ /* printf("\na %s, %s", gMimeObj->content_type->type, gMimeObj->content_type->subtype); */
if ( strcmp (type, "Multipart") != 0 && strcmp (type, "multipart") != 0 &&
(strcmp (type, "Text") != 0) && (strcmp (type, "text") != 0) ){
gchar *fileName = NULL;
- //|| strcmp (gMimeObj->content_type->type, "image") == 0) {
+ /* || strcmp (gMimeObj->content_type->type, "image") == 0) { */
- //printf("\na %s, %s", gMimeObj->content_type->type, gMimeObj->content_type->subtype);
+ /* printf("\na %s, %s", gMimeObj->content_type->type, gMimeObj->content_type->subtype); */
file_buf = get_content_from_g_mime_object (g_mime_obj, &file_len);
@@ -408,7 +408,7 @@ read_kolab_email_file(const gchar *filename, GError** error) {
g_object_unref (mime_message);
fclose (fp);
- return g_list_to_kolab_conv_mail (klb_mail_list); //kolabconvMailList;
+ return g_list_to_kolab_conv_mail (klb_mail_list); /* kolabconvMailList; */
}
void
@@ -422,11 +422,11 @@ write_kolab_email_file (const Kolab_conv_mail *mail, const gchar *filename, GErr
construct_g_mime_message (message);
- //Add all attachments from the mail
+ /* Add all attachments from the mail */
GList *klb_mail_list = klb_conv_mail_to_g_list(mail);
add_klb_mail_list_to_g_mime_message (message, klb_mail_list);
- //write_message_to_screen (message);
+ /* write_message_to_screen (message); */
write_email_to_disk (message, filename);
g_object_unref (message);
diff --git a/src/libekolabconv/test/src/main.c b/src/libekolabconv/test/src/main.c
index 33ac32c..8a067c2 100644
--- a/src/libekolabconv/test/src/main.c
+++ b/src/libekolabconv/test/src/main.c
@@ -95,7 +95,7 @@ log_handler (const gchar *log_domain, GLogLevelFlags log_level,
}
fprintf(log_fp, "%s: %s\n", level, message);
fflush(log_fp);
- //g_log_default_handler (log_domain, log_level,message, user_data);
+ /* g_log_default_handler (log_domain, log_level,message, user_data); */
}
static void
@@ -109,14 +109,14 @@ free_mem(gpointer mem_ptr, gpointer unused)
int
main (int argc, char *argv[])
{
- // read values from test configuration file
+ /* read values from test configuration file */
read_config_file();
- // add log handler for all levels
+ /* add log handler for all levels */
g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
| G_LOG_FLAG_RECURSION, log_handler, NULL);
- // initialize glib testing framework
+ /* initialize glib testing framework */
g_test_init (&argc, &argv, NULL);
free_mem_after_test = NULL;
@@ -126,7 +126,7 @@ main (int argc, char *argv[])
add_all_tests_I_task();
add_all_tests_I_note();
- // run tests
+ /* run tests */
int success = g_test_run ();
g_list_foreach(free_mem_after_test, free_mem, NULL);
diff --git a/src/libekolabconv/test/src/test-evolution-contact.c b/src/libekolabconv/test/src/test-evolution-contact.c
index e25c845..c640676 100644
--- a/src/libekolabconv/test/src/test-evolution-contact.c
+++ b/src/libekolabconv/test/src/test-evolution-contact.c
@@ -288,7 +288,7 @@ validate_evolution_contact_3 (const I_contact *icontact, gint stage)
/*
* Phone Numbers
*/
- assert_phone_in_list (icontact->phone_numbers, "Weiteres Fax", ICONTACT_PHONE_BUSINESS_FAX); // Kolab does not have a type 'Other Fax' so it is mapped to business fax
+ assert_phone_in_list (icontact->phone_numbers, "Weiteres Fax", ICONTACT_PHONE_BUSINESS_FAX); /* Kolab does not have a type 'Other Fax' so it is mapped to business fax */
assert_phone_in_list (icontact->phone_numbers, "Weiteres Tel", ICONTACT_PHONE_OTHER);
assert_phone_in_list (icontact->phone_numbers, "Fax privat", ICONTACT_PHONE_HOME_FAX);
assert_phone_in_list (icontact->phone_numbers, "Autotelefon", ICONTACT_PHONE_CAR);
diff --git a/src/libekolabconv/test/src/test-evolution-event.c b/src/libekolabconv/test/src/test-evolution-event.c
index 41e1f43..4651b36 100644
--- a/src/libekolabconv/test/src/test-evolution-event.c
+++ b/src/libekolabconv/test/src/test-evolution-event.c
@@ -42,11 +42,11 @@ validate_evolution_event_1(const I_event *ievent, gint stage)
"2010-08-25 14:40:07", stage);
validate_iincidence(ievent->incidence,
- "event_e1", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-08-27 14:30:00", // startdate
+ "event_e1", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-08-27 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -77,11 +77,11 @@ validate_evolution_event_2(const I_event *ievent, gint stage)
ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:42:20", "2010-08-25 14:42:20", stage);
validate_iincidence(ievent->incidence,
- "event_e2", // summary
- "Ort", // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-08-27 14:30:00", // startdate
+ "event_e2", /* summary */
+ "Ort", /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-08-27 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -104,11 +104,11 @@ validate_evolution_event_3(const I_event *ievent, gint stage)
ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:45:51", "2010-08-25 14:45:51", stage);
validate_iincidence(ievent->incidence,
- "event_e3", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-08-27 14:30:00", // startdate
+ "event_e3", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-08-27 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -129,11 +129,11 @@ validate_evolution_event_4(const I_event *ievent, gint stage)
ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:48:07", "2010-08-25 14:48:07", stage);
validate_iincidence(ievent->incidence,
- "event_e4", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-08-27 14:30:00", // startdate
+ "event_e4", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-08-27 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -149,17 +149,17 @@ validate_evolution_event_5(const I_event *ievent, gint stage)
assert_Alarm_in_list(
ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY, // type
- -15, // start_offset
- 0, // end_offset
- 2, // repeat_count
- 5, // repeat_interval
- NULL, // display_text
- NULL, // audio_file
- NULL, // procParam_program
- NULL, // procParam_arguments
- NULL, // emailParam_subject
- NULL); // emailParam_mailText
+ I_ALARM_TYPE_DISPLAY, /* type */
+ -15, /* start_offset */
+ 0, /* end_offset */
+ 2, /* repeat_count */
+ 5, /* repeat_interval */
+ NULL, /* display_text */
+ NULL, /* audio_file */
+ NULL, /* procParam_program */
+ NULL, /* procParam_arguments */
+ NULL, /* emailParam_subject */
+ NULL); /* emailParam_mailText */
}
void
@@ -169,17 +169,17 @@ validate_evolution_event_6(const I_event *ievent, gint stage)
assert_Alarm_in_list(
ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_AUDIO, // type
- 1020, // start_offset
- 0, // end_offset
- 3, // repeat_count
- 360, // repeat_interval
- NULL, // display_text
- NULL, // audio_file
- NULL, // procParam_program
- NULL, // procParam_arguments
- NULL, // emailParam_subject
- NULL); // emailParam_mailText
+ I_ALARM_TYPE_AUDIO, /* type */
+ 1020, /* start_offset */
+ 0, /* end_offset */
+ 3, /* repeat_count */
+ 360, /* repeat_interval */
+ NULL, /* display_text */
+ NULL, /* audio_file */
+ NULL, /* procParam_program */
+ NULL, /* procParam_arguments */
+ NULL, /* emailParam_subject */
+ NULL); /* emailParam_mailText */
}
void
@@ -189,17 +189,17 @@ validate_evolution_event_7(const I_event *ievent, gint stage)
assert_Alarm_in_list(
ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_AUDIO, // type
- 0, // start_offset
- 18720, // end_offset
- 0, // repeat_count
- 0, // repeat_interval
- NULL, // display_text
- "file:///usr/share/sounds/gnome/default/alerts/bark.ogg", // audio_file
- NULL, // procParam_program
- NULL, // procParam_arguments
- NULL, // emailParam_subject
- NULL); // emailParam_mailText
+ I_ALARM_TYPE_AUDIO, /* type */
+ 0, /* start_offset */
+ 18720, /* end_offset */
+ 0, /* repeat_count */
+ 0, /* repeat_interval */
+ NULL, /* display_text */
+ "file:///usr/share/sounds/gnome/default/alerts/bark.ogg", /* audio_file */
+ NULL, /* procParam_program */
+ NULL, /* procParam_arguments */
+ NULL, /* emailParam_subject */
+ NULL); /* emailParam_mailText */
}
void
@@ -209,17 +209,17 @@ validate_evolution_event_8(const I_event *ievent, gint stage)
assert_Alarm_in_list(
ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_PROCEDURE, // type
- 0, // start_offset
- -15840, // end_offset
- 3, // repeat_count
- 120, // repeat_interval
- NULL, // display_text
- NULL, // audio_file
- "/usr/bin/xmessage", // procParam_program
- "Alert!", // procParam_arguments
- NULL, // emailParam_subject
- NULL); // emailParam_mailText
+ I_ALARM_TYPE_PROCEDURE, /* type */
+ 0, /* start_offset */
+ -15840, /* end_offset */
+ 3, /* repeat_count */
+ 120, /* repeat_interval */
+ NULL, /* display_text */
+ NULL, /* audio_file */
+ "/usr/bin/xmessage", /* procParam_program */
+ "Alert!", /* procParam_arguments */
+ NULL, /* emailParam_subject */
+ NULL); /* emailParam_mailText */
}
void
@@ -230,11 +230,11 @@ validate_evolution_event_9(const I_event *ievent, gint stage)
g_assert(SHOW_TIME_AS_FREE == ievent->show_time_as);
validate_iincidence(ievent->incidence,
- "event_e9", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-08-27", // startdate
+ "event_e9", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-08-27", /* startdate */
stage);
assert_equal_gdate("2010-08-27", ievent->end_date->date);
@@ -645,15 +645,15 @@ validate_evolution_event_25(const I_event *ievent, gint stage)
* </recurrence>
*/
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY, // Recurrence_cycle
- 2, // interval
- 13, // range_number
- NULL, // range_date
- 0, // weekdays
- 0, // day_number
- I_COMMON_MONTH_NULL); // month
-
- // exclusions
+ I_REC_CYCLE_DAILY, /* Recurrence_cycle */
+ 2, /* interval */
+ 13, /* range_number */
+ NULL, /* range_date */
+ 0, /* weekdays */
+ 0, /* day_number */
+ I_COMMON_MONTH_NULL); /* month */
+
+ /* exclusions */
g_assert(ievent->incidence->recurrence->exclusion != NULL);
assert_GDate_in_list(ievent->incidence->recurrence->exclusion, "2010-09-08");
assert_GDate_in_list(ievent->incidence->recurrence->exclusion, "2010-09-17");
@@ -769,13 +769,13 @@ validate_evolution_event_30(const I_event *ievent, gint stage)
g_assert(ievent->incidence->recurrence != NULL);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY, // Recurrence_cycle
- 1, // interval
- 10, // range_number
- NULL, // range_date
- 2, // weekdays
- 4, // day_number
- I_COMMON_FEB); // month
+ I_REC_CYCLE_YEARLY_WEEKDAY, /* Recurrence_cycle */
+ 1, /* interval */
+ 10, /* range_number */
+ NULL, /* range_date */
+ 2, /* weekdays */
+ 4, /* day_number */
+ I_COMMON_FEB); /* month */
}
void
@@ -797,11 +797,11 @@ validate_evolution_event_tz1(const I_event *ievent, gint stage)
strip_cr_cpy(ievent->incidence->common->vtimezone));
validate_iincidence(ievent->incidence,
- "event_tz1", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-03 14:30:00", // startdate
+ "event_tz1", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-03 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -837,11 +837,11 @@ validate_evolution_event_tz2(const I_event *ievent, gint stage)
strip_cr_cpy(ievent->incidence->common->vtimezone));
validate_iincidence(ievent->incidence,
- "event_tz2", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-03 08:30:00", // startdate
+ "event_tz2", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-03 08:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -877,11 +877,11 @@ validate_evolution_event_tz3(const I_event *ievent, gint stage)
strip_cr_cpy(ievent->incidence->common->vtimezone));
validate_iincidence(ievent->incidence,
- "event_tz3", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-03 14:30:00", // startdate
+ "event_tz3", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-03 14:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -917,11 +917,11 @@ validate_evolution_event_tz4(const I_event *ievent, gint stage)
strip_cr_cpy(ievent->incidence->common->vtimezone));
validate_iincidence(ievent->incidence,
- "event_tz4", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-02 23:30:00", // startdate
+ "event_tz4", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-02 23:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -957,11 +957,11 @@ validate_evolution_event_tz5(const I_event *ievent, gint stage)
strip_cr_cpy(ievent->incidence->common->vtimezone));
validate_iincidence(ievent->incidence,
- "event_tz5", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-03 11:05:00", // startdate
+ "event_tz5", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-03 11:05:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -978,11 +978,11 @@ validate_evolution_event_tz6(const I_event *ievent, gint stage)
g_assert(ievent->incidence->common->vtimezone == NULL);
validate_iincidence(ievent->incidence,
- "event_tz6", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2010-11-04 11:13:00", // startdate
+ "event_tz6", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2010-11-04 11:13:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -1020,11 +1020,11 @@ validate_evolution_event_tz7(const I_event *ievent, gint stage)
assert_equal("start date before DST, end date in DST", ievent->incidence->common->body);
validate_iincidence(ievent->incidence,
- "event_tz7", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2011-03-27 00:30:00", // startdate
+ "event_tz7", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2011-03-27 00:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -1062,11 +1062,11 @@ validate_evolution_event_tz8(const I_event *ievent, gint stage)
assert_equal("start date in DST, end date after DST", ievent->incidence->common->body);
validate_iincidence(ievent->incidence,
- "event_tz8", // summary
- NULL, // location
- NULL, // organizer displayname
- NULL, // organizer smtp-address
- "2011-10-29 23:30:00", // startdate
+ "event_tz8", /* summary */
+ NULL, /* location */
+ NULL, /* organizer displayname */
+ NULL, /* organizer smtp-address */
+ "2011-10-29 23:30:00", /* startdate */
stage);
g_assert(ievent->incidence->recurrence == NULL);
@@ -1113,9 +1113,9 @@ validate_evolution_event_b1(const I_event *ievent, gint stage)
*/
- // advanced alarms
+ /* advanced alarms */
g_assert_cmpint(g_list_length(ievent->incidence->advanced_alarm), ==, 1);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
Alarm *mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_EMAIL,
-15,
diff --git a/src/libekolabconv/test/src/test-evolution-task.c b/src/libekolabconv/test/src/test-evolution-task.c
index 9e61477..84871d0 100644
--- a/src/libekolabconv/test/src/test-evolution-task.c
+++ b/src/libekolabconv/test/src/test-evolution-task.c
@@ -34,21 +34,21 @@ void
validate_evolution_task_1(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T112850Z-1270-1000-1-12 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:29:02", // creation_date
- "2010-08-25 11:29:02", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T112850Z-1270-1000-1-12 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:29:02", /* creation_date */
+ "2010-08-25 11:29:02", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e1",
NULL,
@@ -57,8 +57,8 @@ validate_evolution_task_1(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
@@ -67,21 +67,21 @@ void
validate_evolution_task_2(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* todo not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T113232Z-1270-1000-1-14 hhelwi-virt bonn tarent de", // uid
- "Beschreibung", // body
- "Urlaubskarten,Strategien,Urlaub,Konkurrenz,Jahrestag,Anrufe,Allgemeines,HeiÃe Kontakte,Lieferanten,Zeit und Ausgaben,Geschenke,International,Favoriten,Ideen,VIP,GeschÃftlich,PersÃnlich,Status,Ziele/Zielsetzungen,Geburtstag,SchlÃssel-Kunde,Wartend", // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:34:47", // creation_date
- "2010-08-25 11:34:47", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T113232Z-1270-1000-1-14 hhelwi-virt bonn tarent de", /* uid */
+ "Beschreibung", /* body */
+ "Urlaubskarten,Strategien,Urlaub,Konkurrenz,Jahrestag,Anrufe,Allgemeines,HeiÃe Kontakte,Lieferanten,Zeit und Ausgaben,Geschenke,International,Favoriten,Ideen,VIP,GeschÃftlich,PersÃnlich,Status,Ziele/Zielsetzungen,Geburtstag,SchlÃssel-Kunde,Wartend", /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:34:47", /* creation_date */
+ "2010-08-25 11:34:47", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e2",
NULL,
@@ -90,8 +90,8 @@ validate_evolution_task_2(const I_task *itask, gint stage)
"2010-08-18",
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
@@ -101,21 +101,21 @@ void
validate_evolution_task_3(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, VTIMEZONE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, VTIMEZONE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T113451Z-1270-1000-1-15 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:36:15", // creation_date
- "2010-08-25 11:36:15", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T113451Z-1270-1000-1-15 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:36:15", /* creation_date */
+ "2010-08-25 11:36:15", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e3",
NULL,
@@ -124,8 +124,8 @@ validate_evolution_task_3(const I_task *itask, gint stage)
"2010-08-11 13:30:00",
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
@@ -135,21 +135,21 @@ void
validate_evolution_task_4(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T113625Z-1270-1000-1-16 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:36:55", // creation_date
- "2010-08-25 11:36:55", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T113625Z-1270-1000-1-16 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:36:55", /* creation_date */
+ "2010-08-25 11:36:55", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e4",
NULL,
@@ -158,8 +158,8 @@ validate_evolution_task_4(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
assert_equal_gdate("2010-08-25", itask->due_date->date);
@@ -170,21 +170,21 @@ void
validate_evolution_task_5(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T113703Z-1270-1000-1-17 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:37:59", // creation_date
- "2010-08-25 11:37:59", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T113703Z-1270-1000-1-17 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:37:59", /* creation_date */
+ "2010-08-25 11:37:59", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e5",
NULL,
@@ -193,8 +193,8 @@ validate_evolution_task_5(const I_task *itask, gint stage)
"2010-08-20 01:30:00",
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
assert_equal_timestamp("2010-08-21 00:00:00", itask->due_date->date_time);
@@ -205,21 +205,21 @@ void
validate_evolution_task_6(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, ATTACH:file:
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, ATTACH:file: */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T113802Z-1270-1000-1-18 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:39:28", // creation_date
- "2010-08-25 11:39:28", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T113802Z-1270-1000-1-18 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:39:28", /* creation_date */
+ "2010-08-25 11:39:28", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e6",
NULL,
@@ -228,12 +228,12 @@ validate_evolution_task_6(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
- // evolution store
+ /* evolution store */
g_assert(itask->incidence->common->evolution_store == NULL);
}
@@ -243,21 +243,21 @@ void
validate_evolution_task_7(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, URL
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, URL */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T114223Z-1270-1000-1-20 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:44:18", // creation_date
- "2010-08-25 11:44:18", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T114223Z-1270-1000-1-20 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:44:18", /* creation_date */
+ "2010-08-25 11:44:18", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e7",
NULL,
@@ -266,8 +266,8 @@ validate_evolution_task_7(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(4, priority_xkcal_to_k(itask->priority)); // 7 not possible in kolab, mapped to 4
+ /* task */
+ assert_equal_int(4, priority_xkcal_to_k(itask->priority)); /* 7 not possible in kolab, mapped to 4 */
assert_equal_int(7, itask->priority);
assert_equal_int(42, itask->completed);
g_assert(I_TASK_IN_PROGRESS == itask->status);
@@ -284,21 +284,21 @@ void
validate_evolution_task_8(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, COMPLETED
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T114436Z-1270-1000-1-21 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:45:56", // creation_date
- "2010-08-25 11:45:56", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T114436Z-1270-1000-1-21 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:45:56", /* creation_date */
+ "2010-08-25 11:45:56", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e8",
NULL,
@@ -307,8 +307,8 @@ validate_evolution_task_8(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 5 not possible in kolab, mapped to 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 5 not possible in kolab, mapped to 3 */
assert_equal_int(5, itask->priority);
assert_equal_int(100, itask->completed);
g_assert(I_TASK_COMPLETED == itask->status);
@@ -319,21 +319,21 @@ void
validate_evolution_task_9(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T114618Z-1270-1000-1-22 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:48:20", // creation_date
- "2010-08-25 11:48:20", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T114618Z-1270-1000-1-22 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:48:20", /* creation_date */
+ "2010-08-25 11:48:20", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e9",
NULL,
@@ -342,11 +342,11 @@ validate_evolution_task_9(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(2, priority_xkcal_to_k(itask->priority)); // evolution 3 mapped to kolab 2
+ /* task */
+ assert_equal_int(2, priority_xkcal_to_k(itask->priority)); /* evolution 3 mapped to kolab 2 */
assert_equal_int(3, itask->priority);
assert_equal_int(97, itask->completed);
- g_assert(I_TASK_NOT_STARTED == itask->status); // Cancelled is mapped to I_TASK_NOT_STARTED due to no equivalent value
+ g_assert(I_TASK_NOT_STARTED == itask->status); /* Cancelled is mapped to I_TASK_NOT_STARTED due to no equivalent value */
}
@@ -354,21 +354,21 @@ void
validate_evolution_task_10(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, COMPLETED
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T114822Z-1270-1000-1-23 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:49:29", // creation_date
- "2010-08-25 11:49:29", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T114822Z-1270-1000-1-23 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:49:29", /* creation_date */
+ "2010-08-25 11:49:29", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e10",
NULL,
@@ -377,8 +377,8 @@ validate_evolution_task_10(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(100, itask->completed);
g_assert(I_TASK_COMPLETED == itask->status);
@@ -389,21 +389,21 @@ void
validate_evolution_task_11(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, COMPLETED
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T115001Z-1270-1000-1-25 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 11:50:33", // creation_date
- "2010-08-25 11:55:03", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T115001Z-1270-1000-1-25 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 11:50:33", /* creation_date */
+ "2010-08-25 11:55:03", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e11",
NULL,
@@ -412,8 +412,8 @@ validate_evolution_task_11(const I_task *itask, gint stage)
"2010-08-19 08:00:00",
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(100, itask->completed);
g_assert(I_TASK_COMPLETED == itask->status);
@@ -425,21 +425,21 @@ void
validate_evolution_task_12(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE, X-LIC-ERROR;X-LIC-ERRORTYPE, ATTENDEE;CUTYPE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE, X-LIC-ERROR;X-LIC-ERRORTYPE, ATTENDEE;CUTYPE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T120335Z-1270-1000-1-28 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PUBLIC, // sensitivity
- "2010-08-25 12:04:46", // creation_date
- "2010-08-25 12:15:25", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T120335Z-1270-1000-1-28 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PUBLIC, /* sensitivity */
+ "2010-08-25 12:04:46", /* creation_date */
+ "2010-08-25 12:15:25", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e12",
NULL,
@@ -448,14 +448,14 @@ validate_evolution_task_12(const I_task *itask, gint stage)
NULL,
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(itask->incidence->attendee,
"Donald Duck",
"donald duck de",
- I_INC_STATUS_NONE, // Needs_Action is mapped to none due to noch equivalent value
+ I_INC_STATUS_NONE, /* Needs_Action is mapped to none due to noch equivalent value */
TRUE,
FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL); // Chait is mapped to I_INC_ROLE_REQUIRED due to non equivalent value
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL); /* Chait is mapped to I_INC_ROLE_REQUIRED due to non equivalent value */
assert_attendee_in_list(itask->incidence->attendee,
"Micky Maus",
@@ -497,8 +497,8 @@ validate_evolution_task_12(const I_task *itask, gint stage)
FALSE,
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
@@ -508,21 +508,21 @@ void
validate_evolution_task_13(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T142609Z-1270-1000-1-35 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_PRIVATE, // sensitivity
- "2010-08-25 14:30:21", // creation_date
- "2010-08-25 14:30:21", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T142609Z-1270-1000-1-35 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_PRIVATE, /* sensitivity */
+ "2010-08-25 14:30:21", /* creation_date */
+ "2010-08-25 14:30:21", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e13",
NULL,
@@ -531,8 +531,8 @@ validate_evolution_task_13(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
@@ -542,21 +542,21 @@ void
validate_evolution_task_14(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // todo not handled elements: DTSTAMP, SEQUENCE
+ /* TODO not handled elements: DTSTAMP, SEQUENCE */
- // common
+ /* common */
validate_icommon(
itask->incidence->common,
- "-//Ximian//NONSGML Evolution Calendar//EN", // product_id
- "20100825T143053Z-1270-1000-1-36 hhelwi-virt bonn tarent de", // uid
- NULL, // body
- NULL, // categories
- ICOMMON_SENSITIVITY_CONFIDENTIAL, // sensitivity
- "2010-08-25 14:31:48", // creation_date
- "2010-08-25 14:31:48", // last_modification_date
+ "-//Ximian//NONSGML Evolution Calendar//EN", /* product_id */
+ "20100825T143053Z-1270-1000-1-36 hhelwi-virt bonn tarent de", /* uid */
+ NULL, /* body */
+ NULL, /* categories */
+ ICOMMON_SENSITIVITY_CONFIDENTIAL, /* sensitivity */
+ "2010-08-25 14:31:48", /* creation_date */
+ "2010-08-25 14:31:48", /* last_modification_date */
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_e14",
NULL,
@@ -565,8 +565,8 @@ validate_evolution_task_14(const I_task *itask, gint stage)
NULL,
stage);
- // task
- assert_equal_int(3, priority_xkcal_to_k(itask->priority)); // 0 not possible in kolab, set to default 3
+ /* task */
+ assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
}
diff --git a/src/libekolabconv/test/src/test-kolab-contact.c b/src/libekolabconv/test/src/test-kolab-contact.c
index f5fcdad..bbf4a03 100644
--- a/src/libekolabconv/test/src/test-kolab-contact.c
+++ b/src/libekolabconv/test/src/test-kolab-contact.c
@@ -46,9 +46,9 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
icontact->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.91CCE9951F664909BC8E3F245FAA1DCB",
- IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "Notizen\n123" : "Notizen\r\n123\r\n", // TODO: handle/remove/convert "\r" ??
+ IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "Notizen\n123" : "Notizen\r\n123\r\n", /* TODO: handle/remove/convert "\r" ?? */
NULL,
- ICOMMON_SENSITIVITY_NULL, // in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store
+ ICOMMON_SENSITIVITY_NULL, /* in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store */
"2010-08-19 12:50:08",
"2010-08-19 15:11:27",
stage);
@@ -74,20 +74,24 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
/*
* Emails
*/
- // XXX: (Toltec) Writes E-Mail address to field display_name. Evolution only provides smtp_address
- // Check when reading if smtp_address is empty and display_name is valid E-Mail address -> write to smtp.
-// assert_email_in_list (icontact->emails, NULL, "em il1");
-// assert_email_in_list (icontact->emails, NULL, "em il2");
-// assert_email_in_list (icontact->emails, NULL, "em il3");
- // <email>
- // <display-name>em il1</display-name>
- // </email>
- // <email>
- // <display-name>em il2</display-name>
- // </email>
- // <email>
- // <display-name>em il3</display-name>
- // </email>
+ /* XXX: (Toltec) Writes E-Mail address to field display_name. Evolution only provides smtp_address
+ * Check when reading if smtp_address is empty and display_name is valid E-Mail address -> write to smtp.
+ */
+#if 0
+ assert_email_in_list (icontact->emails, NULL, "em il1");
+ assert_email_in_list (icontact->emails, NULL, "em il2");
+ assert_email_in_list (icontact->emails, NULL, "em il3");
+#endif
+ /* <email>
+ * <display-name>em il1</display-name>
+ * </email>
+ * <email>
+ * <display-name>em il2</display-name>
+ * </email>
+ * <email>
+ * <display-name>em il3</display-name>
+ * </email>
+ */
/*
@@ -103,11 +107,11 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
/*
* Phone Numbers
*/
- // FIXME: Order of home/business phone gets mixed up when converting to and from econtact/vcard.
+ /* FIXME: Order of home/business phone gets mixed up when converting to and from econtact/vcard. */
assert_phone_in_list (icontact->phone_numbers, "+246 (0228) 123456783423", ICONTACT_PHONE_ASSISTANT);
assert_phone_in_list (icontact->phone_numbers, "123", ICONTACT_PHONE_BUSINESS_1);
- assert_phone_in_list (icontact->phone_numbers, "45645645", ICONTACT_PHONE_BUSINESS_1); // business 2
- assert_phone_in_list (icontact->phone_numbers, "45645645", ICONTACT_PHONE_PRIMARY); // business 2
+ assert_phone_in_list (icontact->phone_numbers, "45645645", ICONTACT_PHONE_BUSINESS_1); /* business 2 */
+ assert_phone_in_list (icontact->phone_numbers, "45645645", ICONTACT_PHONE_PRIMARY); /* business 2 */
assert_phone_in_list (icontact->phone_numbers, "+503 (8888) 5546 - 56", ICONTACT_PHONE_BUSINESS_FAX);
assert_phone_in_list (icontact->phone_numbers, "+246 3453453453", ICONTACT_PHONE_CALLBACK);
assert_phone_in_list (icontact->phone_numbers, "+246 3489678", ICONTACT_PHONE_CAR);
@@ -116,9 +120,9 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
/*
* Cooperation Fields
*/
- assert_equal("Firma", icontact->organization); // ORG[1]
- assert_equal(NULL, icontact->department); // ORG[2]
- assert_equal(NULL, icontact->office_location); // ORG[3]
+ assert_equal("Firma", icontact->organization); /* ORG[1] */
+ assert_equal(NULL, icontact->department); /* ORG[2] */
+ assert_equal(NULL, icontact->office_location); /* ORG[3] */
assert_equal("Position", icontact->job_title);
assert_equal(NULL, icontact->profession);
assert_equal(NULL, icontact->manager_name);
@@ -172,19 +176,20 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
validate_kolab_store_xml(list, 11, "phone");
validate_kolab_store_xml(list, 12, "phone");
- // With restriction of 8 numbers now 11 numbers in kolab store
-// assert_phone_in_list (icontact->phone_numbers, "+1 (12121) 34234456456456", ICONTACT_PHONE_HOME_1);
-// assert_phone_in_list (icontact->phone_numbers, "4562", ICONTACT_PHONE_HOME_2); // in kolab store not splitted in two numbers
-// assert_phone_in_list (icontact->phone_numbers, "+1 (5675) 7567567 - 566", ICONTACT_PHONE_HOME_FAX);
-// assert_phone_in_list (icontact->phone_numbers, "78078", ICONTACT_PHONE_ISDN);
-// assert_phone_in_list (icontact->phone_numbers, "+509 (5675) 56756756567567", ICONTACT_PHONE_MOBILE);
-// assert_phone_in_list (icontact->phone_numbers, "45634578", ICONTACT_PHONE_OTHER);
-// assert_phone_in_list (icontact->phone_numbers, "89789 45", ICONTACT_PHONE_PAGER);
-// assert_phone_in_list (icontact->phone_numbers, "456456456", ICONTACT_PHONE_PRIMARY);
-// assert_phone_in_list (icontact->phone_numbers, "+246 4444444", ICONTACT_PHONE_RADIO);
-// assert_phone_in_list (icontact->phone_numbers, "+246 79789789789", ICONTACT_PHONE_TELEX);
-// assert_phone_in_list (icontact->phone_numbers, "5675675533333", ICONTACT_PHONE_TTYTDD);
-
+ /* With restriction of 8 numbers now 11 numbers in kolab store */
+#if 0
+ assert_phone_in_list (icontact->phone_numbers, "+1 (12121) 34234456456456", ICONTACT_PHONE_HOME_1);
+ assert_phone_in_list (icontact->phone_numbers, "4562", ICONTACT_PHONE_HOME_2); /* in kolab store not splitted in two numbers */
+ assert_phone_in_list (icontact->phone_numbers, "+1 (5675) 7567567 - 566", ICONTACT_PHONE_HOME_FAX);
+ assert_phone_in_list (icontact->phone_numbers, "78078", ICONTACT_PHONE_ISDN);
+ assert_phone_in_list (icontact->phone_numbers, "+509 (5675) 56756756567567", ICONTACT_PHONE_MOBILE);
+ assert_phone_in_list (icontact->phone_numbers, "45634578", ICONTACT_PHONE_OTHER);
+ assert_phone_in_list (icontact->phone_numbers, "89789 45", ICONTACT_PHONE_PAGER);
+ assert_phone_in_list (icontact->phone_numbers, "456456456", ICONTACT_PHONE_PRIMARY);
+ assert_phone_in_list (icontact->phone_numbers, "+246 4444444", ICONTACT_PHONE_RADIO);
+ assert_phone_in_list (icontact->phone_numbers, "+246 79789789789", ICONTACT_PHONE_TELEX);
+ assert_phone_in_list (icontact->phone_numbers, "5675675533333", ICONTACT_PHONE_TTYTDD);
+#endif
list = kolab_store_get_element_list(icontact->common, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "initials");
@@ -204,7 +209,7 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
"uUzgnRqsSd",
"Bemerkungen\n123\ntest",
"Familie,Freund,GeschÃftliches,Hotel,Kunde,LinuxTag,Partner,Presse,Schule,test",
- ICOMMON_SENSITIVITY_NULL, // in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store
+ ICOMMON_SENSITIVITY_NULL, /* in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store */
"2010-06-15 17:33:37",
"2010-06-30 13:52:32",
stage);
@@ -250,7 +255,7 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
"Deutschland");
- // 3 following addresses are in kolab store
+ /* 3 following addresses are in kolab store */
/*
* Phone Numbers
@@ -267,9 +272,9 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
/*
* Cooperation Fields
*/
- assert_equal("Organisation", icontact->organization); // ORG[1]
- assert_equal("Abteilung", icontact->department); // ORG[2]
- assert_equal("BÃro", icontact->office_location); // ORG[3]
+ assert_equal("Organisation", icontact->organization); /* ORG[1] */
+ assert_equal("Abteilung", icontact->department); /* ORG[2] */
+ assert_equal("BÃro", icontact->office_location); /* ORG[3] */
assert_equal("Details Titel", icontact->job_title);
assert_equal("Beruf", icontact->profession);
assert_equal("Name des Managers", icontact->manager_name);
@@ -305,7 +310,7 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
assert_custom_field_in_list(icontact->custom_list, KLBX_CNT_X_CUSTOM_APP_GADUGADU, "All", "gadu");
assert_custom_field_in_list(icontact->custom_list, KLBX_CNT_X_CUSTOM_APP_GROUPWISE, "All", "groupwise");
assert_custom_field_in_list(icontact->custom_list, KLBX_CNT_X_CUSTOM_APP_ICQ, "All", "icq");
- // evolution can save maximum 4 im's, rest is saved in kolab store!
+ /* evolution can save maximum 4 im's, rest is saved in kolab store! */
assert_custom_field_in_list(icontact->custom_list, "", KLBX_CNT_X_CUSTOM_NAME_BLOGFEED, "http://www.blog.de";);
/*
@@ -315,7 +320,7 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
GList *list;
list = kolab_store_get_element_list(icontact->common, icontact->common);
- g_assert_cmpint(g_list_length(list), ==, IS_TEST_STAGE_EVO_TO_INTERN(stage) ? 18:11); // x-custom fields can not be set before conversion to evolution
+ g_assert_cmpint(g_list_length(list), ==, IS_TEST_STAGE_EVO_TO_INTERN(stage) ? 18:11); /* x-custom fields can not be set before conversion to evolution */
validate_kolab_store_xml(list, 0, "sensitivity");
validate_kolab_store_xml(list, 1, "im-address");
validate_kolab_store_xml(list, 2, "role");
@@ -328,13 +333,15 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
validate_kolab_store_xml(list, 9, "address");
validate_kolab_store_xml(list, 10, "preferred-address");
- // With restriction of 8 numbers now 4 numbers in Kolab store
-// assert_phone_in_list (icontact->phone_numbers, "901", ICONTACT_PHONE_TELEX);
-// assert_phone_in_list (icontact->phone_numbers, "109", ICONTACT_PHONE_ISDN);
-// assert_phone_in_list (icontact->phone_numbers, "210", ICONTACT_PHONE_ASSISTANT);
-// assert_phone_in_list (icontact->phone_numbers, "321", ICONTACT_PHONE_PAGER);
+ /* With restriction of 8 numbers now 4 numbers in Kolab store */
+#if 0
+ assert_phone_in_list (icontact->phone_numbers, "901", ICONTACT_PHONE_TELEX);
+ assert_phone_in_list (icontact->phone_numbers, "109", ICONTACT_PHONE_ISDN);
+ assert_phone_in_list (icontact->phone_numbers, "210", ICONTACT_PHONE_ASSISTANT);
+ assert_phone_in_list (icontact->phone_numbers, "321", ICONTACT_PHONE_PAGER);
+#endif
- // The x-custom fields are written manually to kolab store while writing evolution
+ /* The x-custom fields are written manually to kolab store while writing evolution */
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 12, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 13, "x-custom") : NULL ;
@@ -378,7 +385,7 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
"VYa3AT5NtK",
"Blablub\n1234",
"Freund,Hotel",
- ICOMMON_SENSITIVITY_NULL, // in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store
+ ICOMMON_SENSITIVITY_NULL, /* in contacts not available in evolution, in contacts always set to NULL and real value added to kolab store */
"2010-12-14 14:48:15",
"2010-12-14 14:48:15",
stage);
@@ -411,7 +418,7 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
/*
* Addresses
*/
- // Nothing
+ /* Nothing */
/*
* Phone Numbers
@@ -424,12 +431,12 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
/*
* Cooperation Fields
*/
- assert_equal("Die Firma", icontact->organization); // ORG[1]
- assert_equal("Abteilung 42", icontact->department); // ORG[2]
- assert_equal("3. Stock", icontact->office_location); // ORG[3]
+ assert_equal("Die Firma", icontact->organization); /* ORG[1] */
+ assert_equal("Abteilung 42", icontact->department); /* ORG[2] */
+ assert_equal("3. Stock", icontact->office_location); /* ORG[3] */
assert_equal("MC Checker", icontact->job_title);
assert_equal("Prof", icontact->profession);
- //assert_equal("", icontact->role); // not available in evolution => profession
+ /* assert_equal("", icontact->role); */ /* not available in evolution => profession */
assert_equal("Dr Boss", icontact->manager_name);
assert_equal("Mr Asi", icontact->assistant);
@@ -442,7 +449,7 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
/*
* Attached Multimedia Files
*/
- // TODO: handle attachments!
+ /* TODO: handle attachments! */
assert(icontact->photo == NULL);
/*
@@ -460,10 +467,10 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
* Kolab Store
*/
g_assert(icontact->common->kolab_store != NULL);
- // validate number of locations with unknown elements
- // g_assert_cmpint(g_hash_table_size(icontact->common->kolab_store), ==, 2);
+ /* validate number of locations with unknown elements */
+ /* g_assert_cmpint(g_hash_table_size(icontact->common->kolab_store), ==, 2); */
GList *list;
- // get top level unknown elements
+ /* get top level unknown elements */
list = kolab_store_get_element_list(icontact->common, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "unknown42");
@@ -479,14 +486,14 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
validate_kolab_store_xml(list, 5, "preferred-address");
validate_kolab_store_xml(list, 6, "unknown4");
- // The x-custom fields are written manually to kolab store while writing evolution
+ /* The x-custom fields are written manually to kolab store while writing evolution */
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 7, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 8, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 9, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 10, "x-custom") : NULL ;
IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : NULL ;
- // test elements below phone number elements
+ /* test elements below phone number elements */
Phone_number* pn;
pn = assert_phone_in_list (icontact->phone_numbers, "110", ICONTACT_PHONE_HOME_1);
@@ -519,15 +526,17 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "display-name");
-// Address *addr;
-//
-// addr = assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
-// "street", "Privat Postfach", "Privat Ort", "Privat Region", "Privat Postleitzahl", "Deutschland");
-//
-// list = kolab_store_get_element_list(icontact->common, addr);
-// g_assert_cmpint(g_list_length(list), ==, 2);
-// validate_kolab_store_xml(list, 1, "unknown7");
-// validate_kolab_store_xml(list, 0, "x-kde-type");
+#if 0
+ Address *addr;
+
+ addr = assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
+ "street", "Privat Postfach", "Privat Ort", "Privat Region", "Privat Postleitzahl", "Deutschland");
+
+ list = kolab_store_get_element_list(icontact->common, addr);
+ g_assert_cmpint(g_list_length(list), ==, 2);
+ validate_kolab_store_xml(list, 1, "unknown7");
+ validate_kolab_store_xml(list, 0, "x-kde-type");
+#endif
}
diff --git a/src/libekolabconv/test/src/test-kolab-event.c b/src/libekolabconv/test/src/test-kolab-event.c
index 2608067..8258d3c 100644
--- a/src/libekolabconv/test/src/test-kolab-event.c
+++ b/src/libekolabconv/test/src/test-kolab-event.c
@@ -33,7 +33,7 @@ validate_kolab_event_100(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.132E74C769684382891031D889490CC8",
@@ -44,7 +44,7 @@ validate_kolab_event_100(const I_event *ievent, gint stage)
"2010-08-23 08:25:55",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Betreff",
"Ort",
@@ -53,20 +53,20 @@ validate_kolab_event_100(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
validate_kolab_store_xml(list, 1, "creator");
- // kolab attachment store
+ /* kolab attachment store */
g_assert_cmpint(g_list_length(ievent->incidence->common->kolab_attachment_store), ==, 1);
@@ -81,7 +81,7 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.087637891D644410BF210F577C90DA1A",
@@ -92,7 +92,7 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
"2010-08-23 08:29:37",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Betreff",
"Ort",
@@ -101,9 +101,9 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
"2010-08-25 07:00:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -117,7 +117,7 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
NULL,
NULL);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"Hendrik Helwich (h helwich tarent de)",
"h helwich tarent de",
@@ -126,14 +126,14 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
TRUE,
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // event
+ /* event */
assert_equal_timestamp("2010-08-26 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 6);
validate_kolab_store_xml(list, 0, "color-label");
@@ -149,7 +149,7 @@ validate_kolab_event_102(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.B59E888AB0D84F5BA1BAD43BEEC15FC2",
@@ -160,7 +160,7 @@ validate_kolab_event_102(const I_event *ievent, gint stage)
"2010-08-23 08:34:40",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Betreff",
"Ort",
@@ -169,14 +169,14 @@ validate_kolab_event_102(const I_event *ievent, gint stage)
"2010-08-23",
stage);
- // event
+ /* event */
assert_equal_gdate("2010-08-23", ievent->end_date->date);
g_assert(SHOW_TIME_AS_FREE == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -188,7 +188,7 @@ validate_kolab_event_103(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.3FF30815C6534CC1B04231E7E1B84DE0",
@@ -199,7 +199,7 @@ validate_kolab_event_103(const I_event *ievent, gint stage)
"2010-08-23 08:34:39",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Betreff",
"Ort",
@@ -208,14 +208,14 @@ validate_kolab_event_103(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_FREE == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -227,7 +227,7 @@ validate_kolab_event_104(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.99E4CF1408D64CD9BE391B3B1BA433E1",
@@ -238,7 +238,7 @@ validate_kolab_event_104(const I_event *ievent, gint stage)
"2010-08-23 08:36:59",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -247,14 +247,14 @@ validate_kolab_event_104(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
- g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as); // I_INC_STATUS_TENTATIVE not available in Kontact and Evolution
+ g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as); /* I_INC_STATUS_TENTATIVE not available in Kontact and Evolution */
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -266,7 +266,7 @@ validate_kolab_event_105(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.3B4BE7A2FD344DF8876CA05F1A33DA44",
@@ -277,7 +277,7 @@ validate_kolab_event_105(const I_event *ievent, gint stage)
"2010-08-23 08:36:59",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -286,14 +286,14 @@ validate_kolab_event_105(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
- g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as); // SHOW_TIME_AS_OUT_OF_OFFICE not available in Kontact and Evolution
+ g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as); /* SHOW_TIME_AS_OUT_OF_OFFICE not available in Kontact and Evolution */
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -305,7 +305,7 @@ validate_kolab_event_106(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.90A2920B92BF4FAF83DC9CEB3B7B84C8",
@@ -316,7 +316,7 @@ validate_kolab_event_106(const I_event *ievent, gint stage)
"2010-08-23 08:36:57",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -325,14 +325,14 @@ validate_kolab_event_106(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -344,7 +344,7 @@ validate_kolab_event_107(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.094C43511FE84231AFF0DA64A0F3D572",
@@ -355,7 +355,7 @@ validate_kolab_event_107(const I_event *ievent, gint stage)
"2010-08-23 08:38:42",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -364,14 +364,14 @@ validate_kolab_event_107(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -383,7 +383,7 @@ validate_kolab_event_108(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.CF7182FCA75645D3A819F2E18B9DE739",
@@ -394,7 +394,7 @@ validate_kolab_event_108(const I_event *ievent, gint stage)
"2010-08-23 08:38:24",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -403,14 +403,14 @@ validate_kolab_event_108(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -422,7 +422,7 @@ validate_kolab_event_109(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.114120AC5BD141FDB8117DF70AB5FAED",
@@ -433,7 +433,7 @@ validate_kolab_event_109(const I_event *ievent, gint stage)
"2010-08-23 08:43:04",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -442,9 +442,9 @@ validate_kolab_event_109(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -458,14 +458,14 @@ validate_kolab_event_109(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -477,7 +477,7 @@ validate_kolab_event_110(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.8277A45E2B1D4A448773C0B2E326C0A2",
@@ -488,7 +488,7 @@ validate_kolab_event_110(const I_event *ievent, gint stage)
"2010-08-23 08:44:02",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -497,14 +497,14 @@ validate_kolab_event_110(const I_event *ievent, gint stage)
"2010-08-23 07:00:00",
stage);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -516,7 +516,7 @@ validate_kolab_event_111(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.E9FEA7AA3F0544D6A8FEA3C7C8D70F6B",
@@ -527,7 +527,7 @@ validate_kolab_event_111(const I_event *ievent, gint stage)
"2010-08-23 08:44:05",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -536,9 +536,9 @@ validate_kolab_event_111(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -552,14 +552,14 @@ validate_kolab_event_111(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -571,7 +571,7 @@ validate_kolab_event_112(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.925E577D43C64BF0A203F73FEB4DD757",
@@ -582,7 +582,7 @@ validate_kolab_event_112(const I_event *ievent, gint stage)
"2010-08-23 08:44:39",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -591,9 +591,9 @@ validate_kolab_event_112(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -607,14 +607,14 @@ validate_kolab_event_112(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -626,7 +626,7 @@ validate_kolab_event_113(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.A3BC0405B1A949D7849CCD093139805D",
@@ -637,7 +637,7 @@ validate_kolab_event_113(const I_event *ievent, gint stage)
"2010-08-23 08:45:53",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -646,9 +646,9 @@ validate_kolab_event_113(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -662,14 +662,14 @@ validate_kolab_event_113(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -681,7 +681,7 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.EC02464D4C9B42CE9C69B8580BDA76D9",
@@ -692,7 +692,7 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
"2010-08-23 09:25:41",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -701,9 +701,9 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -717,7 +717,7 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -727,14 +727,14 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -746,7 +746,7 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.61A1257E11404AAC84D7108B5648F978",
@@ -757,7 +757,7 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
"2010-08-23 09:26:29",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -766,15 +766,15 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
0,
0,
- 0,
+ 0,
NULL,
NULL,
NULL,
@@ -782,7 +782,7 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_DAILY,
1,
@@ -792,14 +792,14 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -811,7 +811,7 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.48D03B223AEC4BBE83F5330B57A63912",
@@ -822,7 +822,7 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
"2010-08-23 09:27:16",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -831,9 +831,9 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -847,7 +847,7 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_DAILY,
3,
@@ -857,14 +857,14 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -876,7 +876,7 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.0F9627DA8AB14AC794730E1608BA4932",
@@ -887,7 +887,7 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
"2010-08-23 09:28:03",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -896,9 +896,9 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -912,7 +912,7 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_DAILY,
1,
@@ -922,14 +922,14 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -941,7 +941,7 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.50BCC1BD7F2942A49EB9A185C5DBDC4E",
@@ -952,7 +952,7 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
"2010-08-23 09:30:29",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -961,9 +961,9 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
"2010-08-24 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -977,7 +977,7 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
2,
@@ -987,14 +987,14 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1006,7 +1006,7 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.F84F22C2458F4D928F37677231CBB026",
@@ -1017,7 +1017,7 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
"2010-08-23 09:31:13",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1026,9 +1026,9 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1042,7 +1042,7 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
1,
@@ -1052,14 +1052,14 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
23,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1071,7 +1071,7 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.2A18DA5FB8844E388EA9C9D570C5B7E6",
@@ -1082,7 +1082,7 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
"2010-08-23 09:32:11",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1091,9 +1091,9 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
"2010-08-31 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1107,7 +1107,7 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
3,
@@ -1117,14 +1117,14 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
31,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-31 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1136,7 +1136,7 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.73CB404DC1B3494083891CB6C909BB23",
@@ -1147,7 +1147,7 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
"2010-08-23 09:35:08",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1156,9 +1156,9 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
"2010-08-28 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1172,7 +1172,7 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
2,
@@ -1182,14 +1182,14 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
28,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-28 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1201,7 +1201,7 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.3F7EF2D43F8C4E48B8E81510FAC83775",
@@ -1212,7 +1212,7 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
"2010-08-23 09:36:53",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1221,9 +1221,9 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
"2010-08-24 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1237,7 +1237,7 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
2,
@@ -1247,14 +1247,14 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
4,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1266,7 +1266,7 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.01609FAA3B154E168ADB4C242781C110",
@@ -1277,7 +1277,7 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
"2010-08-23 09:37:34",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1286,9 +1286,9 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
"2010-08-28 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1302,7 +1302,7 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
3,
@@ -1312,14 +1312,14 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
5,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-28 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1331,7 +1331,7 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.8CCB5B6F56934CA6863C7A17C820538D",
@@ -1342,7 +1342,7 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
"2010-08-23 09:39:19",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1351,9 +1351,9 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1367,7 +1367,7 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_MONTHDAY,
1,
@@ -1377,14 +1377,14 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
23,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1396,7 +1396,7 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.92A024C2D37E4F2097034A6C7E99B440",
@@ -1407,7 +1407,7 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
"2010-08-23 09:40:51",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1416,9 +1416,9 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
"2011-02-28 11:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1432,7 +1432,7 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_MONTHDAY,
1,
@@ -1442,14 +1442,14 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
28,
I_COMMON_FEB);
- // event
+ /* event */
assert_equal_timestamp("2011-02-28 12:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1461,7 +1461,7 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.1EBA0394588747AD92DA11E56C85FE44",
@@ -1472,7 +1472,7 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
"2010-08-23 09:42:27",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1481,9 +1481,9 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
"2011-08-04 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1497,7 +1497,7 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1507,7 +1507,7 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
4,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2011-08-04 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
@@ -1529,10 +1529,10 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
RRULE:FREQ=YEARLY;BYDAY=MO,TU,WE,TH,FR,SA,SU;BYMONTHDAY=4;BYMONTH=8
*/
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1544,7 +1544,7 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.9960E30147D0425A82514E061A8A94C8",
@@ -1555,7 +1555,7 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
"2010-08-23 09:43:33",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1564,9 +1564,9 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
"2011-08-04 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1580,7 +1580,7 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1590,14 +1590,14 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
4,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2011-08-04 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1609,7 +1609,7 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.68714769A05F40F08A491E5E72F5F633",
@@ -1620,7 +1620,7 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
"2010-08-23 09:44:07",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1629,9 +1629,9 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
"2011-08-14 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1645,7 +1645,7 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1655,14 +1655,14 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
4,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2011-08-14 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1674,7 +1674,7 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.0033AB320BDA4918A559E29A7DB61CF8",
@@ -1685,7 +1685,7 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
"2010-08-23 09:44:43",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1694,9 +1694,9 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
"2010-08-29 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1710,7 +1710,7 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1720,14 +1720,14 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
5,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2010-08-29 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1739,7 +1739,7 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.D3610D9851A341B7992AF1904607B520",
@@ -1750,7 +1750,7 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
"2010-08-23 09:45:26",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1759,9 +1759,9 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
"2011-02-28 11:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1775,7 +1775,7 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1785,14 +1785,14 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
5,
I_COMMON_FEB);
- // event
+ /* event */
assert_equal_timestamp("2011-02-28 12:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1804,7 +1804,7 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.64D402213A924BF39811455D36BDE67A",
@@ -1815,7 +1815,7 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
"2010-08-23 09:47:45",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1824,9 +1824,9 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
"2011-08-01 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1840,7 +1840,7 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1850,14 +1850,14 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
1,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2011-08-01 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1869,7 +1869,7 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.6B121CBF922C41F0AC5E91B56EAA4610",
@@ -1880,7 +1880,7 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
"2010-08-23 09:48:35",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1889,9 +1889,9 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
"2011-08-01 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1905,7 +1905,7 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1915,14 +1915,14 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
1,
I_COMMON_AUG);
- // event
+ /* event */
assert_equal_timestamp("2011-08-01 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1934,7 +1934,7 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.67BBC9B188794A27968E490FC381CD38",
@@ -1945,7 +1945,7 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
"2010-08-23 09:50:43",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -1954,9 +1954,9 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
"2010-11-28 11:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -1970,7 +1970,7 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1980,14 +1980,14 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
5,
I_COMMON_NOV);
- // event
+ /* event */
assert_equal_timestamp("2010-11-28 12:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -1999,7 +1999,7 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.368CA0DA11DC4F759A1F7670AFC8BCD3",
@@ -2010,7 +2010,7 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
"2010-08-23 09:52:50",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2019,9 +2019,9 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
"2010-08-31 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2035,7 +2035,7 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
2,
@@ -2045,14 +2045,14 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
5,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-31 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2064,7 +2064,7 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.90650AA582394CDFB0B3D090A1A7A30C",
@@ -2075,7 +2075,7 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
"2010-08-23 09:54:06",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2084,9 +2084,9 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
"2010-12-27 11:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2100,7 +2100,7 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -2110,14 +2110,14 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
4,
I_COMMON_DEC);
- // event
+ /* event */
assert_equal_timestamp("2010-12-27 12:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2129,7 +2129,7 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.A864570513B049FDB74C7295055FAAF4",
@@ -2140,7 +2140,7 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
"2010-08-23 09:54:49",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2149,9 +2149,9 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2165,7 +2165,7 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
gint rdate[3] = {25,10,2020};
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
@@ -2176,14 +2176,14 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2195,7 +2195,7 @@ validate_kolab_event_137(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.7B3E79BD41E047BE8EAF573F72A3C3BF",
@@ -2206,7 +2206,7 @@ validate_kolab_event_137(const I_event *ievent, gint stage)
"2010-08-23 09:55:35",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2215,9 +2215,9 @@ validate_kolab_event_137(const I_event *ievent, gint stage)
"2010-08-23 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2231,14 +2231,14 @@ validate_kolab_event_137(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2250,7 +2250,7 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.009A32D1BD574FC681F9E6FBA499BB35",
@@ -2261,7 +2261,7 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
"2010-08-23 09:57:48",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2270,9 +2270,9 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
"2010-08-30 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2286,7 +2286,7 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -2296,14 +2296,14 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-30 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2315,7 +2315,7 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.BC1711428F1646098131D3943241B780",
@@ -2326,7 +2326,7 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
"2010-08-23 10:01:45",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2335,9 +2335,9 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
"2010-10-11 10:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2351,7 +2351,7 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -2361,14 +2361,14 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-10-11 11:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2380,7 +2380,7 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.908D4D5690AD48148FB6ECDB41A0499D",
@@ -2391,7 +2391,7 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
"2010-08-23 10:03:29",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
NULL,
NULL,
@@ -2400,9 +2400,9 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
"2010-08-23 12:30:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2416,7 +2416,7 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
NULL,
NULL);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -2426,14 +2426,14 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
0,
0);
- // event
+ /* event */
assert_equal_timestamp("2010-08-23 16:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "color-label");
@@ -2446,7 +2446,7 @@ validate_kolab_event_201(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-414546177.646",
@@ -2457,7 +2457,7 @@ validate_kolab_event_201(const I_event *ievent, gint stage)
"2010-08-24 14:13:01",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"event_k1",
NULL,
@@ -2466,23 +2466,23 @@ validate_kolab_event_201(const I_event *ievent, gint stage)
"2010-08-24 08:00:00",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"Hendrik Helwich",
"h helwich tarent de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
gint llen = g_list_length(list);
g_assert_cmpint(llen, ==, 1);
@@ -2494,7 +2494,7 @@ validate_kolab_event_202(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1478387587.1025",
@@ -2505,7 +2505,7 @@ validate_kolab_event_202(const I_event *ievent, gint stage)
"2010-08-24 14:14:33",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"event_k2",
"Adresse",
@@ -2514,23 +2514,23 @@ validate_kolab_event_202(const I_event *ievent, gint stage)
"2010-08-24 08:00:00",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"Hendrik Helwich",
"h helwich tarent de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // event
+ /* event */
assert_equal_timestamp("2010-08-26 10:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_FREE == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2541,7 +2541,7 @@ validate_kolab_event_203(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1971934702.871",
@@ -2552,7 +2552,7 @@ validate_kolab_event_203(const I_event *ievent, gint stage)
"2010-08-24 14:15:44",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"event_k3",
NULL,
@@ -2561,23 +2561,23 @@ validate_kolab_event_203(const I_event *ievent, gint stage)
"2010-08-26",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"Hendrik Helwich",
"h helwich tarent de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // event
+ /* event */
assert_equal_gdate("2010-08-27", ievent->end_date->date);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2587,9 +2587,9 @@ void
validate_kolab_event_204(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // TODO: Incidence: not handled elements: <advanced-alarms><enabled>
+ /* TODO: Incidence: not handled elements: <advanced-alarms><enabled> */
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-503971337.955",
@@ -2600,7 +2600,7 @@ validate_kolab_event_204(const I_event *ievent, gint stage)
"2010-08-24 14:17:42",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"event_k4",
NULL,
@@ -2609,9 +2609,9 @@ validate_kolab_event_204(const I_event *ievent, gint stage)
"2010-08-24 08:00:00",
stage);
- // advanced alarms
+ /* advanced alarms */
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
900,
@@ -2638,19 +2638,19 @@ validate_kolab_event_204(const I_event *ievent, gint stage)
NULL,
NULL);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
- // kolab attachment store
+ /* kolab attachment store */
g_assert_cmpint(g_list_length(ievent->incidence->common->kolab_attachment_store), ==, 1);
@@ -2665,7 +2665,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1839033818.373",
@@ -2676,7 +2676,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"2010-08-24 14:21:57",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"event_k5",
NULL,
@@ -2685,13 +2685,13 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"2010-08-24 08:00:00",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"Vorname1 Nachname1",
"Name1 example net",
I_INC_STATUS_NONE,
TRUE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2699,7 +2699,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name2 example net",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2707,7 +2707,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name3 example net",
I_INC_STATUS_DECLINED,
TRUE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_RESOURCE, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2715,7 +2715,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name4 example net",
I_INC_STATUS_TENTATIVE,
TRUE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2723,7 +2723,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name5 example net",
I_INC_STATUS_DELEGATED,
TRUE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2731,7 +2731,7 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name6 example net",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2739,17 +2739,17 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
"Name7 example net",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // event
+ /* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
g_assert(SHOW_TIME_AS_BUSY == ievent->show_time_as);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2759,11 +2759,12 @@ void
validate_kolab_event_206(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // same as 205 with additional kolab store unknown elements
- // only test kolab store here
+ /* same as 205 with additional kolab store unknown elements
+ * only test kolab store here
+ */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // get top level unknown elements
+ /* get top level unknown elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 4);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2785,15 +2786,15 @@ validate_kolab_event_207(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // yearly recurrence is mapped to monthly recurrence every 12 Months
+ /* yearly recurrence is mapped to monthly recurrence every 12 Months */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY, // Recurrence_cycle
- 1, // interval
- -1, // range_number
- NULL, // range_date
- 4, // weekdays
- 4, // day_number
- I_COMMON_JAN); // month
+ I_REC_CYCLE_YEARLY_WEEKDAY, /* Recurrence_cycle */
+ 1, /* interval */
+ -1, /* range_number */
+ NULL, /* range_date */
+ 4, /* weekdays */
+ 4, /* day_number */
+ I_COMMON_JAN); /* month */
}
void
@@ -2801,15 +2802,15 @@ validate_kolab_event_208(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // recurrence cannot be handled by evolution
+ /* recurrence cannot be handled by evolution */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_YEARDAY, // Recurrence_cycle
- 1, // interval
- 0, // range_number
- NULL, // range_date
- 0, // weekdays
- 29, // day_number
- I_COMMON_MONTH_NULL); // month
+ I_REC_CYCLE_YEARLY_YEARDAY, /* Recurrence_cycle */
+ 1, /* interval */
+ 0, /* range_number */
+ NULL, /* range_date */
+ 0, /* weekdays */
+ 29, /* day_number */
+ I_COMMON_MONTH_NULL); /* month */
}
void
@@ -2817,7 +2818,7 @@ validate_kolab_event_500(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 4.4.2, Kolab resource",
"libkcal-921351035.297",
@@ -2828,7 +2829,7 @@ validate_kolab_event_500(const I_event *ievent, gint stage)
"2010-07-30 16:34:51",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"bumsfallera",
"hier",
@@ -2837,13 +2838,13 @@ validate_kolab_event_500(const I_event *ievent, gint stage)
"2010-07-30 09:30:00",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
NULL,
"silvan kobalt kc local",
I_INC_STATUS_NONE,
TRUE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee,
@@ -2851,7 +2852,7 @@ validate_kolab_event_500(const I_event *ievent, gint stage)
"hilberg kernelconcepts de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
}
@@ -2862,7 +2863,7 @@ validate_kolab_event_501(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
"libkcal-1477131994.487",
@@ -2873,7 +2874,7 @@ validate_kolab_event_501(const I_event *ievent, gint stage)
"2011-03-16 08:57:00",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"erinnerunge audio",
NULL,
@@ -2882,16 +2883,16 @@ validate_kolab_event_501(const I_event *ievent, gint stage)
"2011-03-16",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"James Kirk",
"jkirk tarent de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2924,7 +2925,7 @@ validate_kolab_event_502(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
"libkcal-1356975605.58",
@@ -2935,7 +2936,7 @@ validate_kolab_event_502(const I_event *ievent, gint stage)
"2011-03-16 13:24:00",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Erinnerung Datei ohne Anhang",
NULL,
@@ -2944,13 +2945,13 @@ validate_kolab_event_502(const I_event *ievent, gint stage)
"2011-03-15",
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
"James Kirk",
"jkirk tarent de",
I_INC_STATUS_ACCEPTED,
FALSE,
- FALSE, // TODO: Incidence: <invitation-sent> must be false, runs anyway when its true
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
@@ -2972,10 +2973,10 @@ validate_kolab_event_503(const I_event *ievent, gint stage)
{
(void)stage;
- // advanced alarms
+ /* advanced alarms */
g_assert_cmpint(g_list_length(ievent->incidence->advanced_alarm), ==, 2);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
15,
@@ -2989,7 +2990,7 @@ validate_kolab_event_503(const I_event *ievent, gint stage)
NULL,
NULL);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
Alarm *mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_EMAIL,
-15,
@@ -3015,10 +3016,10 @@ validate_kolab_event_504(const I_event *ievent, gint stage)
{
(void)stage;
- // advanced alarms
+ /* advanced alarms */
g_assert_cmpint(g_list_length(ievent->incidence->advanced_alarm), ==, 2);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
99,
@@ -3032,7 +3033,7 @@ validate_kolab_event_504(const I_event *ievent, gint stage)
NULL,
NULL);
- // this is a mapped simple alarm from kolab
+ /* this is a mapped simple alarm from kolab */
Alarm *mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
-99,
@@ -3086,7 +3087,7 @@ validate_kolab_event_506(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(ievent->incidence->common,
"Evolution/libekolabconv",
"999463355",
@@ -3097,7 +3098,7 @@ validate_kolab_event_506(const I_event *ievent, gint stage)
"2010-07-30 14:15:10",
stage);
- // incidence
+ /* incidence */
validate_iincidence(ievent->incidence,
"Tag der Arbeit",
NULL,
@@ -3106,24 +3107,24 @@ validate_kolab_event_506(const I_event *ievent, gint stage)
"2009-05-01",
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY, // Recurrence_cycle
- 1, // interval
- 0, // range_number
- NULL, // range_date
- 0, // weekdays
- 1, // day_number
- I_COMMON_MAY); // month
-
- // event
+ I_REC_CYCLE_YEARLY_MONTHDAY, /* Recurrence_cycle */
+ 1, /* interval */
+ 0, /* range_number */
+ NULL, /* range_date */
+ 0, /* weekdays */
+ 1, /* day_number */
+ I_COMMON_MAY); /* month */
+
+ /* event */
assert_equal_gdate("2009-05-01", ievent->end_date->date);
- // kolab store
+ /* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(ievent->incidence->common, ievent->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 0);
}
diff --git a/src/libekolabconv/test/src/test-kolab-note.c b/src/libekolabconv/test/src/test-kolab-note.c
index db8ff86..4a456fd 100644
--- a/src/libekolabconv/test/src/test-kolab-note.c
+++ b/src/libekolabconv/test/src/test-kolab-note.c
@@ -41,10 +41,10 @@ validate_kolab_note_100(const I_note *inote, gint stage)
assert_equal("Text", inote->summary);
- // kolab store
+ /* kolab store */
g_assert(inote->common->kolab_store == NULL);
- // kolab attachment store
+ /* kolab attachment store */
g_assert_cmpint(g_list_length(inote->common->kolab_attachment_store), ==, 1);
@@ -67,10 +67,10 @@ validate_kolab_note_200(const I_note *inote, gint stage)
assert_equal("Name", inote->summary);
- // kolab store
+ /* kolab store */
g_assert(inote->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(inote->common, inote->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "foreground-color");
diff --git a/src/libekolabconv/test/src/test-kolab-task.c b/src/libekolabconv/test/src/test-kolab-task.c
index ee1a8b9..4693dd1 100644
--- a/src/libekolabconv/test/src/test-kolab-task.c
+++ b/src/libekolabconv/test/src/test-kolab-task.c
@@ -35,7 +35,7 @@ validate_kolab_task_100(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.BD18A4EC0466435FB0B5C71E0D70677C",
@@ -46,7 +46,7 @@ validate_kolab_task_100(const I_task *itask, gint stage)
"2010-08-23 13:28:30",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task1",
NULL,
@@ -55,16 +55,16 @@ validate_kolab_task_100(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
- // kolab attachment store
+ /* kolab attachment store */
g_assert_cmpint(g_list_length(itask->incidence->common->kolab_attachment_store), ==, 1);
@@ -79,7 +79,7 @@ validate_kolab_task_101(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.DC06829AFDA34005B808D375C0143DC4",
@@ -90,7 +90,7 @@ validate_kolab_task_101(const I_task *itask, gint stage)
"2010-08-23 13:29:46",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task2",
NULL,
@@ -99,13 +99,13 @@ validate_kolab_task_101(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(1, priority_xkcal_to_k(itask->priority));
assert_equal_int(1, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_IN_PROGRESS == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -115,7 +115,7 @@ validate_kolab_task_102(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.CB6B1047C0644A7988056CE7E96830FD",
@@ -126,7 +126,7 @@ validate_kolab_task_102(const I_task *itask, gint stage)
"2010-08-23 14:51:25",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task3",
NULL,
@@ -135,13 +135,13 @@ validate_kolab_task_102(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(5, priority_xkcal_to_k(itask->priority));
assert_equal_int(9, itask->priority);
assert_equal_int(100, itask->completed);
g_assert(I_TASK_COMPLETED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -151,7 +151,7 @@ validate_kolab_task_103(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.396476894362478781A6D65BBE8547E0",
@@ -162,7 +162,7 @@ validate_kolab_task_103(const I_task *itask, gint stage)
"2010-08-23 14:46:58",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task4",
NULL,
@@ -171,13 +171,13 @@ validate_kolab_task_103(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(25, itask->completed);
- g_assert(I_TASK_WAITING_ON_SOMEONE_ELSE == itask->status || I_TASK_NOT_STARTED == itask->status); // no corresponding value available, mapped to I_TASK_NOT_STARTED
+ g_assert(I_TASK_WAITING_ON_SOMEONE_ELSE == itask->status || I_TASK_NOT_STARTED == itask->status); /* no corresponding value available, mapped to I_TASK_NOT_STARTED */
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -187,7 +187,7 @@ validate_kolab_task_104(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.6B82E435283F4373BBA360C4AE608D82",
@@ -198,7 +198,7 @@ validate_kolab_task_104(const I_task *itask, gint stage)
"2010-08-23 14:46:51",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task5",
NULL,
@@ -207,13 +207,13 @@ validate_kolab_task_104(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(75, itask->completed);
- g_assert(I_TASK_DEFERRED == itask->status || I_TASK_NOT_STARTED == itask->status); // no corresponding value available, mapped to I_TASK_NOT_STARTED
+ g_assert(I_TASK_DEFERRED == itask->status || I_TASK_NOT_STARTED == itask->status); /* no corresponding value available, mapped to I_TASK_NOT_STARTED */
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -223,7 +223,7 @@ validate_kolab_task_105(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.3954FA1FE6B44B8C916D3BFB44C5BA2E",
@@ -234,7 +234,7 @@ validate_kolab_task_105(const I_task *itask, gint stage)
"2010-08-23 14:49:09",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task6",
NULL,
@@ -243,14 +243,14 @@ validate_kolab_task_105(const I_task *itask, gint stage)
"2010-08-25",
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-27", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -260,7 +260,7 @@ validate_kolab_task_106(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.E9A3CC6AB743483E908B81FCBE8FFA5A",
@@ -271,7 +271,7 @@ validate_kolab_task_106(const I_task *itask, gint stage)
"2010-08-23 15:03:50",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task7",
NULL,
@@ -280,22 +280,23 @@ validate_kolab_task_106(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "reminder-time");
- //TODO: Consider if toltec's <reminder-time> should/can be mapped in some way, actually saved to kolab store
- //<reminder-time>2010-08-17T06:30:00Z</reminder-time>
+ /* TODO: Consider if toltec's <reminder-time> should/can be mapped in some way, actually saved to kolab store
+ * <reminder-time>2010-08-17T06:30:00Z</reminder-time>
+ */
}
@@ -304,7 +305,7 @@ validate_kolab_task_107(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.F9358F55D8FD475886974C50CA2C1CF1",
@@ -315,7 +316,7 @@ validate_kolab_task_107(const I_task *itask, gint stage)
"2010-08-23 14:53:50",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task8",
NULL,
@@ -324,13 +325,13 @@ validate_kolab_task_107(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -340,7 +341,7 @@ validate_kolab_task_108(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.34F258EA2D9844BC9F51C3D4EC54F591",
@@ -351,7 +352,7 @@ validate_kolab_task_108(const I_task *itask, gint stage)
"2010-08-23 14:56:00",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task9",
NULL,
@@ -360,13 +361,13 @@ validate_kolab_task_108(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -375,19 +376,20 @@ void
validate_kolab_task_109(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // TODO: Still problem with lost blank in body in test 4
- // common
+ /* TODO: Still problem with lost blank in body in test 4
+ * common
+ */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.4808AA62322C49B5BB781EA026E36DB0",
- IS_TEST_STAGE_EVO_TO_FILE(stage) ? "\r\n" : " \r\n", // XXX Space lost during conversion.
+ IS_TEST_STAGE_EVO_TO_FILE(stage) ? "\r\n" : " \r\n", /* XXX Space lost during conversion. */
NULL,
ICOMMON_SENSITIVITY_PUBLIC,
"2010-08-24 08:29:38",
"2010-08-24 08:29:38",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task11",
NULL,
@@ -396,13 +398,13 @@ validate_kolab_task_109(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -411,19 +413,20 @@ void
validate_kolab_task_110(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // TODO: Still problem with lost blank in body in test 4
- // common
+ /* TODO: Still problem with lost blank in body in test 4
+ * common
+ */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.F08D21AF4C8A4F4FB77968AF672F2A42",
- IS_TEST_STAGE_EVO_TO_FILE(stage) ? "\r\n" : " \r\n", // XXX Space lost during conversion.
+ IS_TEST_STAGE_EVO_TO_FILE(stage) ? "\r\n" : " \r\n", /* XXX Space lost during conversion. */
NULL,
ICOMMON_SENSITIVITY_PUBLIC,
"2010-08-24 08:35:08",
"2010-08-24 08:35:08",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task12",
NULL,
@@ -432,13 +435,13 @@ validate_kolab_task_110(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -448,7 +451,7 @@ validate_kolab_task_111(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.C6FA75F707E74116B563FBCBB92ADC4C",
@@ -459,7 +462,7 @@ validate_kolab_task_111(const I_task *itask, gint stage)
"2010-08-24 08:37:33",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task13",
NULL,
@@ -468,13 +471,13 @@ validate_kolab_task_111(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -484,7 +487,7 @@ validate_kolab_task_112(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Toltec Connector Open Format (2.0)",
"TOLTEC.EF3F44A545B04349AC252E027EF6B4FA",
@@ -495,7 +498,7 @@ validate_kolab_task_112(const I_task *itask, gint stage)
"2010-08-23 14:59:20",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task10",
NULL,
@@ -504,13 +507,13 @@ validate_kolab_task_112(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store == NULL);
}
@@ -520,7 +523,7 @@ validate_kolab_task_201(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-564685637.860",
@@ -531,7 +534,7 @@ validate_kolab_task_201(const I_task *itask, gint stage)
"2010-08-24 11:44:55",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k1",
NULL,
@@ -540,17 +543,17 @@ validate_kolab_task_201(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -562,7 +565,7 @@ validate_kolab_task_202(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-2048156149.312",
@@ -573,7 +576,7 @@ validate_kolab_task_202(const I_task *itask, gint stage)
"2010-08-24 11:47:48",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k2",
"Adresse",
@@ -582,17 +585,17 @@ validate_kolab_task_202(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -604,7 +607,7 @@ validate_kolab_task_203(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-57372580.449",
@@ -615,7 +618,7 @@ validate_kolab_task_203(const I_task *itask, gint stage)
"2010-08-24 11:52:26",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k3",
NULL,
@@ -624,16 +627,16 @@ validate_kolab_task_203(const I_task *itask, gint stage)
"2010-08-24",
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -645,7 +648,7 @@ validate_kolab_task_204(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-475965571.406",
@@ -656,7 +659,7 @@ validate_kolab_task_204(const I_task *itask, gint stage)
"2010-08-24 11:53:13",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k4",
NULL,
@@ -665,16 +668,16 @@ validate_kolab_task_204(const I_task *itask, gint stage)
"2010-08-24 11:52:00",
stage);
- // task
+ /* task */
assert_equal_int(1, priority_xkcal_to_k(itask->priority));
assert_equal_int(1, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -686,7 +689,7 @@ validate_kolab_task_205(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-2073502845.847",
@@ -697,7 +700,7 @@ validate_kolab_task_205(const I_task *itask, gint stage)
"2010-08-24 11:54:03",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k5",
NULL,
@@ -706,17 +709,17 @@ validate_kolab_task_205(const I_task *itask, gint stage)
"2010-08-24 11:53:00",
stage);
- // task
+ /* task */
assert_equal_int(5, priority_xkcal_to_k(itask->priority));
assert_equal_int(9, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_timestamp("2010-08-31 11:53:00", itask->due_date->date_time);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -728,7 +731,7 @@ validate_kolab_task_206(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1845750769.323",
@@ -739,7 +742,7 @@ validate_kolab_task_206(const I_task *itask, gint stage)
"2010-08-24 11:54:53",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k6",
NULL,
@@ -748,17 +751,17 @@ validate_kolab_task_206(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(50, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -770,7 +773,7 @@ validate_kolab_task_207(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-2105009129.534",
@@ -781,7 +784,7 @@ validate_kolab_task_207(const I_task *itask, gint stage)
"2010-08-24 11:59:26",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k7",
NULL,
@@ -790,17 +793,17 @@ validate_kolab_task_207(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(100, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -813,9 +816,9 @@ void
validate_kolab_task_208(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // TODO: Incidence: not handled elements: <advanced-alarms><enabled>
+ /* TODO: Incidence: not handled elements: <advanced-alarms><enabled> */
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-875220073.856",
@@ -826,7 +829,7 @@ validate_kolab_task_208(const I_task *itask, gint stage)
"2010-08-24 12:12:07",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k8",
NULL,
@@ -835,7 +838,7 @@ validate_kolab_task_208(const I_task *itask, gint stage)
NULL,
stage);
- // advanced alarms
+ /* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
0,
@@ -849,41 +852,44 @@ validate_kolab_task_208(const I_task *itask, gint stage)
NULL,
NULL);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
- // example Alarm ===========================================================
-// assert_Alarm_in_list(itask->incidence->advanced_alarm,
-// I_ALARM_TYPE_EMAIL,
-// 0, 0, 0, 0,
-// NULL, NULL, NULL, NULL,
-// "dfgdfgdfg", "sdgdfgdfg");
-
- // example Alarm with email_param ===========================================
-// Alarm *alarm;
-// alarm = assert_Alarm_in_list(itask->incidence->advanced_alarm,
-// I_ALARM_TYPE_EMAIL,
-// 0, 0, 0, 0,
-// NULL, NULL, NULL, NULL,
-// "dfgdfgdfg", "sdgdfgdfg");
-// if (alarm != NULL){
-// assert_String_in_list(alarm->email_param->addresses, "sadfsdfsdf");
-// assert_String_in_list(alarm->email_param->addresses, "sdf");
-// assert_String_in_list(alarm->email_param->attachments, "/path/to/a/scary-picture.jpg");
-// assert_String_in_list(alarm->email_param->attachments, "/path/to/another/scary-picture.png");
-// }
+ /* example Alarm =========================================================== */
+#if 0
+ assert_Alarm_in_list(itask->incidence->advanced_alarm,
+ I_ALARM_TYPE_EMAIL,
+ 0, 0, 0, 0,
+ NULL, NULL, NULL, NULL,
+ "dfgdfgdfg", "sdgdfgdfg");
+#endif
+ /* example Alarm with email_param =========================================== */
+#if 0
+ Alarm *alarm;
+ alarm = assert_Alarm_in_list(itask->incidence->advanced_alarm,
+ I_ALARM_TYPE_EMAIL,
+ 0, 0, 0, 0,
+ NULL, NULL, NULL, NULL,
+ "dfgdfgdfg", "sdgdfgdfg");
+ if (alarm != NULL){
+ assert_String_in_list(alarm->email_param->addresses, "sadfsdfsdf");
+ assert_String_in_list(alarm->email_param->addresses, "sdf");
+ assert_String_in_list(alarm->email_param->attachments, "/path/to/a/scary-picture.jpg");
+ assert_String_in_list(alarm->email_param->attachments, "/path/to/another/scary-picture.png");
+ }
+#endif
}
@@ -891,9 +897,9 @@ void
validate_kolab_task_209(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // TODO: Incidence: not handled elements: <advanced-alarms><enabled>
+ /* TODO: Incidence: not handled elements: <advanced-alarms><enabled> */
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-65962915.813",
@@ -904,7 +910,7 @@ validate_kolab_task_209(const I_task *itask, gint stage)
"2010-08-24 12:12:58",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k9",
NULL,
@@ -926,17 +932,17 @@ validate_kolab_task_209(const I_task *itask, gint stage)
NULL,
NULL);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -947,9 +953,9 @@ void
validate_kolab_task_210(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // TODO: Incidence: not handled elements: <advanced-alarms><enabled>
+ /* TODO: Incidence: not handled elements: <advanced-alarms><enabled> */
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-981829110.767",
@@ -960,7 +966,7 @@ validate_kolab_task_210(const I_task *itask, gint stage)
"2010-08-24 12:14:15",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k10",
NULL,
@@ -982,17 +988,17 @@ validate_kolab_task_210(const I_task *itask, gint stage)
NULL,
NULL);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1004,7 +1010,7 @@ validate_kolab_task_211(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1488850974.420",
@@ -1015,7 +1021,7 @@ validate_kolab_task_211(const I_task *itask, gint stage)
"2010-08-24 12:17:11",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k11",
NULL,
@@ -1024,17 +1030,17 @@ validate_kolab_task_211(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1046,7 +1052,7 @@ validate_kolab_task_212(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-959617369.362",
@@ -1057,7 +1063,7 @@ validate_kolab_task_212(const I_task *itask, gint stage)
"2010-08-24 12:17:48",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k12",
NULL,
@@ -1066,17 +1072,17 @@ validate_kolab_task_212(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level element */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1088,7 +1094,7 @@ validate_kolab_task_213(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-31817.817",
@@ -1099,7 +1105,7 @@ validate_kolab_task_213(const I_task *itask, gint stage)
"2010-08-24 12:27:59",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k13",
NULL,
@@ -1108,7 +1114,7 @@ validate_kolab_task_213(const I_task *itask, gint stage)
NULL,
stage);
- // attendees
+ /* attendees */
assert_attendee_in_list(itask->incidence->attendee,
"Vorname Nachname",
"em il",
@@ -1165,17 +1171,17 @@ validate_kolab_task_213(const I_task *itask, gint stage)
FALSE,
I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1190,7 +1196,7 @@ validate_kolab_task_214(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1992675640.644",
@@ -1201,7 +1207,7 @@ validate_kolab_task_214(const I_task *itask, gint stage)
"2010-08-24 12:31:12",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k14",
NULL,
@@ -1210,7 +1216,7 @@ validate_kolab_task_214(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_DAILY,
3,
@@ -1220,17 +1226,17 @@ validate_kolab_task_214(const I_task *itask, gint stage)
0,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_debug("kolabstore list length: %i", g_list_length(list));
g_assert_cmpint(g_list_length(list), ==, 1);
@@ -1246,7 +1252,7 @@ validate_kolab_task_215(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-557133945.485",
@@ -1257,7 +1263,7 @@ validate_kolab_task_215(const I_task *itask, gint stage)
"2010-08-24 12:32:18",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k15",
NULL,
@@ -1266,7 +1272,7 @@ validate_kolab_task_215(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
2,
@@ -1278,17 +1284,17 @@ validate_kolab_task_215(const I_task *itask, gint stage)
g_assert(itask->incidence->common->kolab_store != NULL);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1303,7 +1309,7 @@ validate_kolab_task_216(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1813144776.207",
@@ -1314,7 +1320,7 @@ validate_kolab_task_216(const I_task *itask, gint stage)
"2010-08-24 12:34:06",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k16",
NULL,
@@ -1323,7 +1329,7 @@ validate_kolab_task_216(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
2,
@@ -1333,17 +1339,17 @@ validate_kolab_task_216(const I_task *itask, gint stage)
24,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1358,7 +1364,7 @@ validate_kolab_task_217(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1099303233.392",
@@ -1369,7 +1375,7 @@ validate_kolab_task_217(const I_task *itask, gint stage)
"2010-08-24 12:34:30",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k17",
NULL,
@@ -1378,7 +1384,7 @@ validate_kolab_task_217(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
1,
@@ -1388,17 +1394,17 @@ validate_kolab_task_217(const I_task *itask, gint stage)
31,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1413,7 +1419,7 @@ validate_kolab_task_218(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1899014988.736",
@@ -1424,7 +1430,7 @@ validate_kolab_task_218(const I_task *itask, gint stage)
"2010-08-24 12:35:51",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k18",
NULL,
@@ -1433,7 +1439,7 @@ validate_kolab_task_218(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
1,
@@ -1443,17 +1449,17 @@ validate_kolab_task_218(const I_task *itask, gint stage)
-1,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1468,7 +1474,7 @@ validate_kolab_task_219(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1604395120.121",
@@ -1479,7 +1485,7 @@ validate_kolab_task_219(const I_task *itask, gint stage)
"2010-08-24 12:36:49",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k19",
NULL,
@@ -1488,7 +1494,7 @@ validate_kolab_task_219(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_DAYNUMBER,
1,
@@ -1498,17 +1504,17 @@ validate_kolab_task_219(const I_task *itask, gint stage)
-5,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1523,7 +1529,7 @@ validate_kolab_task_220(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1644058209.390",
@@ -1534,7 +1540,7 @@ validate_kolab_task_220(const I_task *itask, gint stage)
"2010-08-24 12:37:51",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k20",
NULL,
@@ -1543,7 +1549,7 @@ validate_kolab_task_220(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
1,
@@ -1553,17 +1559,17 @@ validate_kolab_task_220(const I_task *itask, gint stage)
3,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1578,7 +1584,7 @@ validate_kolab_task_221(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1721553616.1041",
@@ -1589,7 +1595,7 @@ validate_kolab_task_221(const I_task *itask, gint stage)
"2010-08-24 12:38:27",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k21",
NULL,
@@ -1598,7 +1604,7 @@ validate_kolab_task_221(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
2,
@@ -1608,17 +1614,17 @@ validate_kolab_task_221(const I_task *itask, gint stage)
-1,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1633,7 +1639,7 @@ validate_kolab_task_222(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1644716785.216",
@@ -1644,7 +1650,7 @@ validate_kolab_task_222(const I_task *itask, gint stage)
"2010-08-24 12:39:24",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k22",
NULL,
@@ -1653,7 +1659,7 @@ validate_kolab_task_222(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_MONTHLY_WEEKDAY,
1,
@@ -1663,17 +1669,17 @@ validate_kolab_task_222(const I_task *itask, gint stage)
-5,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1688,7 +1694,7 @@ validate_kolab_task_223(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1609928323.626",
@@ -1699,7 +1705,7 @@ validate_kolab_task_223(const I_task *itask, gint stage)
"2010-08-24 12:43:29",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k23",
NULL,
@@ -1708,7 +1714,7 @@ validate_kolab_task_223(const I_task *itask, gint stage)
"2010-08-24 10:30:00",
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_MONTHDAY,
2,
@@ -1718,17 +1724,17 @@ validate_kolab_task_223(const I_task *itask, gint stage)
24,
I_COMMON_AUG);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1743,7 +1749,7 @@ validate_kolab_task_224(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-674787867.159",
@@ -1754,7 +1760,7 @@ validate_kolab_task_224(const I_task *itask, gint stage)
"2010-08-24 12:44:31",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k24",
NULL,
@@ -1764,7 +1770,7 @@ validate_kolab_task_224(const I_task *itask, gint stage)
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_MONTHDAY,
1,
@@ -1774,17 +1780,17 @@ validate_kolab_task_224(const I_task *itask, gint stage)
28,
I_COMMON_FEB);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1799,7 +1805,7 @@ validate_kolab_task_225(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-98450016.195",
@@ -1810,7 +1816,7 @@ validate_kolab_task_225(const I_task *itask, gint stage)
"2010-08-24 12:47:03",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k25",
NULL,
@@ -1819,27 +1825,29 @@ validate_kolab_task_225(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
-// validate_recurrence(itask->incidence->recurrence,
-// I_REC_CYCLE_YEARLY_WEEKDAY,
-// 1,
-// 0,
-// NULL,
-// Tuesday,
-// 4,
-// I_COMMON_MAR);
-
- // task
+ /* recurrence */
+#if 0
+ validate_recurrence(itask->incidence->recurrence,
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ Tuesday,
+ 4,
+ I_COMMON_MAR);
+#endif
+
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
- // unknown top level elements
+ /* unknown top level elements */
GList *list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 2);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1855,7 +1863,7 @@ validate_kolab_task_226(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-415677569.335",
@@ -1866,7 +1874,7 @@ validate_kolab_task_226(const I_task *itask, gint stage)
"2010-08-24 12:48:04",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k26",
NULL,
@@ -1875,27 +1883,29 @@ validate_kolab_task_226(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
-// validate_recurrence(itask->incidence->recurrence,
-// I_REC_CYCLE_YEARLY_WEEKDAY,
-// 1,
-// 0,
-// NULL,
-// Friday,
-// 5,
-// I_COMMON_APR);
-
- // task
+ /* recurrence */
+#if 0
+ validate_recurrence(itask->incidence->recurrence,
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ Friday,
+ 5,
+ I_COMMON_APR);
+#endif
+
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
- // unknown top level elements
+ /* unknown top level elements */
GList *list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 2);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1911,7 +1921,7 @@ validate_kolab_task_227(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-764657317.114",
@@ -1922,7 +1932,7 @@ validate_kolab_task_227(const I_task *itask, gint stage)
"2010-08-24 12:48:46",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k27",
NULL,
@@ -1931,7 +1941,7 @@ validate_kolab_task_227(const I_task *itask, gint stage)
"2010-08-24",
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_MONTHDAY,
1,
@@ -1941,17 +1951,17 @@ validate_kolab_task_227(const I_task *itask, gint stage)
24,
I_COMMON_AUG);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -1966,7 +1976,7 @@ validate_kolab_task_228(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1997930013.160",
@@ -1977,7 +1987,7 @@ validate_kolab_task_228(const I_task *itask, gint stage)
"2010-08-24 12:49:26",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k28",
NULL,
@@ -1986,7 +1996,7 @@ validate_kolab_task_228(const I_task *itask, gint stage)
"2010-08-29 11:53:00",
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_WEEKDAY,
1,
@@ -1996,21 +2006,21 @@ validate_kolab_task_228(const I_task *itask, gint stage)
-5,
I_COMMON_AUG);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
- // unknown top level elements
+ /* unknown top level elements */
GList *list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
-// validate_kolab_store_xml(list, 1, "recurrence");
+ /* validate_kolab_store_xml(list, 1, "recurrence"); */
}
@@ -2022,7 +2032,7 @@ validate_kolab_task_229(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1382625299.123",
@@ -2033,7 +2043,7 @@ validate_kolab_task_229(const I_task *itask, gint stage)
"2010-08-24 12:50:02",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k29",
NULL,
@@ -2042,7 +2052,7 @@ validate_kolab_task_229(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_YEARDAY,
1,
@@ -2052,17 +2062,17 @@ validate_kolab_task_229(const I_task *itask, gint stage)
236,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2077,7 +2087,7 @@ validate_kolab_task_230(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-284542898.784",
@@ -2088,7 +2098,7 @@ validate_kolab_task_230(const I_task *itask, gint stage)
"2010-08-24 12:51:12",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k30",
NULL,
@@ -2097,7 +2107,7 @@ validate_kolab_task_230(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_YEARLY_YEARDAY,
1,
@@ -2107,17 +2117,17 @@ validate_kolab_task_230(const I_task *itask, gint stage)
366,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2132,7 +2142,7 @@ validate_kolab_task_231(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-661442993.263",
@@ -2143,7 +2153,7 @@ validate_kolab_task_231(const I_task *itask, gint stage)
"2010-08-24 12:51:56",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k31",
NULL,
@@ -2152,7 +2162,7 @@ validate_kolab_task_231(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -2162,17 +2172,17 @@ validate_kolab_task_231(const I_task *itask, gint stage)
0,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2187,7 +2197,7 @@ validate_kolab_task_232(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-695549868.242",
@@ -2198,7 +2208,7 @@ validate_kolab_task_232(const I_task *itask, gint stage)
"2010-08-24 12:52:34",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k32",
NULL,
@@ -2207,7 +2217,7 @@ validate_kolab_task_232(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
gint rdate[3] = {24,8,2011};
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
@@ -2218,17 +2228,17 @@ validate_kolab_task_232(const I_task *itask, gint stage)
0,
0);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2243,7 +2253,7 @@ validate_kolab_task_233(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-1794627645.771",
@@ -2254,7 +2264,7 @@ validate_kolab_task_233(const I_task *itask, gint stage)
"2010-08-24 12:53:25",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k33",
NULL,
@@ -2263,7 +2273,7 @@ validate_kolab_task_233(const I_task *itask, gint stage)
NULL,
stage);
- // recurrence
+ /* recurrence */
validate_recurrence(itask->incidence->recurrence,
I_REC_CYCLE_WEEKLY,
1,
@@ -2273,23 +2283,23 @@ validate_kolab_task_233(const I_task *itask, gint stage)
0,
0);
- // recurrence exclusions
- // TODO Double free problem, free function for exclusions commented in struct.
+ /* recurrence exclusions */
+ /* TODO Double free problem, free function for exclusions commented in struct. */
assert_GDate_in_list(itask->incidence->recurrence->exclusion, "2010-08-24");
assert_GDate_in_list(itask->incidence->recurrence->exclusion, "2010-11-23");
assert_GDate_in_list(itask->incidence->recurrence->exclusion, "2010-11-26");
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2303,7 +2313,7 @@ validate_kolab_task_234(const I_task *itask, gint stage)
log_bitmask(stage);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 2);
@@ -2319,7 +2329,7 @@ validate_kolab_task_235(const I_task *itask, gint stage)
log_bitmask(stage);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 1);
@@ -2334,7 +2344,7 @@ validate_kolab_task_236(const I_task *itask, gint stage)
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
"libkcal-674787867.159",
@@ -2345,7 +2355,7 @@ validate_kolab_task_236(const I_task *itask, gint stage)
"2010-08-24 12:44:31",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"task_k24",
NULL,
@@ -2354,26 +2364,28 @@ validate_kolab_task_236(const I_task *itask, gint stage)
NULL,
stage);
-// // recurrence
-// validate_recurrence(itask->incidence->recurrence,
-// I_REC_CYCLE_YEARLY_MONTHDAY,
-// 1,
-// 0,
-// NULL,
-// 0,
-// 28,
-// I_COMMON_FEB);
-
- // task
+ /* recurrence */
+#if 0
+ validate_recurrence(itask->incidence->recurrence,
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 28,
+ I_COMMON_FEB);
+#endif
+
+ /* task */
assert_equal_int(5, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
assert_equal_gdate("2010-08-31", itask->due_date->date);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
assert_list_length(list, 2);
validate_kolab_store_xml(list, 0, "pilot-sync-status");
@@ -2386,7 +2398,7 @@ validate_kolab_task_502(const I_task *itask, gint stage)
{
(void)stage;
- // advanced alarms
+ /* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
I_ALARM_TYPE_DISPLAY,
@@ -2408,7 +2420,7 @@ validate_kolab_task_503(const I_task *itask, gint stage)
{
log_bitmask(stage);
- // common
+ /* common */
validate_icommon(itask->incidence->common,
"Horde::Kolab",
"a5caed56de89c80cac676dc4284d81f7",
@@ -2419,7 +2431,7 @@ validate_kolab_task_503(const I_task *itask, gint stage)
"2011-08-23 11:29:29",
stage);
- // incidence
+ /* incidence */
validate_iincidence(itask->incidence,
"summary?",
NULL,
@@ -2428,16 +2440,16 @@ validate_kolab_task_503(const I_task *itask, gint stage)
NULL,
stage);
- // task
+ /* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
assert_equal_int(0, itask->priority);
assert_equal_int(0, itask->completed);
g_assert(I_TASK_NOT_STARTED == itask->status);
- // kolab store
+ /* kolab store */
g_assert(itask->incidence->common->kolab_store != NULL);
GList *list;
- // unknown top level elements
+ /* unknown top level elements */
list = kolab_store_get_element_list(itask->incidence->common, itask->incidence->common);
g_assert_cmpint(g_list_length(list), ==, 2);
validate_kolab_store_xml(list, 0, "creator");
@@ -2447,7 +2459,7 @@ validate_kolab_task_503(const I_task *itask, gint stage)
g_assert_cmpint(g_list_length(list), ==, 1);
validate_kolab_store_xml(list, 0, "uid");
- // kolab attachment store
+ /* kolab attachment store */
g_assert_cmpint(g_list_length(itask->incidence->common->kolab_attachment_store), ==, 0);
}
@@ -2456,7 +2468,7 @@ validate_kolab_task_3286494(const I_task *itask, gint stage)
{
(void)stage;
- // advanced alarms
+ /* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
I_ALARM_TYPE_PROCEDURE,
diff --git a/src/libekolabconv/test/src/test-util.c b/src/libekolabconv/test/src/test-util.c
index 8f1e885..1a55bab 100644
--- a/src/libekolabconv/test/src/test-util.c
+++ b/src/libekolabconv/test/src/test-util.c
@@ -28,7 +28,7 @@
#include <gmime/gmime.h>
#include <string.h>
#include <kolab-conv.h>
-#include <libxml/tree.h> // XML parsing
+#include <libxml/tree.h> /* XML parsing */
void
assert_equal(gchar *expected, GString *value)
@@ -130,8 +130,8 @@ assert_timestamp_not_older_than_10_seconds(time_t *timestamp) {
Phone_number*
assert_phone_in_list (GList *phone_nrs, gchar *nr_expected, Icontact_phone_type type_expected)
{
- gint found_type = 0; // type found?
- gint matched_number = 0; // numbers match?
+ gint found_type = 0; /* type found? */
+ gint matched_number = 0; /* numbers match? */
g_assert (phone_nrs != NULL);
Phone_number *ret = NULL;
@@ -145,7 +145,7 @@ assert_phone_in_list (GList *phone_nrs, gchar *nr_expected, Icontact_phone_type
if (p->type == type_expected)
{
- found_type = 1; // types match
+ found_type = 1; /* types match */
g_debug ("matching type '%d' found", type_expected);
g_debug ("testing if number '%s' is equal to expected number '%s'",
p->number, nr_expected ? nr_expected : NULL);
@@ -201,7 +201,7 @@ assert_email_in_list (GList *emails, gchar *smtp_address_exp, gchar *display_nam
g_assert (e != NULL);
- // assert display_name
+ /* assert display_name */
if (display_name_exp == NULL) {
g_assert(e->display_name == NULL);
matched_display_name = 1;
@@ -210,7 +210,7 @@ assert_email_in_list (GList *emails, gchar *smtp_address_exp, gchar *display_nam
matched_display_name = 1;
}
- // assert smtp_address
+ /* assert smtp_address */
if (smtp_address_exp == NULL) {
g_assert(e->smtp_address == NULL);
matched_smtp_address = 1;
@@ -257,7 +257,7 @@ assert_address_in_list (GList *addresses,
g_assert (addr != NULL);
- // street
+ /* street */
if (street == NULL) {
if(addr->street == NULL) {
matched_street = 1;
@@ -266,7 +266,7 @@ assert_address_in_list (GList *addresses,
else if (strcmp(addr->street->str, street) == 0){
matched_street = 1;
}
- // pobox
+ /* pobox */
if (pobox == NULL) {
if(addr->pobox == NULL) {
matched_pobox = 1;
@@ -275,7 +275,7 @@ assert_address_in_list (GList *addresses,
else if (strcmp(addr->pobox->str, pobox) == 0){
matched_pobox = 1;
}
- // locality
+ /* locality */
if (locality == NULL) {
if(addr->locality == NULL) {
matched_locality = 1;
@@ -284,7 +284,7 @@ assert_address_in_list (GList *addresses,
else if (strcmp(addr->locality->str, locality) == 0){
matched_locality = 1;
}
- // region
+ /* region */
if (region == NULL) {
if(addr->region == NULL) {
matched_region = 1;
@@ -293,7 +293,7 @@ assert_address_in_list (GList *addresses,
else if (strcmp(addr->region->str, region) == 0){
matched_region = 1;
}
- // postal_code
+ /* postal_code */
if (postal_code == NULL) {
if(addr->postal_code == NULL) {
matched_postal_code = 1;
@@ -302,7 +302,7 @@ assert_address_in_list (GList *addresses,
else if (strcmp(addr->postal_code->str, postal_code) == 0){
matched_postal_code = 1;
}
- // country
+ /* country */
if (street == NULL) {
if(addr->country == NULL) {
matched_country = 1;
@@ -333,7 +333,7 @@ assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint start_offset,
gchar *proc_param_program, gchar *proc_param_arguments,
gchar *email_param_subject, gchar *email_param_mail_text)
{
- if (advancedAlarm != NULL) // evolution tasks have no advanced_alarm
+ if (advancedAlarm != NULL) /* evolution tasks have no advanced_alarm */
{
while (advancedAlarm != NULL) {
Alarm *alarm = advancedAlarm->data;
@@ -359,7 +359,7 @@ assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint start_offset,
alarm->email_param && alarm->email_param->subject ? alarm->email_param->subject->str : "NULL",
alarm->email_param && alarm->email_param->mail_text ? alarm->email_param->mail_text->str : "NULL");
- gint failed = 0; // bitmap for error location
+ gint failed = 0; /* bitmap for error location */
CHECK_FAILED(alarm->type == type, failed, 1);
CHECK_FAILED(alarm->start_offset == start_offset, failed, 2);
@@ -370,10 +370,10 @@ assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint start_offset,
CHECK_FAILED(audio_file == NULL || strcmp(alarm->audio_file->str, audio_file) == 0, failed, 7);
CHECK_FAILED(proc_param_program == NULL || strcmp(alarm->proc_param->program->str, proc_param_program) == 0, failed, 8);
CHECK_FAILED(proc_param_arguments == NULL || strcmp(alarm->proc_param->arguments->str, proc_param_arguments) == 0, failed, 9);
- // email_param addresses list - own function assert_String_in_list()
+ /* email_param addresses list - own function assert_String_in_list() */
CHECK_FAILED(email_param_subject == NULL || strcmp(alarm->email_param->subject->str, email_param_subject) == 0, failed, 10);
CHECK_FAILED(email_param_mail_text == NULL || strcmp(alarm->email_param->mail_text->str, email_param_mail_text) == 0, failed, 11);
- // email_param attachments list - own function assert_String_in_list()
+ /* email_param attachments list - own function assert_String_in_list() */
char *bm = int_to_bitmask(failed);
g_debug ("checks for alarm: %s", bm);
@@ -475,7 +475,7 @@ assert_custom_field_in_list (GList *custom_list, gchar *custom_field_type, gchar
g_assert_not_reached();
}
-// set value NULL in function call if element not available
+/* set value NULL in function call if element not available */
void
validate_iincidence(const I_incidence *iincidence, gchar *summary, gchar *location,
gchar *organizer_display_name, gchar *organizer_smtp_address,
@@ -500,9 +500,10 @@ validate_iincidence(const I_incidence *iincidence, gchar *summary, gchar *locati
} else {
g_assert(iincidence->start_date == NULL);
}
- // advanced_alarm (own function: assert_alarm_in_list())
- // recurrence (own function: validate_recurrence())
- // attendee-list (own function: assert_attendee_in_list())
+ /* advanced_alarm (own function: assert_alarm_in_list())
+ * recurrence (own function: validate_recurrence())
+ * attendee-list (own function: assert_attendee_in_list())
+ */
}
void
@@ -510,9 +511,9 @@ validate_icommon(const I_common *icommon, gchar* exp_product_id, gchar* exp_uid,
gchar *exp_body, gchar *exp_categories, Sensitivity exp_sensitivity, gchar *exp_creation_date, gchar *exp_last_modification_date, gint stage)
{
g_assert(icommon != NULL);
- if (IS_TEST_STAGE_INTERN_TO_KMAIL(stage)) // own value is written when kolab xml is created
+ if (IS_TEST_STAGE_INTERN_TO_KMAIL(stage)) /* own value is written when kolab xml is created */
exp_product_id = KOLABCONV_PRODUCT_ID;
- else if (IS_TEST_STAGE_EVO_TO_INTERN(stage)) // product id cannot be retrieved from evolution type
+ else if (IS_TEST_STAGE_EVO_TO_INTERN(stage)) /* product id cannot be retrieved from evolution type */
exp_product_id = NULL;
assert_equal(exp_product_id, icommon->product_id);
assert_equal(exp_uid, icommon->uid);
@@ -536,7 +537,7 @@ validate_icommon(const I_common *icommon, gchar* exp_product_id, gchar* exp_uid,
* use the current system time for creation-date and last-modification-date.
*/
- // The dates should never be NULL
+ /* The dates should never be NULL */
g_assert(icommon->creation_datetime != NULL);
g_assert(icommon->creation_datetime->date_time != NULL);
g_assert(icommon->last_modified_datetime != NULL);
@@ -549,19 +550,19 @@ validate_icommon(const I_common *icommon, gchar* exp_product_id, gchar* exp_uid,
}
else if(exp_creation_date == NULL && exp_last_modification_date != NULL)
{
- //libekolabconv should have set last_modification_date as creation-date
+ /* libekolabconv should have set last_modification_date as creation-date */
assert_equal_timestamp(exp_last_modification_date, icommon->creation_datetime->date_time);
assert_equal_timestamp(exp_last_modification_date, icommon->last_modified_datetime->date_time);
}
else if(exp_creation_date != NULL && exp_last_modification_date == NULL)
{
- //libekolabconv should have set creation_date as last_modification_date
+ /* libekolabconv should have set creation_date as last_modification_date */
assert_equal_timestamp(exp_creation_date, icommon->creation_datetime->date_time);
assert_equal_timestamp(exp_creation_date, icommon->last_modified_datetime->date_time);
}
else
{
- // libekolabconv should have used current system time for both
+ /* libekolabconv should have used current system time for both */
assert_timestamp_not_older_than_10_seconds(icommon->creation_datetime->date_time);;
assert_timestamp_not_older_than_10_seconds(icommon->last_modified_datetime->date_time);
}
@@ -622,7 +623,7 @@ assert_binary_attachment_equal(gchar *exp_data_file_name, gchar *name_exp, gchar
gchar *buffer;
gulong fileLen;
- //Open file
+ /* Open file */
file = fopen(exp_data_file_name, "rb");
if(!file) {
@@ -631,13 +632,13 @@ assert_binary_attachment_equal(gchar *exp_data_file_name, gchar *name_exp, gchar
assert(FALSE);
}
- //Get file length
+ /* Get file length */
fseek(file, 0, SEEK_END);
fileLen = ftell(file);
g_assert_cmpint(fileLen, ==, value->length);
fseek(file, 0, SEEK_SET);
- //Allocate memory
+ /* Allocate memory */
buffer = g_new0(gchar, fileLen+1);
if(!buffer) {
@@ -646,7 +647,7 @@ assert_binary_attachment_equal(gchar *exp_data_file_name, gchar *name_exp, gchar
return;
}
- //Read file contents into buffer
+ /* Read file contents into buffer */
fread(buffer, fileLen, 1, file);
fclose(file);
@@ -708,7 +709,7 @@ validate_kolab_store_xml(GList *elements, gint index, gchar *name)
g_assert(elem != NULL);
gchar *xml_str = (gchar*)elem->data;
-// gchar *xml_str = (gchar*)g_list_nth(elements, index)->data;
+ /* gchar *xml_str = (gchar*)g_list_nth(elements, index)->data; */
xmlDocPtr tree = xmlReadMemory (xml_str, strlen (xml_str), "test.xml", NULL, 0);
g_assert(tree->type == XML_DOCUMENT_NODE);
g_assert(tree->children != NULL);
diff --git a/src/libekolabconv/test/src/test-util.h b/src/libekolabconv/test/src/test-util.h
index f030943..4ce51cc 100644
--- a/src/libekolabconv/test/src/test-util.h
+++ b/src/libekolabconv/test/src/test-util.h
@@ -28,7 +28,7 @@
#include "../../main/src/structs/contact.h"
#include "../../main/src/structs/incidence.h"
-// if expression "E" is false, bitmap "M" is set at position "P"
+/* if expression "E" is false, bitmap "M" is set at position "P" */
#define CHECK_FAILED(E, M, P) if (!(E)) M |= (1 << (P-1))
void assert_equal(gchar *expected, GString *value);
diff --git a/src/libekolabconv/test/src/testbase.c b/src/libekolabconv/test/src/testbase.c
index 121cc1c..04d8a8b 100644
--- a/src/libekolabconv/test/src/testbase.c
+++ b/src/libekolabconv/test/src/testbase.c
@@ -25,8 +25,8 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h> // getcwd() definition
-#include <sys/param.h> // MAXPATHLEN definition
+#include <unistd.h> /* getcwd() definition */
+#include <sys/param.h> /* MAXPATHLEN definition */
#include <libecal/e-cal-component.h>
#include <kolab-conv.h>
#include <evolution/evolution.h>
@@ -79,7 +79,7 @@ static Kolab_conv_mail*
read_kolab_email_file_tested (const gchar* filename, gint *stage)
{
GError *error = NULL;
- // read kolab mail file to the kolab mail struct
+ /* read kolab mail file to the kolab mail struct */
g_message("reading email file %s to a kolab mail struct", filename);
Kolab_conv_mail* mail = read_kolab_email_file (filename, &error);
check_error (error, "error while reading kolab email file %s", filename);
@@ -91,7 +91,7 @@ static void
write_kolab_email_file_tested (const gchar* filename, Kolab_conv_mail* mail, gint *stage)
{
GError *error = NULL;
- // write temporary kolab mail file
+ /* write temporary kolab mail file */
g_message("writing kolab mail struct to email file %s", filename);
write_kolab_email_file(mail, filename, &error);
check_error (error, "error while writing kolab email file %s", filename);
@@ -126,7 +126,7 @@ create_evolution_vcard_tested (const ECalComponentWithTZ* epim, gint *stage)
}
icalcomponent_add_component (ical_vcal, ical_vevent);
gchar *ical_str = icalcomponent_as_ical_string (ical_vcal);
- // free allocated resources
+ /* free allocated resources */
if (ical_vtz != NULL)
icalcomponent_remove_component(ical_vcal, ical_vtz);
icalcomponent_remove_component(ical_vcal, ical_vevent);
@@ -613,7 +613,7 @@ test_convert_kolab_read_write_vcard(ECalComponentWithTZ, I_note)
static gchar*
get_working_dir (void)
{
- gchar *path1 = g_new0(gchar, MAXPATHLEN); // This is a buffer for the text
+ gchar *path1 = g_new0(gchar, MAXPATHLEN); /* This is a buffer for the text */
getcwd (path1, MAXPATHLEN);
return path1;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
