[evolution-kolab/ek-wip-porting] all: Whitespace and formatting cleanup
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-porting] all: Whitespace and formatting cleanup
- Date: Tue, 20 Mar 2012 14:24:26 +0000 (UTC)
commit 364efd3e431951a87812ddc20160c8a7e0fb54ea
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Tue Mar 20 11:41:57 2012 +0100
all: Whitespace and formatting cleanup
src/addressbook/Makefile.am | 8 +-
src/addressbook/e-book-backend-kolab.c | 2 +-
src/calendar/e-cal-backend-kolab.c | 2 +-
src/camel/camel-kolab-imapx-folder.c | 6 +-
src/camel/camel-kolab-imapx-store.c | 2 +-
src/camel/camel-kolab-session.c | 37 +-
.../imapx/camel-imapx-conn-manager-defs.h | 8 +-
.../providers/imapx/camel-imapx-extd-server.c | 6 +-
src/eplugin/e-kolab-folder-permissions.c | 15 +-
src/eplugin/e-kolab-plugin-ui.c | 4 +-
src/eplugin/e-kolab-plugin.c | 4 +-
.../main/src/evolution/contact-e-to-i.c | 50 +-
.../main/src/evolution/contact-i-to-e.c | 123 +-
.../main/src/evolution/event-e-to-i.c | 14 +-
.../main/src/evolution/event-i-to-e.c | 21 +-
.../main/src/evolution/priv-common-e-to-i.c | 32 +-
.../main/src/evolution/priv-common-i-to-e.c | 23 +-
.../main/src/evolution/priv-evolution-preserve.c | 2 +-
.../main/src/evolution/priv-incidence-e-to-i.c | 159 +-
.../main/src/evolution/priv-incidence-i-to-e.c | 172 +-
src/libekolabconv/main/src/evolution/task-e-to-i.c | 16 +-
src/libekolabconv/main/src/evolution/task-i-to-e.c | 24 +-
src/libekolabconv/main/src/kolab-conv.c | 42 +-
src/libekolabconv/main/src/kolab-conv.h | 9 +-
src/libekolabconv/main/src/kolab/contact-i-to-k.c | 126 +-
src/libekolabconv/main/src/kolab/contact-k-to-i.c | 28 +-
src/libekolabconv/main/src/kolab/event-i-to-k.c | 28 +-
src/libekolabconv/main/src/kolab/event-k-to-i.c | 8 +-
src/libekolabconv/main/src/kolab/kolab-util.c | 64 +-
.../main/src/kolab/priv-common-i-to-k.c | 104 +-
.../main/src/kolab/priv-incidence-i-to-k.c | 227 +-
.../main/src/kolab/priv-incidence-k-to-i.c | 14 +-
src/libekolabconv/main/src/kolab/task-i-to-k.c | 24 +-
src/libekolabconv/main/src/kolab/task-k-to-i.c | 11 +-
src/libekolabconv/main/src/logging.c | 4 +-
src/libekolabconv/main/src/structs/common.c | 11 +-
src/libekolabconv/main/src/structs/common.h | 70 +-
src/libekolabconv/main/src/structs/contact.c | 10 +-
src/libekolabconv/main/src/structs/contact.h | 2 +-
src/libekolabconv/main/src/structs/incidence.c | 42 +-
src/libekolabconv/main/src/structs/incidence.h | 4 +-
src/libekolabconv/main/src/util.c | 2 +-
src/libekolabconv/test/src/Makefile.am | 83 +-
src/libekolabconv/test/src/email-parser.c | 51 +-
src/libekolabconv/test/src/main.c | 44 +-
src/libekolabconv/test/src/test-convert-setup.h | 372 ++--
.../test/src/test-evolution-contact.c | 163 +-
src/libekolabconv/test/src/test-evolution-event.c | 837 +++---
src/libekolabconv/test/src/test-evolution-note.c | 13 +-
src/libekolabconv/test/src/test-evolution-task.c | 510 ++--
src/libekolabconv/test/src/test-kolab-contact.c | 151 +-
src/libekolabconv/test/src/test-kolab-event.c | 2961 ++++++++++----------
src/libekolabconv/test/src/test-kolab-note.c | 17 +-
src/libekolabconv/test/src/test-kolab-task.c | 1861 ++++++------
src/libekolabconv/test/src/test-util.c | 247 +-
src/libekolabconv/test/src/test-util.h | 22 +-
src/libekolabutil/kolab-util-camel.c | 8 +-
src/libekolabutil/kolab-util-error.c | 37 +-
src/libekolabutil/kolab-util-folder.c | 40 +-
src/libekolabutil/kolab-util-kconv.c | 2 +-
src/libekolabutil/kolab-util-sqlite.c | 4 +-
.../libekolab/test-kolab-util-cal-freebusy.c | 2 +-
62 files changed, 4426 insertions(+), 4559 deletions(-)
---
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index 02afad9..2c4119d 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -4,10 +4,10 @@
ebook_backend_LTLIBRARIES = libebookbackendkolab.la
-libebookbackendkolab_la_SOURCES = \
- e-book-backend-kolab.c \
- e-book-backend-kolab-factory.c \
- kolab-util-contact-cache.c \
+libebookbackendkolab_la_SOURCES = \
+ e-book-backend-kolab.c \
+ e-book-backend-kolab-factory.c \
+ kolab-util-contact-cache.c \
kolab-util-contact.c
noinst_HEADERS = \
diff --git a/src/addressbook/e-book-backend-kolab.c b/src/addressbook/e-book-backend-kolab.c
index f5f339c..93801b3 100644
--- a/src/addressbook/e-book-backend-kolab.c
+++ b/src/addressbook/e-book-backend-kolab.c
@@ -922,7 +922,7 @@ e_book_backend_kolab_get_backend_property (EBookBackendSync *backend,
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_CAPABILITIES)) {
- *prop_value = g_strdup ("net,bulk-removes,contact-lists,do-initial-query");
+ *prop_value = g_strdup ("net,bulk-removes,contact-lists,do-initial-query");
#if 0
if (e_book_backend_mapi_is_marked_for_offline (ebma))
*prop_value = g_strdup ("net,bulk-removes,contact-lists,do-initial-query");
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 808b968..1ab0de9 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -168,7 +168,7 @@ cal_backend_kolab_signal_online_cb (GObject *object)
static gboolean
cal_backend_kolab_notify_opened (ECalBackendKolab *self,
- GError **err)
+ GError **err)
{
ECalBackend *cbackend = NULL;
ECalBackendKolabPrivate *priv = NULL;
diff --git a/src/camel/camel-kolab-imapx-folder.c b/src/camel/camel-kolab-imapx-folder.c
index 955c9b5..88fc883 100644
--- a/src/camel/camel-kolab-imapx-folder.c
+++ b/src/camel/camel-kolab-imapx-folder.c
@@ -116,9 +116,9 @@ camel_kolab_imapx_folder_class_init (CamelKolabIMAPXFolderClass *klass)
CamelKolabIMAPXFolder*
camel_kolab_imapx_folder_new (CamelKolabIMAPXStore *store,
- const gchar *folder_dir,
- const gchar *folder_name,
- GError **err)
+ const gchar *folder_dir,
+ const gchar *folder_name,
+ GError **err)
{
/* This function is a modified dupe of camel_imapx_folder_new() in
* CamelIMAPXFolder.
diff --git a/src/camel/camel-kolab-imapx-store.c b/src/camel/camel-kolab-imapx-store.c
index 4e8d27d..e35cf1e 100644
--- a/src/camel/camel-kolab-imapx-store.c
+++ b/src/camel/camel-kolab-imapx-store.c
@@ -372,7 +372,7 @@ imapx_store_get_foldertype (CamelKolabIMAPXStore *self,
* other than UNKNOWN
*/
g_debug ("%s: must be online to complete this operation",
- __func__);
+ __func__);
return KOLAB_FOLDER_TYPE_UNKNOWN;
}
is = camel_imapx_store_get_server (CAMEL_IMAPX_STORE (self),
diff --git a/src/camel/camel-kolab-session.c b/src/camel/camel-kolab-session.c
index 081e6e4..98f8a27 100644
--- a/src/camel/camel-kolab-session.c
+++ b/src/camel/camel-kolab-session.c
@@ -231,13 +231,11 @@ kolab_session_authenticate_sync (CamelSession *session,
/* If the SASL mechanism does not involve a user
* password, then it gets one shot to authenticate. */
if (authtype != NULL && !authtype->need_password) {
- result = camel_service_authenticate_sync (
- service, mechanism, cancellable, error);
+ result = camel_service_authenticate_sync (service, mechanism, cancellable, error);
if (result == CAMEL_AUTHENTICATION_REJECTED)
- g_set_error (
- error, CAMEL_SERVICE_ERROR,
- CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
- _("%s authentication failed"), mechanism);
+ g_set_error (error, CAMEL_SERVICE_ERROR,
+ CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
+ _("%s authentication failed"), mechanism);
return (result == CAMEL_AUTHENTICATION_ACCEPTED);
}
@@ -258,8 +256,9 @@ kolab_session_authenticate_sync (CamelSession *session,
* detect errors. */
sasl = camel_sasl_new (service_name, mechanism, service);
if (sasl != NULL) {
- success = camel_sasl_try_empty_password_sync (
- sasl, cancellable, &local_error);
+ success = camel_sasl_try_empty_password_sync (sasl,
+ cancellable,
+ &local_error);
g_object_unref (sasl);
}
@@ -276,7 +275,7 @@ kolab_session_authenticate_sync (CamelSession *session,
password_flags = CAMEL_SESSION_PASSWORD_SECRET;
-retry:
+ retry:
password = camel_service_get_password (service);
if (password == NULL) {
@@ -290,12 +289,12 @@ retry:
host = camel_network_settings_get_host (network_settings);
user = camel_network_settings_get_user (network_settings);
- prompt = camel_session_build_password_prompt (
- provider->name, user, host);
+ prompt = camel_session_build_password_prompt (provider->name,
+ user,
+ host);
- new_passwd = camel_session_get_password (
- session, service, prompt, "password",
- password_flags, &local_error);
+ new_passwd = camel_session_get_password (session, service, prompt, "password",
+ password_flags, &local_error);
camel_service_set_password (service, new_passwd);
password = camel_service_get_password (service);
g_free (new_passwd);
@@ -308,16 +307,14 @@ retry:
}
if (password == NULL) {
- g_set_error (
- error, CAMEL_SERVICE_ERROR,
- CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
- _("No password was provided"));
+ g_set_error (error, CAMEL_SERVICE_ERROR,
+ CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
+ _("No password was provided"));
return FALSE;
}
}
- result = camel_service_authenticate_sync (
- service, mechanism, cancellable, error);
+ result = camel_service_authenticate_sync (service, mechanism, cancellable, error);
if (result == CAMEL_AUTHENTICATION_REJECTED) {
password_flags |= CAMEL_SESSION_PASSWORD_REPROMPT;
diff --git a/src/camel/providers/imapx/camel-imapx-conn-manager-defs.h b/src/camel/providers/imapx/camel-imapx-conn-manager-defs.h
index 38abfe3..2f5634d 100644
--- a/src/camel/providers/imapx/camel-imapx-conn-manager-defs.h
+++ b/src/camel/providers/imapx/camel-imapx-conn-manager-defs.h
@@ -39,13 +39,13 @@
#define c(...) camel_imapx_debug(conman, __VA_ARGS__)
-#define CON_READ_LOCK(x) \
+#define CON_READ_LOCK(x) \
(g_static_rw_lock_reader_lock (&(x)->priv->rw_lock))
-#define CON_READ_UNLOCK(x) \
+#define CON_READ_UNLOCK(x) \
(g_static_rw_lock_reader_unlock (&(x)->priv->rw_lock))
-#define CON_WRITE_LOCK(x) \
+#define CON_WRITE_LOCK(x) \
(g_static_rw_lock_writer_lock (&(x)->priv->rw_lock))
-#define CON_WRITE_UNLOCK(x) \
+#define CON_WRITE_UNLOCK(x) \
(g_static_rw_lock_writer_unlock (&(x)->priv->rw_lock))
/* typedef of CamelIMAPXConnManagerPrivate done in camel-imapx-conn-manager.h */
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.c b/src/camel/providers/imapx/camel-imapx-extd-server.c
index 8e6ecc1..41bde5a 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.c
@@ -1852,9 +1852,9 @@ imapx_extd_server_set_metadata (CamelIMAPXExtdServer *self,
* on protocol type)
*/
ic = camel_imapx_command_new (is,
- "SETANNOTATION",
- NULL,
- (gchar *) cur_cmd->data);
+ "SETANNOTATION",
+ NULL,
+ (gchar *) cur_cmd->data);
ic->job = camel_imapx_job_new (cancellable);
/* TODO set more job details like priority? */
diff --git a/src/eplugin/e-kolab-folder-permissions.c b/src/eplugin/e-kolab-folder-permissions.c
index e8fb6b3..8113eaa 100644
--- a/src/eplugin/e-kolab-folder-permissions.c
+++ b/src/eplugin/e-kolab-folder-permissions.c
@@ -81,11 +81,11 @@ kolab_folder_permissions_ui_edit_dialog_cb (KolabFolderPermUIData *uidata)
g_assert (uidata->widgets != NULL);
dialog = gtk_dialog_new_with_buttons (_("Edit Kolab Folder Permissions..."),
- NULL, /* parent */
- GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL);
+ NULL, /* parent */
+ GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content), 6);
@@ -220,9 +220,10 @@ kolab_folder_permissions_ui_create_tree_view (KolabFolderPermUIData *uidata)
selection = gtk_tree_view_get_selection (tree_view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- /* FIXME connect signal to callback
+#if 0
+ /* FIXME connect signal to callback */
g_signal_connect (selection, "changed", G_CALLBACK (folder_permissions_tree_selection_changed_cb), widgets);
- */
+#endif
gtk_tree_view_set_headers_visible (tree_view, TRUE);
gtk_tree_view_set_headers_clickable (tree_view, FALSE);
gtk_tree_view_set_fixed_height_mode (tree_view, TRUE);
diff --git a/src/eplugin/e-kolab-plugin-ui.c b/src/eplugin/e-kolab-plugin-ui.c
index 6fdcfef..b5a77b5 100644
--- a/src/eplugin/e-kolab-plugin-ui.c
+++ b/src/eplugin/e-kolab-plugin-ui.c
@@ -511,8 +511,8 @@ kolab_plugin_ui_setup_mail_actions (EShellView *shell_view)
/* Decide whether we want this option to be visible or not */
g_signal_connect (shell_view,
"update-actions",
- G_CALLBACK (kolab_plugin_ui_update_mail_entries_cb),
- shell_view);
+ G_CALLBACK (kolab_plugin_ui_update_mail_entries_cb),
+ shell_view);
g_object_unref (action_group);
}
diff --git a/src/eplugin/e-kolab-plugin.c b/src/eplugin/e-kolab-plugin.c
index 54b4c51..dae156e 100644
--- a/src/eplugin/e-kolab-plugin.c
+++ b/src/eplugin/e-kolab-plugin.c
@@ -71,7 +71,9 @@ e_plugin_lib_enable (EPlugin *epl,
*
* This call does not belong here!
*/
- d (e_kolab_backend_sync_ui_conflict_cb (NULL);)
+#if 0
+ e_kolab_backend_sync_ui_conflict_cb (NULL);
+#endif
return 0;
}
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 14cc88a..328de62 100644
--- a/src/libekolabconv/main/src/evolution/contact-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/contact-e-to-i.c
@@ -43,9 +43,9 @@
static void process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact);
static void add_address (const EContact *e_contact, EContactAddress *e_address, I_contact* i_contact,
- EContactField e_addr_type, GHashTable *k_store_hash);
+ EContactField e_addr_type, GHashTable *k_store_hash);
static void add_email (const EContact *e_contact, EContactField e_field,
- I_contact* i_contact, gchar * email_str, GHashTable *k_store_hash);
+ I_contact* i_contact, gchar * email_str, GHashTable *k_store_hash);
static void add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *k_store_hash);
static void add_custom_fields (const EContact *e_contact, I_contact* i_contact, GHashTable *k_store_hash);
@@ -53,7 +53,7 @@ static void add_custom_fields (const EContact *e_contact, I_contact* i_contact,
static void kolab_store_handle_attachments(const EContact *e_contact, I_common* i_common);
static GHashTable* kolab_store_read_values (const EContact *e_contact, I_contact* i_contact);
static void kolab_store_restore_subnode_xml(I_contact *i_contact, gpointer parent_ptr,
- const EContact *e_contact, EContactField e_field, GHashTable *k_store_hash);
+ const EContact *e_contact, EContactField e_field, GHashTable *k_store_hash);
static Icontact_address_type address_type_e_to_i(EContactField e_addr_type);
static Icontact_phone_type phone_type_e_to_i(GList *vcard_types);
@@ -156,7 +156,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
geo = e_contact_get (e_contact_dup, E_CONTACT_GEO);
if (geo) {
if (geo->latitude >= -90.0 && geo->latitude <= 90.0
- && geo->longitude >= -180.0 && geo->longitude <= 180.0) {
+ && geo->longitude >= -180.0 && geo->longitude <= 180.0) {
i_contact->latitude = geo->latitude;
i_contact->longitude = geo->longitude;
}
@@ -295,7 +295,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
time_t *tt = NULL;
if (buffer[10] == 'T') /* get rid of 'T' in iso time stamp if neccessary */
- buffer[10] = ' ';
+ buffer[10] = ' ';
t = g_new0(struct tm, 1);
strptime(buffer, "%Y-%m-%d %H:%M:%S", t);
@@ -360,7 +360,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
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");
@@ -405,7 +405,7 @@ process_contact_e_to_i (I_contact* i_contact, const EContact *e_contact)
*/
static void
add_address (const EContact *e_contact, EContactAddress *e_address, I_contact* i_contact,
- EContactField e_addr_type, GHashTable *k_store_hash)
+ EContactField e_addr_type, GHashTable *k_store_hash)
{
Address *addr = new_address ();
@@ -434,7 +434,7 @@ add_address (const EContact *e_contact, EContactAddress *e_address, I_contact* i
*/
static void
add_email (const EContact *e_contact, EContactField e_field,
- I_contact* i_contact, gchar * email_str, GHashTable *k_store_hash)
+ I_contact* i_contact, gchar * email_str, GHashTable *k_store_hash)
{
Email *structEmail = g_new0(Email, 1);
@@ -458,20 +458,17 @@ add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *
attrs = e_vcard_get_attributes (E_VCARD (e_contact));
/* for all attributes in vcard object */
- for (attr = attrs; attr;)
- {
+ for (attr = attrs; attr;) {
EVCardAttribute *a = attr->data;
/* do if it is a phone object */
- if (!strcmp (EVC_TEL, e_vcard_attribute_get_name (a)))
- {
+ if (!strcmp (EVC_TEL, e_vcard_attribute_get_name (a))) {
gchar* value = NULL;
GList *params = e_vcard_attribute_get_param (a, EVC_TYPE);
GList *param;
GList *type_list = NULL;
- for (param = params; param; param = param->next)
- {
+ for (param = params; param; param = param->next) {
EVCardAttributeParam *p = param->data;
type_list = g_list_append(type_list, p);
}
@@ -492,8 +489,7 @@ add_phone_numbers (const EContact *e_contact, I_contact* i_contact, GHashTable *
* kolab store:
* manual read from kolab store, maybe create a separate function for cases like this, when you have a vcard-attribute instead of e_object
*/
- if (e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID) != NULL)
- {
+ if (e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID) != NULL) {
GList *paramlist = e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID);
for (;paramlist != NULL; paramlist = paramlist->next) {
EVCardAttributeParam *eparam = paramlist->data;
@@ -584,11 +580,9 @@ add_custom_fields (const EContact *e_contact, I_contact* i_contact, GHashTable *
* kolab store:
* manual read from kolab store, maybe create a separate function for cases like this, when you have a vcard-attribute instead of e_object
*/
- if (e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID) != NULL)
- {
+ if (e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID) != NULL) {
GList *paramlist = e_vcard_attribute_get_param(a, ICONTACT_KOLAB_STORE_ID);
- for (;paramlist != NULL; paramlist = paramlist->next)
- {
+ for (;paramlist != NULL; paramlist = paramlist->next) {
EVCardAttributeParam *eparam = paramlist->data;
if (eparam != NULL) {
@@ -730,7 +724,7 @@ kolab_store_read_values (const EContact *e_contact, I_contact* i_contact)
*/
static void
kolab_store_restore_subnode_xml(I_contact *i_contact, gpointer parent_ptr,
- const EContact *e_contact, EContactField e_field, GHashTable *k_store_hash)
+ const EContact *e_contact, EContactField e_field, GHashTable *k_store_hash)
{
gchar *e_value = NULL;
GList *e_attr_list = NULL;
@@ -791,13 +785,13 @@ static Icontact_address_type
address_type_e_to_i(EContactField e_addr_type)
{
switch (e_addr_type) {
- case E_CONTACT_ADDRESS_HOME:
- return ICONTACT_ADDR_TYPE_HOME;
- case E_CONTACT_ADDRESS_WORK:
- return ICONTACT_ADDR_TYPE_BUSINESS;
- case E_CONTACT_ADDRESS_LABEL_OTHER:
- default:
- return ICONTACT_ADDR_TYPE_OTHER;
+ case E_CONTACT_ADDRESS_HOME:
+ return ICONTACT_ADDR_TYPE_HOME;
+ case E_CONTACT_ADDRESS_WORK:
+ return ICONTACT_ADDR_TYPE_BUSINESS;
+ case E_CONTACT_ADDRESS_LABEL_OTHER:
+ default:
+ return ICONTACT_ADDR_TYPE_OTHER;
}
}
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 c864afe..edea169 100644
--- a/src/libekolabconv/main/src/evolution/contact-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/contact-i-to-e.c
@@ -48,9 +48,9 @@ static void add_hidden_field_base64 (EContact *e_contact, gchar* field_name, gch
static gint kolab_store_get_sub_id(GList **k_store_sublist, gpointer ptr);
static void kolab_store_add_id(I_contact *i_contact, gpointer ptr, GList **k_store_sublist,
- EVCardAttribute *attr);
+ EVCardAttribute *attr);
static void kolab_store_add_id_to_field(EContact *e_contact, EContactField ecf, I_contact *i_contact,
- gpointer ptr, GList **k_store_sublist);
+ gpointer ptr, GList **k_store_sublist);
static GList* phone_type_i_to_v(Icontact_phone_type i_phone_type);
static EContactField address_type_i_to_e(Icontact_address_type i_addr_type);
@@ -186,7 +186,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
e_contact_photo.data.inlined.mime_type = g_new0(gchar, 100);
memcpy (e_contact_photo.data.inlined.data, icontact->photo->data,
- icontact->photo->length);
+ icontact->photo->length);
e_contact_photo.data.inlined.length = icontact->photo->length;
e_contact_photo.data.inlined.mime_type = g_strdup (icontact->photo->mime_type);
e_contact_photo.data.uri = NULL;
@@ -206,8 +206,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
EVCardAttributeParam* ph_param = e_vcard_attribute_param_new (EVC_TYPE);
e_vcard_attribute_add_param(ph_number, ph_param);
- while (vcard_types != NULL)
- {
+ while (vcard_types != NULL) {
e_vcard_attribute_param_add_value(ph_param, vcard_types->data); /* set type */
vcard_types = vcard_types->next;
}
@@ -247,8 +246,8 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
#if 0
if (((Email*) list->data)->display_name)
addHiddenParamToExistingFieldInEcontact (eContact,
- email_slot, "display-name",
- ((Email*) list->data)->display_name->str);
+ 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); */
@@ -298,7 +297,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
/* *****************************************************************GEO************************************************ */
if (icontact->latitude >= -90.0 && icontact->latitude <= 90.0
- && icontact->longitude >= -180.0 && icontact->longitude <= 180.0) {
+ && icontact->longitude >= -180.0 && icontact->longitude <= 180.0) {
/* if both degrees are set and their values are valid coordinate values, then set geo */
EContactGeo geo;
geo.latitude = icontact->latitude;
@@ -308,8 +307,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
/* *****************************************************************SET COMMON FIELDS************************************ */
- if (icontact->common != NULL)
- {
+ if (icontact->common != NULL) {
if (icontact->common->uid != NULL)
e_contact_set (e_contact, E_CONTACT_UID, icontact->common->uid->str);
@@ -321,7 +319,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
if (icontact->common->creation_datetime != NULL
- && icontact->common->creation_datetime->date_time != NULL) {
+ && icontact->common->creation_datetime->date_time != NULL) {
EVCardAttribute *createdAttribute = NULL;
struct tm *ts = gmtime (icontact->common->creation_datetime->date_time);
@@ -339,8 +337,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
}
if (icontact->common->last_modified_datetime != NULL
- && icontact->common->last_modified_datetime->date_time != NULL)
- {
+ && icontact->common->last_modified_datetime->date_time != NULL) {
struct tm *ts = gmtime(icontact->common->last_modified_datetime->date_time);
gchar *buf = g_new0(gchar, 21);
strftime(buf, 21, "%Y-%m-%dT%H:%M:%SZ", ts);
@@ -378,7 +375,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
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 */
- && i < max_evolution_im) {
+ && i < max_evolution_im) {
EVCardAttribute *im_field = NULL; /* attribute to write */
/* save just elements that are available in evolution, put other in kolab store */
@@ -405,8 +402,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
}
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 {
+ } else {
/* type not found */
xmlNodePtr store_node = NULL;
store_node = xmlNewNode(NULL, BAD_CAST KLBX_CNT_X_CUSTOM_LIST);
@@ -431,8 +427,7 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
e_vcard_add_attribute(&e_contact->parent, im_field);
i++;
}
- }
- else {
+ } else {
xmlNodePtr store_node = NULL;
store_node = xmlNewNode(NULL, BAD_CAST KLBX_CNT_X_CUSTOM_LIST);
add_property (store_node, "value", custom_field->value->str);
@@ -457,16 +452,16 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
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);
+ ICONTACT_KOLAB_STORE,
+ ((gchar *) list->data), -1);
/* 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)
add_hidden_field_base64 (e_contact,
- ICONTACT_KOLAB_STORE,
- ((gchar *) list->data), KOLAB_STORE_PTR_CONTACT_NAME);
+ ICONTACT_KOLAB_STORE,
+ ((gchar *) list->data), KOLAB_STORE_PTR_CONTACT_NAME);
/* add kolab store elements which are referred by id */
@@ -476,8 +471,8 @@ process_contact_i_to_e (EContact* e_contact, I_contact **i_contact)
list = kolab_store_get_element_list(icontact->common, k_store_sublist->data);
for (; list != NULL; list = list->next)
add_hidden_field_base64 (e_contact,
- ICONTACT_KOLAB_STORE,
- ((gchar *) list->data), i);
+ ICONTACT_KOLAB_STORE,
+ ((gchar *) list->data), i);
i++;
}
}
@@ -501,17 +496,17 @@ add_binary_field_base64 (EContact *e_contact, Kolab_conv_mail_part *mpart)
/* 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");
+ EVC_ENCODING), "BASE64");
/* 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);
+ ICONTACT_KOLAB_STORE_ATTACHMENT_MTYPE), mpart->mime_type);
/* 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);
+ ICONTACT_KOLAB_STORE_ATTACHMENT_NAME), mpart->name);
/* Add binary data to the attribute */
e_vcard_attribute_add_value_decoded (bin_attr, mpart->data, (gint)mpart->length);
@@ -562,7 +557,7 @@ kolab_store_get_sub_id(GList **k_store_sublist, gpointer ptr)
*/
static void
kolab_store_add_id(I_contact *i_contact, gpointer ptr, GList **k_store_sublist,
- EVCardAttribute *attr)
+ EVCardAttribute *attr)
{
GList *list = kolab_store_get_element_list(i_contact->common, ptr);
if (list != NULL) {
@@ -599,76 +594,58 @@ 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");
}
- else if (i_phone_type == ICONTACT_PHONE_ASSISTANT)
- {
+ else if (i_phone_type == ICONTACT_PHONE_ASSISTANT) {
vcard_types = g_list_append(vcard_types, EVC_X_ASSISTANT);
}
- else if (i_phone_type == ICONTACT_PHONE_CALLBACK)
- {
+ else if (i_phone_type == ICONTACT_PHONE_CALLBACK) {
vcard_types = g_list_append(vcard_types, EVC_X_CALLBACK);
}
- else if (i_phone_type == ICONTACT_PHONE_CAR)
- {
+ else if (i_phone_type == ICONTACT_PHONE_CAR) {
vcard_types = g_list_append(vcard_types, (gchar*)"CAR");
}
- else if (i_phone_type == ICONTACT_PHONE_COMPANY)
- {
+ else if (i_phone_type == ICONTACT_PHONE_COMPANY) {
vcard_types = g_list_append(vcard_types, (gchar*)"X-EVOLUTION-COMPANY");
}
- else if (i_phone_type == ICONTACT_PHONE_ISDN)
- {
+ else if (i_phone_type == ICONTACT_PHONE_ISDN) {
vcard_types = g_list_append(vcard_types, (gchar*)"ISDN");
}
- else if (i_phone_type == ICONTACT_PHONE_MOBILE)
- {
+ else if (i_phone_type == ICONTACT_PHONE_MOBILE) {
vcard_types = g_list_append(vcard_types, (gchar*)"CELL");
}
- else if (i_phone_type == ICONTACT_PHONE_PAGER)
- {
+ else if (i_phone_type == ICONTACT_PHONE_PAGER) {
vcard_types = g_list_append(vcard_types, (gchar*)"PAGER");
}
- else if (i_phone_type == ICONTACT_PHONE_RADIO)
- {
+ else if (i_phone_type == ICONTACT_PHONE_RADIO) {
vcard_types = g_list_append(vcard_types, EVC_X_RADIO);
}
- else if (i_phone_type == ICONTACT_PHONE_TELEX)
- {
+ else if (i_phone_type == ICONTACT_PHONE_TELEX) {
vcard_types = g_list_append(vcard_types, EVC_X_TELEX);
}
- else if (i_phone_type == ICONTACT_PHONE_TTYTDD)
- {
+ else if (i_phone_type == ICONTACT_PHONE_TTYTDD) {
vcard_types = g_list_append(vcard_types, EVC_X_TTYTDD);
}
- else if (i_phone_type == ICONTACT_PHONE_OTHER)
- {
+ else if (i_phone_type == ICONTACT_PHONE_OTHER) {
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");
}
- else if (i_phone_type == ICONTACT_PHONE_HOME_FAX)
- {
+ else if (i_phone_type == ICONTACT_PHONE_HOME_FAX) {
vcard_types = g_list_append(vcard_types, (gchar*)"HOME");
vcard_types = g_list_append(vcard_types, (gchar*)"FAX");
}
- else if (i_phone_type == ICONTACT_PHONE_BUSINESS_1)
- {
+ else if (i_phone_type == ICONTACT_PHONE_BUSINESS_1) {
vcard_types = g_list_append(vcard_types, (gchar*)"WORK");
vcard_types = g_list_append(vcard_types, (gchar*)"VOICE");
}
- else if (i_phone_type == ICONTACT_PHONE_BUSINESS_FAX)
- {
+ else if (i_phone_type == ICONTACT_PHONE_BUSINESS_FAX) {
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");
}
@@ -682,18 +659,12 @@ static EContactField
address_type_i_to_e(Icontact_address_type i_addr_type)
{
switch (i_addr_type) {
- case ICONTACT_ADDR_TYPE_HOME:
- return E_CONTACT_ADDRESS_HOME;
- case ICONTACT_ADDR_TYPE_BUSINESS:
- return E_CONTACT_ADDRESS_WORK;
- case ICONTACT_ADDR_TYPE_OTHER:
- default:
- return E_CONTACT_ADDRESS_OTHER;
+ case ICONTACT_ADDR_TYPE_HOME:
+ return E_CONTACT_ADDRESS_HOME;
+ case ICONTACT_ADDR_TYPE_BUSINESS:
+ return E_CONTACT_ADDRESS_WORK;
+ case ICONTACT_ADDR_TYPE_OTHER:
+ default:
+ return E_CONTACT_ADDRESS_OTHER;
}
}
-
-
-
-
-
-
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 71a4280..2f4dffa 100644
--- a/src/libekolabconv/main/src/evolution/event-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/event-e-to-i.c
@@ -63,12 +63,12 @@ static Show_time_as
transparency_to_show_time_as(ECalComponentTransparency e_transp)
{
switch (e_transp) {
- case E_CAL_COMPONENT_TRANSP_OPAQUE:
- return SHOW_TIME_AS_BUSY;
- case E_CAL_COMPONENT_TRANSP_TRANSPARENT:
- return SHOW_TIME_AS_FREE;
- default:
- return SHOW_TIME_AS_BUSY;
+ case E_CAL_COMPONENT_TRANSP_OPAQUE:
+ return SHOW_TIME_AS_BUSY;
+ case E_CAL_COMPONENT_TRANSP_TRANSPARENT:
+ return SHOW_TIME_AS_FREE;
+ default:
+ return SHOW_TIME_AS_BUSY;
}
}
@@ -119,5 +119,3 @@ process_event_e_to_i(const ECalComponentWithTZ *ectz, I_event *i_event, GError *
e_cal_component_free_datetime(e_end_date);
g_free(e_end_date);
}
-
-
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 7365186..7fd88ff 100644
--- a/src/libekolabconv/main/src/evolution/event-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/event-i-to-e.c
@@ -36,16 +36,16 @@ static ECalComponentTransparency
show_time_as_to_transparency(Show_time_as sta)
{
switch (sta) {
- case SHOW_TIME_AS_BUSY:
- return E_CAL_COMPONENT_TRANSP_OPAQUE;
- case SHOW_TIME_AS_FREE:
- return E_CAL_COMPONENT_TRANSP_TRANSPARENT;
- case SHOW_TIME_AS_TENTATIVE:
- return E_CAL_COMPONENT_TRANSP_OPAQUE;
- case SHOW_TIME_AS_OUT_OF_OFFICE:
- return E_CAL_COMPONENT_TRANSP_OPAQUE;
- default:
- return E_CAL_COMPONENT_TRANSP_OPAQUE;
+ case SHOW_TIME_AS_BUSY:
+ return E_CAL_COMPONENT_TRANSP_OPAQUE;
+ case SHOW_TIME_AS_FREE:
+ return E_CAL_COMPONENT_TRANSP_TRANSPARENT;
+ case SHOW_TIME_AS_TENTATIVE:
+ return E_CAL_COMPONENT_TRANSP_OPAQUE;
+ case SHOW_TIME_AS_OUT_OF_OFFICE:
+ return E_CAL_COMPONENT_TRANSP_OPAQUE;
+ default:
+ return E_CAL_COMPONENT_TRANSP_OPAQUE;
}
}
@@ -114,4 +114,3 @@ conv_I_event_to_ECalComponentWithTZ (I_event **i_event_ptr, GError **error)
return ectz;
}
-
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 7a986c2..3b47e21 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
@@ -83,18 +83,18 @@ sensitivity_e_to_i(const ECalComponent *e_cal_comp, I_common *i_common)
ECalComponentClassification classif;
e_cal_component_get_classification((ECalComponent*) e_cal_comp, &classif);
switch (classif) {
- case E_CAL_COMPONENT_CLASS_PUBLIC:
- i_common->sensitivity = ICOMMON_SENSITIVITY_PUBLIC;
- break;
- case E_CAL_COMPONENT_CLASS_PRIVATE:
- i_common->sensitivity = ICOMMON_SENSITIVITY_PRIVATE;
- break;
- case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
- i_common->sensitivity = ICOMMON_SENSITIVITY_CONFIDENTIAL;
- break;
- default:
- i_common->sensitivity = ICOMMON_SENSITIVITY_PUBLIC;
- break;
+ case E_CAL_COMPONENT_CLASS_PUBLIC:
+ i_common->sensitivity = ICOMMON_SENSITIVITY_PUBLIC;
+ break;
+ case E_CAL_COMPONENT_CLASS_PRIVATE:
+ i_common->sensitivity = ICOMMON_SENSITIVITY_PRIVATE;
+ break;
+ case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
+ i_common->sensitivity = ICOMMON_SENSITIVITY_CONFIDENTIAL;
+ break;
+ default:
+ i_common->sensitivity = ICOMMON_SENSITIVITY_PUBLIC;
+ break;
}
}
@@ -111,7 +111,7 @@ link_attachments_e_to_i(const ECalComponent *e_cal_comp, I_common *i_common)
gchar* url = (gchar*)links->data;
if (url)
i_common->link_attachments = g_list_append(
- i_common->link_attachments, url);
+ i_common->link_attachments, url);
}
g_slist_free(links);
}
@@ -135,7 +135,7 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
icalparameter_value xvalue;
para = i == 0 ? icalproperty_get_first_parameter(prop, ICAL_ANY_PARAMETER) :
- icalproperty_get_next_parameter(prop, ICAL_ANY_PARAMETER);
+ icalproperty_get_next_parameter(prop, ICAL_ANY_PARAMETER);
kind = icalparameter_isa(para);
xvalue = icalparameter_get_value(para);
@@ -158,8 +158,8 @@ add_e_attachment_parameters(icalproperty *prop, I_common *i_common, gboolean inl
if (label != NULL) {
if (inln)
i_common->inline_attachment_names = g_list_append(
- i_common->inline_attachment_names,
- strdup(label));
+ i_common->inline_attachment_names,
+ strdup(label));
mpart->name = strdup(label);
}
if (mime_type != NULL)
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 f1a8785..e4f8abf 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
@@ -216,17 +216,17 @@ sensitivity_i_to_e (const ECalComponent *e_cal_comp, I_common *i_common)
{
ECalComponentClassification classif;
switch (i_common->sensitivity) {
- case ICOMMON_SENSITIVITY_PUBLIC:
- classif = E_CAL_COMPONENT_CLASS_PUBLIC;
- break;
- case ICOMMON_SENSITIVITY_PRIVATE:
- classif = E_CAL_COMPONENT_CLASS_PRIVATE;
- break;
- case ICOMMON_SENSITIVITY_CONFIDENTIAL:
- classif = E_CAL_COMPONENT_CLASS_CONFIDENTIAL;
- break;
- default:
- classif = E_CAL_COMPONENT_CLASS_PUBLIC;
+ case ICOMMON_SENSITIVITY_PUBLIC:
+ classif = E_CAL_COMPONENT_CLASS_PUBLIC;
+ break;
+ case ICOMMON_SENSITIVITY_PRIVATE:
+ classif = E_CAL_COMPONENT_CLASS_PRIVATE;
+ break;
+ case ICOMMON_SENSITIVITY_CONFIDENTIAL:
+ classif = E_CAL_COMPONENT_CLASS_CONFIDENTIAL;
+ break;
+ default:
+ classif = E_CAL_COMPONENT_CLASS_PUBLIC;
}
e_cal_component_set_classification((ECalComponent*) e_cal_comp, classif);
}
@@ -285,4 +285,3 @@ find_html_body (htmlNodePtr element, gchar **description)
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 56344fe..3360b50 100644
--- a/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c
+++ b/src/libekolabconv/main/src/evolution/priv-evolution-preserve.c
@@ -151,7 +151,7 @@ i_evo_store_add_contact(EContact *e_contact, I_common *i_common)
* 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"); */
+ /* 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");
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 75cfecc..2fcdae4 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
@@ -170,9 +170,8 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
if (g_str_has_prefix(value, "MAILTO:"))/* increase pointer by 7 to cut off prefix */
value +=7;
- alarm->email_param->addresses = g_list_append(
- alarm->email_param->addresses,
- g_string_new(value));
+ alarm->email_param->addresses = g_list_append(alarm->email_param->addresses,
+ g_string_new(value));
}
generic_g_slist_free(&attendee_list, free_attendee);
@@ -185,8 +184,7 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
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 */
- if (trigger->type == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE)
- {
+ 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
@@ -197,15 +195,13 @@ conv_incidence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence
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)
- {
+ 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)
- {
+ else if (incidence->startDate->date != NULL) {
/* convert startDate from GDate to date_time/time_t and then calculate difference */
struct tm *stm = NULL;
@@ -285,16 +281,16 @@ static Alarm_type
alarm_type_e_to_i (ECalComponentAlarmAction action)
{
switch (action) {
- case E_CAL_COMPONENT_ALARM_AUDIO:
- return I_ALARM_TYPE_AUDIO;
- case E_CAL_COMPONENT_ALARM_DISPLAY:
- return I_ALARM_TYPE_DISPLAY;
- case E_CAL_COMPONENT_ALARM_EMAIL:
- return I_ALARM_TYPE_EMAIL;
- case E_CAL_COMPONENT_ALARM_PROCEDURE:
- return I_ALARM_TYPE_PROCEDURE;
- default:
- return I_ALARM_TYPE_DISPLAY;
+ case E_CAL_COMPONENT_ALARM_AUDIO:
+ return I_ALARM_TYPE_AUDIO;
+ case E_CAL_COMPONENT_ALARM_DISPLAY:
+ return I_ALARM_TYPE_DISPLAY;
+ case E_CAL_COMPONENT_ALARM_EMAIL:
+ return I_ALARM_TYPE_EMAIL;
+ case E_CAL_COMPONENT_ALARM_PROCEDURE:
+ return I_ALARM_TYPE_PROCEDURE;
+ default:
+ return I_ALARM_TYPE_DISPLAY;
}
}
@@ -306,18 +302,18 @@ static Incidence_status
incidence_status_e_to_i (icalparameter_partstat ical_part_status)
{
switch (ical_part_status) {
- case ICAL_PARTSTAT_NEEDSACTION:
- return I_INC_STATUS_NONE;
- case ICAL_PARTSTAT_TENTATIVE:
- return I_INC_STATUS_TENTATIVE;
- case ICAL_PARTSTAT_ACCEPTED:
- return I_INC_STATUS_ACCEPTED;
- case ICAL_PARTSTAT_DECLINED:
- return I_INC_STATUS_DECLINED;
- case ICAL_PARTSTAT_DELEGATED:
- return I_INC_STATUS_DELEGATED;
- default:
- return I_INC_STATUS_NONE;
+ case ICAL_PARTSTAT_NEEDSACTION:
+ return I_INC_STATUS_NONE;
+ case ICAL_PARTSTAT_TENTATIVE:
+ return I_INC_STATUS_TENTATIVE;
+ case ICAL_PARTSTAT_ACCEPTED:
+ return I_INC_STATUS_ACCEPTED;
+ case ICAL_PARTSTAT_DECLINED:
+ return I_INC_STATUS_DECLINED;
+ case ICAL_PARTSTAT_DELEGATED:
+ return I_INC_STATUS_DELEGATED;
+ default:
+ return I_INC_STATUS_NONE;
}
}
@@ -328,16 +324,16 @@ static Incidence_cutype
incidence_cutype_e_to_i (icalparameter_cutype ical_part_type)
{
switch (ical_part_type) {
- case ICAL_CUTYPE_INDIVIDUAL:
- return I_INC_CUTYPE_INDIVIDUAL;
- case ICAL_CUTYPE_GROUP:
- return I_INC_CUTYPE_GROUP;
- case ICAL_CUTYPE_RESOURCE:
- return I_INC_CUTYPE_RESOURCE;
- case ICAL_CUTYPE_ROOM:
- return I_INC_CUTYPE_ROOM;
- default:
- return I_INC_CUTYPE_UNDEFINED;
+ case ICAL_CUTYPE_INDIVIDUAL:
+ return I_INC_CUTYPE_INDIVIDUAL;
+ case ICAL_CUTYPE_GROUP:
+ return I_INC_CUTYPE_GROUP;
+ case ICAL_CUTYPE_RESOURCE:
+ return I_INC_CUTYPE_RESOURCE;
+ case ICAL_CUTYPE_ROOM:
+ return I_INC_CUTYPE_ROOM;
+ default:
+ return I_INC_CUTYPE_UNDEFINED;
}
}
@@ -348,16 +344,16 @@ static Incidence_role
incidence_role_e_to_i (icalparameter_role ical_role)
{
switch (ical_role) {
- case ICAL_ROLE_REQPARTICIPANT:
- return I_INC_ROLE_REQUIRED;
- case ICAL_ROLE_OPTPARTICIPANT:
- return I_INC_ROLE_OPTIONAL;
- case ICAL_ROLE_NONPARTICIPANT:
- return I_INC_ROLE_RESOURCE;
- case ICAL_ROLE_CHAIR:
- return I_INC_ROLE_REQUIRED;
- default:
- return I_INC_ROLE_REQUIRED;
+ case ICAL_ROLE_REQPARTICIPANT:
+ return I_INC_ROLE_REQUIRED;
+ case ICAL_ROLE_OPTPARTICIPANT:
+ return I_INC_ROLE_OPTIONAL;
+ case ICAL_ROLE_NONPARTICIPANT:
+ return I_INC_ROLE_RESOURCE;
+ case ICAL_ROLE_CHAIR:
+ return I_INC_ROLE_REQUIRED;
+ default:
+ return I_INC_ROLE_REQUIRED;
}
}
@@ -376,25 +372,25 @@ static Week_day
recurrence_weekday_e_to_i (icalrecurrencetype_weekday weekday)
{
switch (weekday) {
- case ICAL_NO_WEEKDAY:
- return 0;
- case ICAL_MONDAY_WEEKDAY:
- return I_COMMON_MONDAY;
- case ICAL_TUESDAY_WEEKDAY:
- return I_COMMON_TUESDAY;
- case ICAL_WEDNESDAY_WEEKDAY:
- return I_COMMON_WEDNESDAY;
- case ICAL_THURSDAY_WEEKDAY:
- return I_COMMON_THURSDAY;
- case ICAL_FRIDAY_WEEKDAY:
- return I_COMMON_FRIDAY;
- case ICAL_SATURDAY_WEEKDAY:
- return I_COMMON_SATURDAY;
- case ICAL_SUNDAY_WEEKDAY:
- return I_COMMON_SUNDAY;
- default:
- log_warn("invalid weekday enumeration value: %d", weekday);
- return 0;
+ case ICAL_NO_WEEKDAY:
+ return 0;
+ case ICAL_MONDAY_WEEKDAY:
+ return I_COMMON_MONDAY;
+ case ICAL_TUESDAY_WEEKDAY:
+ return I_COMMON_TUESDAY;
+ case ICAL_WEDNESDAY_WEEKDAY:
+ return I_COMMON_WEDNESDAY;
+ case ICAL_THURSDAY_WEEKDAY:
+ return I_COMMON_THURSDAY;
+ case ICAL_FRIDAY_WEEKDAY:
+ return I_COMMON_FRIDAY;
+ case ICAL_SATURDAY_WEEKDAY:
+ return I_COMMON_SATURDAY;
+ case ICAL_SUNDAY_WEEKDAY:
+ return I_COMMON_SUNDAY;
+ default:
+ log_warn("invalid weekday enumeration value: %d", weekday);
+ return 0;
}
}
@@ -441,10 +437,9 @@ recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
while (exdate_list) {
ECalComponentDateTime *e_cal_date_time = (ECalComponentDateTime *) exdate_list->data;
- GDate *exclusion_date = g_date_new_dmy(
- (GDateDay) e_cal_date_time->value->day,
- (GDateMonth) e_cal_date_time->value->month,
- (GDateYear)e_cal_date_time->value->year);
+ GDate *exclusion_date = g_date_new_dmy((GDateDay) e_cal_date_time->value->day,
+ (GDateMonth) e_cal_date_time->value->month,
+ (GDateYear)e_cal_date_time->value->year);
i_incidence->recurrence->exclusion = g_list_append( i_incidence->recurrence->exclusion, (GDate *) exclusion_date);
exdate_list = exdate_list->next;
@@ -467,10 +462,10 @@ recurrence_e_to_i (const ECalComponentWithTZ *ectz, I_incidence *i_incidence)
/* 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
- && rec_type->by_set_pos[1] == ICAL_RECURRENCE_ARRAY_MAX
- && i_incidence->recurrence->interval == 12) {
+ && rec_type->by_day[0] != ICAL_RECURRENCE_ARRAY_MAX
+ && rec_type->by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX
+ && rec_type->by_set_pos[1] == ICAL_RECURRENCE_ARRAY_MAX
+ && i_incidence->recurrence->interval == 12) {
gint month = 0;
i_incidence->recurrence->recurrence_cycle = I_REC_CYCLE_YEARLY_WEEKDAY;
@@ -603,10 +598,9 @@ static void
recurrence_set_range(struct icalrecurrencetype *rec_type, Recurrence *recurrence)
{
if (icaltime_is_date (rec_type->until) == TRUE) {
- recurrence->range_date = g_date_new_dmy(
- (GDateDay) rec_type->until.day,
- (GDateMonth) rec_type->until.month,
- (GDateYear) rec_type->until.year);
+ recurrence->range_date = g_date_new_dmy((GDateDay) rec_type->until.day,
+ (GDateMonth) rec_type->until.month,
+ (GDateYear) rec_type->until.year);
} else if (rec_type->count > 0) {
recurrence->range_number = g_new0(gint, 1);
*recurrence->range_number = rec_type->count;
@@ -614,4 +608,3 @@ recurrence_set_range(struct icalrecurrencetype *rec_type, Recurrence *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 c53d0a7..0f450f4 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
@@ -294,16 +294,16 @@ static
ECalComponentAlarmAction alarm_type_i_to_e(Alarm_type alarmtype)
{
switch (alarmtype) {
- case I_ALARM_TYPE_AUDIO:
- return E_CAL_COMPONENT_ALARM_AUDIO;
- case I_ALARM_TYPE_DISPLAY:
- return E_CAL_COMPONENT_ALARM_DISPLAY;
- case I_ALARM_TYPE_EMAIL:
- return E_CAL_COMPONENT_ALARM_EMAIL;
- case I_ALARM_TYPE_PROCEDURE:
- return E_CAL_COMPONENT_ALARM_PROCEDURE;
- default:
- return E_CAL_COMPONENT_ALARM_DISPLAY;
+ case I_ALARM_TYPE_AUDIO:
+ return E_CAL_COMPONENT_ALARM_AUDIO;
+ case I_ALARM_TYPE_DISPLAY:
+ return E_CAL_COMPONENT_ALARM_DISPLAY;
+ case I_ALARM_TYPE_EMAIL:
+ return E_CAL_COMPONENT_ALARM_EMAIL;
+ case I_ALARM_TYPE_PROCEDURE:
+ return E_CAL_COMPONENT_ALARM_PROCEDURE;
+ default:
+ return E_CAL_COMPONENT_ALARM_DISPLAY;
}
}
@@ -367,20 +367,20 @@ frequency_i_to_e(Recurrence *recurrence)
if (recurrence) {
switch (recurrence->recurrence_cycle) {
- case I_REC_CYCLE_DAILY:
- return ICAL_DAILY_RECURRENCE;
- case I_REC_CYCLE_WEEKLY:
- return ICAL_WEEKLY_RECURRENCE;
- case I_REC_CYCLE_MONTHLY_DAYNUMBER:
- case I_REC_CYCLE_MONTHLY_WEEKDAY:
- case I_REC_CYCLE_YEARLY_WEEKDAY:
- return ICAL_MONTHLY_RECURRENCE;
- case I_REC_CYCLE_YEARLY_MONTHDAY:
- case I_REC_CYCLE_YEARLY_YEARDAY:
+ case I_REC_CYCLE_DAILY:
+ return ICAL_DAILY_RECURRENCE;
+ case I_REC_CYCLE_WEEKLY:
+ return ICAL_WEEKLY_RECURRENCE;
+ case I_REC_CYCLE_MONTHLY_DAYNUMBER:
+ case I_REC_CYCLE_MONTHLY_WEEKDAY:
+ case I_REC_CYCLE_YEARLY_WEEKDAY:
+ 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!! */
- return ICAL_YEARLY_RECURRENCE;
- default:
- return ICAL_NO_RECURRENCE;
+ return ICAL_YEARLY_RECURRENCE;
+ default:
+ return ICAL_NO_RECURRENCE;
}
} else
return ICAL_NO_RECURRENCE;
@@ -442,39 +442,39 @@ recurrence_fields_i_to_e(ECalComponentWithTZ *ectz, I_incidence *i_incidence)
rec_type->interval = (gshort)i_incidence->recurrence->interval;
switch (i_incidence->recurrence->recurrence_cycle) {
- case I_REC_CYCLE_DAILY:
- recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
- break;
- case I_REC_CYCLE_WEEKLY:
- recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
- break;
- case I_REC_CYCLE_MONTHLY_DAYNUMBER:
- recurrence_set_by_month_day(rec_type, i_incidence->recurrence);
- break;
- case I_REC_CYCLE_MONTHLY_WEEKDAY:
- rec_type->by_set_pos[0] = (short int) i_incidence->recurrence->day_number;
- rec_type->by_set_pos[1] = ICAL_RECURRENCE_ARRAY_MAX;
- 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
- */
+ case I_REC_CYCLE_DAILY:
+ recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
+ break;
+ case I_REC_CYCLE_WEEKLY:
+ recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
+ break;
+ case I_REC_CYCLE_MONTHLY_DAYNUMBER:
+ recurrence_set_by_month_day(rec_type, i_incidence->recurrence);
+ break;
+ case I_REC_CYCLE_MONTHLY_WEEKDAY:
+ rec_type->by_set_pos[0] = (short int) i_incidence->recurrence->day_number;
+ rec_type->by_set_pos[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ 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
+ */
#if 0
- recurrence_set_by_month_day(rec_type, i_incidence->recurrence);
- recurrence_set_by_month(rec_type, i_incidence->recurrence);
+ 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);
- break;
- case I_REC_CYCLE_YEARLY_WEEKDAY:
- recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
- recurrence_set_by_set_pos(rec_type, i_incidence->recurrence);
- break;
- default:
- log_debug("\nError: Unknown recurrence Cycle.");
- break;
+ break;
+ case I_REC_CYCLE_YEARLY_YEARDAY:
+ recurrence_set_by_year_day(rec_type, i_incidence->recurrence);
+ break;
+ case I_REC_CYCLE_YEARLY_WEEKDAY:
+ recurrence_set_by_day(rec_type, i_incidence->recurrence->weekdays);
+ recurrence_set_by_set_pos(rec_type, i_incidence->recurrence);
+ break;
+ default:
+ log_debug("\nError: Unknown recurrence Cycle.");
+ break;
}
log_debug("\nFreq: %d", rec_type->freq);
@@ -495,18 +495,18 @@ static icalparameter_partstat
incidence_status_i_to_e (Incidence_status status)
{
switch (status) {
- case I_INC_STATUS_NONE:
- return ICAL_PARTSTAT_NEEDSACTION;
- case I_INC_STATUS_TENTATIVE:
- return ICAL_PARTSTAT_TENTATIVE;
- case I_INC_STATUS_ACCEPTED:
- return ICAL_PARTSTAT_ACCEPTED;
- case I_INC_STATUS_DECLINED:
- return ICAL_PARTSTAT_DECLINED;
- case I_INC_STATUS_DELEGATED:
- return ICAL_PARTSTAT_DELEGATED;
- default:
- return ICAL_PARTSTAT_NEEDSACTION;
+ case I_INC_STATUS_NONE:
+ return ICAL_PARTSTAT_NEEDSACTION;
+ case I_INC_STATUS_TENTATIVE:
+ return ICAL_PARTSTAT_TENTATIVE;
+ case I_INC_STATUS_ACCEPTED:
+ return ICAL_PARTSTAT_ACCEPTED;
+ case I_INC_STATUS_DECLINED:
+ return ICAL_PARTSTAT_DECLINED;
+ case I_INC_STATUS_DELEGATED:
+ return ICAL_PARTSTAT_DELEGATED;
+ default:
+ return ICAL_PARTSTAT_NEEDSACTION;
}
}
@@ -517,18 +517,18 @@ static icalparameter_cutype
incidence_cutype_i_to_e (Incidence_cutype status)
{
switch (status) {
- case I_INC_CUTYPE_INDIVIDUAL:
- return ICAL_CUTYPE_INDIVIDUAL;
- case I_INC_CUTYPE_GROUP:
- return ICAL_CUTYPE_GROUP;
- case I_INC_CUTYPE_RESOURCE:
- return ICAL_CUTYPE_RESOURCE;
- case I_INC_CUTYPE_ROOM:
- return ICAL_CUTYPE_ROOM;
- case I_INC_CUTYPE_UNDEFINED:
- return ICAL_CUTYPE_UNKNOWN;
- default:
- return ICAL_CUTYPE_UNKNOWN;
+ case I_INC_CUTYPE_INDIVIDUAL:
+ return ICAL_CUTYPE_INDIVIDUAL;
+ case I_INC_CUTYPE_GROUP:
+ return ICAL_CUTYPE_GROUP;
+ case I_INC_CUTYPE_RESOURCE:
+ return ICAL_CUTYPE_RESOURCE;
+ case I_INC_CUTYPE_ROOM:
+ return ICAL_CUTYPE_ROOM;
+ case I_INC_CUTYPE_UNDEFINED:
+ return ICAL_CUTYPE_UNKNOWN;
+ default:
+ return ICAL_CUTYPE_UNKNOWN;
}
}
@@ -539,14 +539,14 @@ static icalparameter_role
incidence_role_i_to_e (Incidence_role role)
{
switch (role) {
- case I_INC_ROLE_REQUIRED:
- return ICAL_ROLE_REQPARTICIPANT;
- case I_INC_ROLE_OPTIONAL:
- return ICAL_ROLE_OPTPARTICIPANT;
- case I_INC_ROLE_RESOURCE:
- return ICAL_ROLE_NONPARTICIPANT;
- default:
- return ICAL_ROLE_REQPARTICIPANT;
+ case I_INC_ROLE_REQUIRED:
+ return ICAL_ROLE_REQPARTICIPANT;
+ case I_INC_ROLE_OPTIONAL:
+ return ICAL_ROLE_OPTPARTICIPANT;
+ case I_INC_ROLE_RESOURCE:
+ return ICAL_ROLE_NONPARTICIPANT;
+ default:
+ return ICAL_ROLE_REQPARTICIPANT;
}
}
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 a31221d..2e1b08f 100644
--- a/src/libekolabconv/main/src/evolution/task-e-to-i.c
+++ b/src/libekolabconv/main/src/evolution/task-e-to-i.c
@@ -39,14 +39,14 @@ static Task_status
task_status_e_to_i (icalproperty_status i_cal_prop_stat)
{
switch (i_cal_prop_stat) {
- case ICAL_STATUS_INPROCESS:
- return I_TASK_IN_PROGRESS;
- case ICAL_STATUS_COMPLETED:
- return I_TASK_COMPLETED;
- case ICAL_STATUS_CANCELLED:
- return I_TASK_NOT_STARTED;
- default:
- return I_TASK_NOT_STARTED;
+ case ICAL_STATUS_INPROCESS:
+ return I_TASK_IN_PROGRESS;
+ case ICAL_STATUS_COMPLETED:
+ return I_TASK_COMPLETED;
+ case ICAL_STATUS_CANCELLED:
+ return I_TASK_NOT_STARTED;
+ default:
+ return I_TASK_NOT_STARTED;
}
}
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 d98fa80..1f067b1 100644
--- a/src/libekolabconv/main/src/evolution/task-i-to-e.c
+++ b/src/libekolabconv/main/src/evolution/task-i-to-e.c
@@ -38,18 +38,18 @@ static icalproperty_status
task_status_i_to_e (Task_status ical_status)
{
switch (ical_status) {
- case I_TASK_NOT_STARTED:
- return ICAL_STATUS_NONE;
- case I_TASK_IN_PROGRESS:
- return ICAL_STATUS_INPROCESS;
- case I_TASK_COMPLETED:
- return ICAL_STATUS_COMPLETED;
- case I_TASK_WAITING_ON_SOMEONE_ELSE:
- return ICAL_STATUS_NONE;
- case I_TASK_DEFERRED:
- return ICAL_STATUS_NONE;
- default:
- return ICAL_STATUS_NONE;
+ case I_TASK_NOT_STARTED:
+ return ICAL_STATUS_NONE;
+ case I_TASK_IN_PROGRESS:
+ return ICAL_STATUS_INPROCESS;
+ case I_TASK_COMPLETED:
+ return ICAL_STATUS_COMPLETED;
+ case I_TASK_WAITING_ON_SOMEONE_ELSE:
+ return ICAL_STATUS_NONE;
+ case I_TASK_DEFERRED:
+ return ICAL_STATUS_NONE;
+ default:
+ return ICAL_STATUS_NONE;
}
}
diff --git a/src/libekolabconv/main/src/kolab-conv.c b/src/libekolabconv/main/src/kolab-conv.c
index 1439ef8..9b2a5ff 100644
--- a/src/libekolabconv/main/src/kolab-conv.c
+++ b/src/libekolabconv/main/src/kolab-conv.c
@@ -121,20 +121,20 @@ kolabconv_cal_util_freebusy_new_fb_url (const gchar *servername,
protocol = "http";
switch (listtype) {
- case KOLABCONV_FB_TYPE_TRIGGER:
- res_name = g_strconcat ("trigger/", username, "/Calendar.pfb", NULL);
- break;
- case KOLABCONV_FB_TYPE_IFB:
- res_name = g_strconcat (username, ".ifb", NULL);
- break;
- case KOLABCONV_FB_TYPE_VFB:
- res_name = g_strconcat (username, ".vfb", NULL);
- break;
- case KOLABCONV_FB_TYPE_XFB:
- res_name = g_strconcat (username, ".xfb", NULL);
- break;
- default:
- g_error ("kolabconv_cal_util_freebusy_new_fb_url: invalid listtype");
+ case KOLABCONV_FB_TYPE_TRIGGER:
+ res_name = g_strconcat ("trigger/", username, "/Calendar.pfb", NULL);
+ break;
+ case KOLABCONV_FB_TYPE_IFB:
+ res_name = g_strconcat (username, ".ifb", NULL);
+ break;
+ case KOLABCONV_FB_TYPE_VFB:
+ res_name = g_strconcat (username, ".vfb", NULL);
+ break;
+ case KOLABCONV_FB_TYPE_XFB:
+ res_name = g_strconcat (username, ".xfb", NULL);
+ break;
+ default:
+ g_error ("kolabconv_cal_util_freebusy_new_fb_url: invalid listtype");
};
url_string = g_strconcat (protocol, "://", servername, "/freebusy/", res_name, NULL);
@@ -180,8 +180,8 @@ kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (const gchar *ics_string,
} else {
g_debug ("kolabconv_cal_util_fb_new_ecalcomp_from_request: empty server response");
g_set_error (err,
- KOLABCONV_ERROR_READ_KOLAB,
- KOLABCONV_ERROR_READ_KOLAB_INPUT_IS_NULL, /* appropriate? */
+ KOLABCONV_ERROR_READ_KOLAB,
+ KOLABCONV_ERROR_READ_KOLAB_INPUT_IS_NULL, /* appropriate? */
_("Empty server response"));
goto CLEANUP;
}
@@ -191,8 +191,8 @@ kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (const gchar *ics_string,
} else {
g_debug ("kolabconv_cal_util_fb_new_ecalcomp_from_request: cannot parse server response");
g_set_error (err,
- KOLABCONV_ERROR_READ_KOLAB,
- KOLABCONV_ERROR_READ_KOLAB_MALFORMED_XML, /* appropriate? */
+ KOLABCONV_ERROR_READ_KOLAB,
+ KOLABCONV_ERROR_READ_KOLAB_MALFORMED_XML, /* appropriate? */
_("Cannot parse server response"));
goto CLEANUP;
}
@@ -217,12 +217,12 @@ kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (const gchar *ics_string,
} else {
g_debug ("kolabconv_cal_util_fb_new_ecalcomp_from_request: missing component part");
g_set_error (err,
- KOLABCONV_ERROR_READ_KOLAB,
- KOLABCONV_ERROR_READ_KOLAB_MISSING_XML_PART, /* appropriate? */
+ KOLABCONV_ERROR_READ_KOLAB,
+ KOLABCONV_ERROR_READ_KOLAB_MISSING_XML_PART, /* appropriate? */
_("Unsupported component type"));
}
-CLEANUP:
+ CLEANUP:
if (icalcomp_vfb != NULL)
icalcomponent_free (icalcomp_vfb);
if (icalcomp_ics != NULL)
diff --git a/src/libekolabconv/main/src/kolab-conv.h b/src/libekolabconv/main/src/kolab-conv.h
index 337cf7b..af6b161 100644
--- a/src/libekolabconv/main/src/kolab-conv.h
+++ b/src/libekolabconv/main/src/kolab-conv.h
@@ -158,11 +158,10 @@ Kolab_conv_mail* kolabconv_enote_to_knote (const ECalComponentWithTZ*, GError**)
/* functions for the handling of free/busy URLs */
gchar* kolabconv_cal_util_freebusy_new_fb_url (const gchar *servername,
- const gchar *username, gboolean use_ssl,
- Kolab_conv_freebusy_type listtype);
+ const gchar *username, gboolean use_ssl,
+ Kolab_conv_freebusy_type listtype);
-ECalComponent* kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (
- const gchar *ics_string, gint nbytes, GError **err);
+ECalComponent* kolabconv_cal_util_freebusy_ecalcomp_new_from_ics (const gchar *ics_string, gint nbytes, GError **err);
/* functions to free data structures */
void kolabconv_free_econtact(EContact *econtact);
@@ -172,5 +171,3 @@ void kolabconv_free_kmail(Kolab_conv_mail *kmail);
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 331c429..e149cd4 100644
--- a/src/libekolabconv/main/src/kolab/contact-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/contact-i-to-k.c
@@ -194,28 +194,24 @@ i_contact_to_xml (const I_contact* i_contact)
while (iterator != NULL) {
Phone_number *phone_nr = ((Phone_number *) iterator->data);
Phone_number *phone_nr_next = NULL;
- if (iterator->next != NULL)
- {
+ if (iterator->next != NULL) {
phone_nr_next = ((Phone_number *) iterator->next->data);
}
- if (phone_nr_next != NULL)
- {
+ if (phone_nr_next != NULL) {
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. */
- {
- if (phone_nr->type == ICONTACT_PHONE_BUSINESS_1)
+ && 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->type = ICONTACT_PHONE_BUSINESS_2; /* business 2 = business 1 + primary */
- iterator = iterator->next; /* -primary */
+ if (phone_nr->type == ICONTACT_PHONE_BUSINESS_1) {
+ 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 */
+ }
}
- 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 */
- }
- }
}
node = add_child_node (root_node, KLB_CNT_PHONE_LIST, NULL);
@@ -256,7 +252,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)
@@ -267,7 +263,7 @@ i_contact_to_xml (const I_contact* i_contact)
add_child_node (node, KLB_CNT_ADDRESS_REGION, address->region->str);
if (address->postal_code)
add_child_node (node, KLB_CNT_ADDRESS_POSTAL_CODE,
- address->postal_code->str);
+ address->postal_code->str);
if (address->country)
add_child_node (node, KLB_CNT_ADDRESS_COUNTRY, address->country->str);
@@ -279,7 +275,7 @@ i_contact_to_xml (const I_contact* i_contact)
/* GEO */
if (i_contact->latitude >= -90 && i_contact->latitude <= 90
- && i_contact->longitude >= -180 && i_contact->longitude <= 180) {
+ && i_contact->longitude >= -180 && i_contact->longitude <= 180) {
gchar *lat = g_strdup_printf("%.16f", i_contact->latitude);
gchar *lon = NULL;
add_child_node(root_node, KLB_CNT_LATITUDE, lat);
@@ -332,13 +328,13 @@ static gchar*
address_type_i_to_k(Icontact_address_type I_addr_type)
{
switch (I_addr_type) {
- case ICONTACT_ADDR_TYPE_HOME:
- return KLB_CNT_ADDRESS_TYPE_HOME;
- case ICONTACT_ADDR_TYPE_BUSINESS:
- return KLB_CNT_ADDRESS_TYPE_BUSINESS;
- case ICONTACT_ADDR_TYPE_OTHER:
- default:
- return KLB_CNT_ADDRESS_TYPE_OTHER;
+ case ICONTACT_ADDR_TYPE_HOME:
+ return KLB_CNT_ADDRESS_TYPE_HOME;
+ case ICONTACT_ADDR_TYPE_BUSINESS:
+ return KLB_CNT_ADDRESS_TYPE_BUSINESS;
+ case ICONTACT_ADDR_TYPE_OTHER:
+ default:
+ return KLB_CNT_ADDRESS_TYPE_OTHER;
}
}
@@ -350,45 +346,43 @@ static gchar*
phone_type_i_to_k(Icontact_phone_type i_phone_type)
{
switch(i_phone_type) {
- case ICONTACT_PHONE_ASSISTANT:
- return KLB_CNT_PHONE_TYPE_ASSISTANT;
- case ICONTACT_PHONE_BUSINESS_1:
- return KLB_CNT_PHONE_TYPE_BUSINESS_1;
- case ICONTACT_PHONE_BUSINESS_2:
- return KLB_CNT_PHONE_TYPE_BUSINESS_2;
- case ICONTACT_PHONE_BUSINESS_FAX:
- return KLB_CNT_PHONE_TYPE_BUSINESS_FAX;
- case ICONTACT_PHONE_CALLBACK:
- return KLB_CNT_PHONE_TYPE_CALLBACK;
- case ICONTACT_PHONE_CAR:
- return KLB_CNT_PHONE_TYPE_CAR;
- case ICONTACT_PHONE_COMPANY:
- return KLB_CNT_PHONE_TYPE_COMPANY;
- case ICONTACT_PHONE_HOME_1:
- return KLB_CNT_PHONE_TYPE_HOME_1;
- case ICONTACT_PHONE_HOME_2:
- return KLB_CNT_PHONE_TYPE_HOME_2;
- case ICONTACT_PHONE_HOME_FAX:
- return KLB_CNT_PHONE_TYPE_HOME_FAX;
- case ICONTACT_PHONE_ISDN:
- return KLB_CNT_PHONE_TYPE_ISDN;
- case ICONTACT_PHONE_MOBILE:
- return KLB_CNT_PHONE_TYPE_MOBILE;
- case ICONTACT_PHONE_OTHER:
- return KLB_CNT_PHONE_TYPE_OTHER;
- case ICONTACT_PHONE_PAGER:
- return KLB_CNT_PHONE_TYPE_PAGER;
- case ICONTACT_PHONE_PRIMARY:
- return KLB_CNT_PHONE_TYPE_PRIMARY;
- case ICONTACT_PHONE_RADIO:
- return KLB_CNT_PHONE_TYPE_RADIO;
- case ICONTACT_PHONE_TELEX:
- return KLB_CNT_PHONE_TYPE_TELEX;
- case ICONTACT_PHONE_TTYTDD:
- return KLB_CNT_PHONE_TYPE_TTYTDD;
- default:
- return KLB_CNT_PHONE_TYPE_PRIMARY;
+ case ICONTACT_PHONE_ASSISTANT:
+ return KLB_CNT_PHONE_TYPE_ASSISTANT;
+ case ICONTACT_PHONE_BUSINESS_1:
+ return KLB_CNT_PHONE_TYPE_BUSINESS_1;
+ case ICONTACT_PHONE_BUSINESS_2:
+ return KLB_CNT_PHONE_TYPE_BUSINESS_2;
+ case ICONTACT_PHONE_BUSINESS_FAX:
+ return KLB_CNT_PHONE_TYPE_BUSINESS_FAX;
+ case ICONTACT_PHONE_CALLBACK:
+ return KLB_CNT_PHONE_TYPE_CALLBACK;
+ case ICONTACT_PHONE_CAR:
+ return KLB_CNT_PHONE_TYPE_CAR;
+ case ICONTACT_PHONE_COMPANY:
+ return KLB_CNT_PHONE_TYPE_COMPANY;
+ case ICONTACT_PHONE_HOME_1:
+ return KLB_CNT_PHONE_TYPE_HOME_1;
+ case ICONTACT_PHONE_HOME_2:
+ return KLB_CNT_PHONE_TYPE_HOME_2;
+ case ICONTACT_PHONE_HOME_FAX:
+ return KLB_CNT_PHONE_TYPE_HOME_FAX;
+ case ICONTACT_PHONE_ISDN:
+ return KLB_CNT_PHONE_TYPE_ISDN;
+ case ICONTACT_PHONE_MOBILE:
+ return KLB_CNT_PHONE_TYPE_MOBILE;
+ case ICONTACT_PHONE_OTHER:
+ return KLB_CNT_PHONE_TYPE_OTHER;
+ case ICONTACT_PHONE_PAGER:
+ return KLB_CNT_PHONE_TYPE_PAGER;
+ case ICONTACT_PHONE_PRIMARY:
+ return KLB_CNT_PHONE_TYPE_PRIMARY;
+ case ICONTACT_PHONE_RADIO:
+ return KLB_CNT_PHONE_TYPE_RADIO;
+ case ICONTACT_PHONE_TELEX:
+ return KLB_CNT_PHONE_TYPE_TELEX;
+ case ICONTACT_PHONE_TTYTDD:
+ return KLB_CNT_PHONE_TYPE_TTYTDD;
+ default:
+ return KLB_CNT_PHONE_TYPE_PRIMARY;
}
}
-
-
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 9fa86b0..815165c 100644
--- a/src/libekolabconv/main/src/kolab/contact-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/contact-k-to-i.c
@@ -91,7 +91,7 @@ conv_kolab_conv_mail_to_I_contact (const Kolab_conv_mail* k_contact, GError** er
/* find root node */
for (n_ptr = doc->children; n_ptr != NULL; n_ptr = n_ptr->next)
if (n_ptr->type == XML_ELEMENT_NODE &&
- g_strcmp0((gchar*)n_ptr->name, KLB_CNT) == 0)
+ g_strcmp0((gchar*)n_ptr->name, KLB_CNT) == 0)
node = n_ptr;
if (node == NULL) {
g_set_error (error, KOLABCONV_ERROR_READ_KOLAB,
@@ -180,7 +180,7 @@ process_attachments_k_to_i (I_contact* i_contact, GError** error)
i_contact->photo = mail_part;
i_contact->common->kolab_attachment_store =
- g_list_remove(i_contact->common->kolab_attachment_store, (gconstpointer) mail_part);
+ g_list_remove(i_contact->common->kolab_attachment_store, (gconstpointer) mail_part);
} else
i_contact->photo = NULL;
@@ -433,9 +433,9 @@ handle_element_email (I_contact *i_contact, const xmlNodePtr node)
child = text->next;
child_contents = child->children;
- if (strcmp ((gchar *) child->name, KLB_CNT_EMAIL_SMTP_ADDRESS) == 0)
+ if (strcmp ((gchar *) child->name, KLB_CNT_EMAIL_SMTP_ADDRESS) == 0)
email->smtp_address = g_string_new ((gchar *) child_contents->content);
- else
+ else
i_kolab_store_add_xml_element(i_contact->common, email, child);
text = child->next;
@@ -502,9 +502,7 @@ handle_element_address (I_contact *i_contact, const xmlNodePtr node)
/* 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
- {
+ } else {
i_contact->addresses = g_list_append (i_contact->addresses, (Address *) address);
return TRUE;
}
@@ -528,15 +526,13 @@ handle_contact_name (I_contact *i_contact, xmlNodePtr node)
/* iterate over all child elements of node an process them */
for (n_ptr = node->children; n_ptr != NULL; n_ptr = n_ptr->next) {
if (n_ptr->type == XML_ELEMENT_NODE) {
- if(
- handle_element_string(KLB_CNT_NAME_GIVEN_NAME, &i_contact->given_name, n_ptr) ||
- 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> ?!!! */
- handle_element_string(KLB_CNT_NAME_PREFIX, &i_contact->prefix, n_ptr) ||
- handle_element_string(KLB_CNT_NAME_SUFFIX, &i_contact->suffix, n_ptr)
- )
+ if (handle_element_string(KLB_CNT_NAME_GIVEN_NAME, &i_contact->given_name, n_ptr) ||
+ 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> ?!!! */
+ handle_element_string(KLB_CNT_NAME_PREFIX, &i_contact->prefix, n_ptr) ||
+ handle_element_string(KLB_CNT_NAME_SUFFIX, &i_contact->suffix, n_ptr))
continue;
i_kolab_store_add_xml_element(i_contact->common, (gpointer) KOLAB_STORE_PTR_CONTACT_NAME, 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 83f8ec6..bae6700 100644
--- a/src/libekolabconv/main/src/kolab/event-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/event-i-to-k.c
@@ -128,19 +128,19 @@ static gchar*
show_time_as_to_kolab_string (Show_time_as show_time_as)
{
switch (show_time_as) {
- case SHOW_TIME_AS_FREE:
- 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; */
- 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; */
- break;
- default:
- return KLB_EVENT_SHOW_TIME_AS_BUSY;
+ case SHOW_TIME_AS_FREE:
+ 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; */
+ 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; */
+ 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 c3c4e74..e120a15 100644
--- a/src/libekolabconv/main/src/kolab/event-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/event-k-to-i.c
@@ -131,16 +131,16 @@ read_event(I_event *ievent, xmlNodePtr node, GError **error)
return;
if (!node_processed)
i_kolab_store_add_xml_element(ievent->incidence->common,
- ievent->incidence->common, n_ptr);
+ ievent->incidence->common, n_ptr);
} else
log_debug("ignored XML node with name %s", n_ptr->name);
}
/* cannot be properly converted back from evolution, therefore => kolabstore */
if (ievent->incidence
- && ievent->incidence->recurrence
- && !ievent->incidence->start_date
- && ievent->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY) {
+ && ievent->incidence->recurrence
+ && !ievent->incidence->start_date
+ && ievent->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY) {
g_free(ievent->incidence->recurrence);
ievent->incidence->recurrence = NULL;
diff --git a/src/libekolabconv/main/src/kolab/kolab-util.c b/src/libekolabconv/main/src/kolab/kolab-util.c
index 5a2d27b..3720ca8 100644
--- a/src/libekolabconv/main/src/kolab/kolab-util.c
+++ b/src/libekolabconv/main/src/kolab/kolab-util.c
@@ -126,12 +126,12 @@ datetime_to_string (const time_t *time, gchar *date_string)
timeinfo = gmtime (time);
sprintf (date_string, "%04d-%02d-%02dT%02d:%02d:%02dZ",
- timeinfo->tm_year + 1900,
- timeinfo->tm_mon + 1,
- timeinfo->tm_mday,
- timeinfo->tm_hour,
- timeinfo->tm_min,
- timeinfo->tm_sec);
+ timeinfo->tm_year + 1900,
+ timeinfo->tm_mon + 1,
+ timeinfo->tm_mday,
+ timeinfo->tm_hour,
+ timeinfo->tm_min,
+ timeinfo->tm_sec);
g_debug ("**** date_or_datetime_to_string() dateString: %s", date_string);
}
@@ -416,7 +416,7 @@ handle_element_date_or_datetime (gchar* name, Date_or_datetime** store, xmlNodeP
/* convert string to 'struct tm' */
if (value[10] == 'T') /* remove 'T' in iso timestamp if neccessary */
- value[10] = ' ';
+ value[10] = ' ';
strptime(value, "%Y-%m-%d %H:%M:%S", &t); /* string to tm */
@@ -612,12 +612,12 @@ format_utc_offset (gint utc_offset, gchar *buffer)
seconds = utc_offset % 60;
/* Sanity check. Standard timezone offsets shouldn't be much more than 12
- hours, and daylight saving shouldn't change it by more than a few hours.
- (The maximum offset is 15 hours 56 minutes at present.) */
+ hours, and daylight saving shouldn't change it by more than a few hours.
+ (The maximum offset is 15 hours 56 minutes at present.) */
if (hours < 0 || hours >= 24 || minutes < 0 || minutes >= 60 || seconds < 0 || seconds
- >= 60) {
+ >= 60) {
log_warn ("Warning: Strange timezone offset: H:%i M:%i S:%i\n", hours,
- minutes, seconds);
+ minutes, seconds);
}
if (seconds == 0)
snprintf (buffer, 8, "%s%02i%02i", sign, hours, minutes);
@@ -634,10 +634,10 @@ void
k_write_datetime(struct tm *in, gchar *out, gboolean is_utc)
{
sprintf(out, is_utc ?
- "%02d-%02d-%04dT%02d:%02d:%02dZ" :
- "%02d-%02d-%04dT%02d:%02d:%02d",
- in->tm_mday, in->tm_mon, in->tm_year,
- in->tm_hour, in->tm_min, in->tm_sec);
+ "%02d-%02d-%04dT%02d:%02d:%02dZ" :
+ "%02d-%02d-%04dT%02d:%02d:%02d",
+ in->tm_mday, in->tm_mon, in->tm_year,
+ in->tm_hour, in->tm_min, in->tm_sec);
}
/**
@@ -646,12 +646,12 @@ k_write_datetime(struct tm *in, gchar *out, gboolean is_utc)
gint priority_k_to_xkcal(gint k_prio)
{
switch (k_prio) {
- case 1: return 1;
- case 2: return 3;
- case 3: return 5;
- case 4: return 7;
- case 5: return 9;
- default: return 0;
+ case 1: return 1;
+ case 2: return 3;
+ case 3: return 5;
+ case 4: return 7;
+ case 5: return 9;
+ default: return 0;
}
}
@@ -660,16 +660,16 @@ gint priority_k_to_xkcal(gint k_prio)
*/
gint priority_xkcal_to_k(gint xkcal_prio) {
switch (xkcal_prio) {
- case 0: return 3;
- case 1: return 1;
- case 2: return 1;
- case 3: return 2;
- case 4: return 2;
- case 5: return 3;
- case 6: return 3;
- case 7: return 4;
- case 8: return 4;
- case 9: return 5;
- default: return 3;
+ case 0: return 3;
+ case 1: return 1;
+ case 2: return 1;
+ case 3: return 2;
+ case 4: return 2;
+ case 5: return 3;
+ case 6: return 3;
+ case 7: return 4;
+ case 8: return 4;
+ case 9: return 5;
+ default: return 3;
}
}
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 5228f0d..c20ad1a 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
@@ -40,16 +40,16 @@ static char*
sensitivity_i_to_k (Sensitivity sensitivity)
{
switch (sensitivity) {
- case ICOMMON_SENSITIVITY_PUBLIC:
- return KLB_CMN_SENSITIVITY_PUBLIC;
- case ICOMMON_SENSITIVITY_PRIVATE:
- return KLB_CMN_SENSITIVITY_PRIVATE;
- 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 */
- default:
- return KLB_CMN_SENSITIVITY_PUBLIC; /* default value */
+ case ICOMMON_SENSITIVITY_PUBLIC:
+ return KLB_CMN_SENSITIVITY_PUBLIC;
+ case ICOMMON_SENSITIVITY_PRIVATE:
+ return KLB_CMN_SENSITIVITY_PRIVATE;
+ 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 */
+ default:
+ return KLB_CMN_SENSITIVITY_PUBLIC; /* default value */
}
}
@@ -61,32 +61,32 @@ char*
recurrence_month_i_to_k (Month month)
{
switch (month) {
- case I_COMMON_JAN:
- return KLB_INC_RCR_MONTH_JAN;
- case I_COMMON_FEB:
- return KLB_INC_RCR_MONTH_FEB;
- case I_COMMON_MAR:
- return KLB_INC_RCR_MONTH_MAR;
- case I_COMMON_APR:
- return KLB_INC_RCR_MONTH_APR;
- case I_COMMON_MAY:
- return KLB_INC_RCR_MONTH_MAY;
- case I_COMMON_JUN:
- return KLB_INC_RCR_MONTH_JUN;
- case I_COMMON_JUL:
- return KLB_INC_RCR_MONTH_JUL;
- case I_COMMON_AUG:
- return KLB_INC_RCR_MONTH_AUG;
- case I_COMMON_SEP:
- return KLB_INC_RCR_MONTH_SEP;
- case I_COMMON_OCT:
- return KLB_INC_RCR_MONTH_OCT;
- case I_COMMON_NOV:
- return KLB_INC_RCR_MONTH_NOV;
- case I_COMMON_DEC:
- return KLB_INC_RCR_MONTH_DEC;
- default:
- g_assert_not_reached();
+ case I_COMMON_JAN:
+ return KLB_INC_RCR_MONTH_JAN;
+ case I_COMMON_FEB:
+ return KLB_INC_RCR_MONTH_FEB;
+ case I_COMMON_MAR:
+ return KLB_INC_RCR_MONTH_MAR;
+ case I_COMMON_APR:
+ return KLB_INC_RCR_MONTH_APR;
+ case I_COMMON_MAY:
+ return KLB_INC_RCR_MONTH_MAY;
+ case I_COMMON_JUN:
+ return KLB_INC_RCR_MONTH_JUN;
+ case I_COMMON_JUL:
+ return KLB_INC_RCR_MONTH_JUL;
+ case I_COMMON_AUG:
+ return KLB_INC_RCR_MONTH_AUG;
+ case I_COMMON_SEP:
+ return KLB_INC_RCR_MONTH_SEP;
+ case I_COMMON_OCT:
+ return KLB_INC_RCR_MONTH_OCT;
+ case I_COMMON_NOV:
+ return KLB_INC_RCR_MONTH_NOV;
+ case I_COMMON_DEC:
+ return KLB_INC_RCR_MONTH_DEC;
+ default:
+ g_assert_not_reached();
}
}
@@ -97,22 +97,22 @@ char*
recurrence_weekday_i_to_k(Week_day weekday)
{
switch (weekday) {
- case I_COMMON_MONDAY:
- return KLB_INC_RCR_DAY_MONDAY;
- case I_COMMON_TUESDAY:
- return KLB_INC_RCR_DAY_TUESDAY;
- case I_COMMON_WEDNESDAY:
- return KLB_INC_RCR_DAY_WEDNESDAY;
- case I_COMMON_THURSDAY:
- return KLB_INC_RCR_DAY_THURSDAY;
- case I_COMMON_FRIDAY:
- return KLB_INC_RCR_DAY_FRIDAY;
- case I_COMMON_SATURDAY:
- return KLB_INC_RCR_DAY_SATURDAY;
- case I_COMMON_SUNDAY:
- return KLB_INC_RCR_DAY_SUNDAY;
- default:
- g_assert_not_reached();
+ case I_COMMON_MONDAY:
+ return KLB_INC_RCR_DAY_MONDAY;
+ case I_COMMON_TUESDAY:
+ return KLB_INC_RCR_DAY_TUESDAY;
+ case I_COMMON_WEDNESDAY:
+ return KLB_INC_RCR_DAY_WEDNESDAY;
+ case I_COMMON_THURSDAY:
+ return KLB_INC_RCR_DAY_THURSDAY;
+ case I_COMMON_FRIDAY:
+ return KLB_INC_RCR_DAY_FRIDAY;
+ case I_COMMON_SATURDAY:
+ return KLB_INC_RCR_DAY_SATURDAY;
+ case I_COMMON_SUNDAY:
+ return KLB_INC_RCR_DAY_SUNDAY;
+ default:
+ g_assert_not_reached();
}
}
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 d99cc88..dac256c 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
@@ -89,24 +89,24 @@ 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 */
- {
- /* 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. */
- xmlUnlinkNode(node);
- xmlFreeNode(node);
- }
- g_free(node_content);
- } else {
+ && 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)); */
+ 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. */
+ xmlUnlinkNode(node);
+ xmlFreeNode(node);
+ }
+ g_free(node_content);
+ } else {
/* advanced alarm */
xmlNodePtr element_node;
element_node = add_child_node(node, KLB_INC_ALARM, NULL);
@@ -226,24 +226,24 @@ conv_incidence_i_to_k(xmlNodePtr root_node, I_incidence *i_incidence)
add_child_node(node, KLB_INC_ATTENDEE_STATUS, incidence_status_i_to_k(attendee->status));
switch (attendee->cutype) {
- case I_INC_CUTYPE_INDIVIDUAL:
- add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_INDIVIDUAL);
- break;
- case I_INC_CUTYPE_GROUP:
- add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_GROUP);
- break;
- case I_INC_CUTYPE_RESOURCE:
- add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_RESOURCE);
- break;
- case I_INC_CUTYPE_ROOM:
- add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_ROOM);
- break;
- case I_INC_CUTYPE_UNDEFINED:
- /* nothing to do (default case) */
- break;
- default:
- g_assert(FALSE);
- break;
+ case I_INC_CUTYPE_INDIVIDUAL:
+ add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_INDIVIDUAL);
+ break;
+ case I_INC_CUTYPE_GROUP:
+ add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_GROUP);
+ break;
+ case I_INC_CUTYPE_RESOURCE:
+ add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_RESOURCE);
+ break;
+ case I_INC_CUTYPE_ROOM:
+ add_child_node(node, KLBC_INCIDENCE_ATTENDEE_TYPE, KLBC_INCIDENCE_ATTENDEE_TYPE_ROOM);
+ break;
+ case I_INC_CUTYPE_UNDEFINED:
+ /* nothing to do (default case) */
+ break;
+ default:
+ g_assert(FALSE);
+ break;
}
i_kolab_store_get_xml_nodes(i_incidence->common, attendee, node);
@@ -266,16 +266,16 @@ static gchar*
alarm_type_i_to_k (Alarm_type alarm_type)
{
switch (alarm_type) {
- case I_ALARM_TYPE_DISPLAY:
- return KLBX_INC_ADV_ALARM_TYPE_DISPLAY;
- case I_ALARM_TYPE_AUDIO:
- return KLBX_INC_ADV_ALARM_TYPE_AUDIO;
- case I_ALARM_TYPE_PROCEDURE:
- return KLBX_INC_ADV_ALARM_TYPE_PROCEDURE;
- case I_ALARM_TYPE_EMAIL:
- return KLBX_INC_ADV_ALARM_TYPE_EMAIL;
- default:
- return KLBX_INC_ADV_ALARM_TYPE_DISPLAY;
+ case I_ALARM_TYPE_DISPLAY:
+ return KLBX_INC_ADV_ALARM_TYPE_DISPLAY;
+ case I_ALARM_TYPE_AUDIO:
+ return KLBX_INC_ADV_ALARM_TYPE_AUDIO;
+ case I_ALARM_TYPE_PROCEDURE:
+ return KLBX_INC_ADV_ALARM_TYPE_PROCEDURE;
+ case I_ALARM_TYPE_EMAIL:
+ return KLBX_INC_ADV_ALARM_TYPE_EMAIL;
+ default:
+ return KLBX_INC_ADV_ALARM_TYPE_DISPLAY;
}
}
@@ -291,14 +291,14 @@ static gchar*
incidence_role_i_to_k (Incidence_role role)
{
switch (role) {
- case I_INC_ROLE_REQUIRED:
- return KLB_INC_ATTENDEE_ROLE_REQUIRED;
- case I_INC_ROLE_OPTIONAL:
- return KLB_INC_ATTENDEE_ROLE_OPTIONAL;
- case I_INC_ROLE_RESOURCE:
- return KLB_INC_ATTENDEE_ROLE_RESOURCE;
- default:
- return KLB_INC_ATTENDEE_ROLE_REQUIRED;
+ case I_INC_ROLE_REQUIRED:
+ return KLB_INC_ATTENDEE_ROLE_REQUIRED;
+ case I_INC_ROLE_OPTIONAL:
+ return KLB_INC_ATTENDEE_ROLE_OPTIONAL;
+ case I_INC_ROLE_RESOURCE:
+ return KLB_INC_ATTENDEE_ROLE_RESOURCE;
+ default:
+ return KLB_INC_ATTENDEE_ROLE_REQUIRED;
}
}
@@ -314,18 +314,18 @@ static gchar*
incidence_status_i_to_k (Incidence_status status)
{
switch (status) {
- case I_INC_STATUS_NONE:
- return KLB_INC_ATTENDEE_STATUS_NONE;
- case I_INC_STATUS_TENTATIVE:
- return KLB_INC_ATTENDEE_STATUS_TENTATIVE;
- case I_INC_STATUS_ACCEPTED:
- return KLB_INC_ATTENDEE_STATUS_ACCEPTED;
- case I_INC_STATUS_DECLINED:
- return KLB_INC_ATTENDEE_STATUS_DECLINED;
- case I_INC_STATUS_DELEGATED:
- return KLBX_INC_ATTENDEE_STATUS_DELEGATED;
- default:
- return "None";
+ case I_INC_STATUS_NONE:
+ return KLB_INC_ATTENDEE_STATUS_NONE;
+ case I_INC_STATUS_TENTATIVE:
+ return KLB_INC_ATTENDEE_STATUS_TENTATIVE;
+ case I_INC_STATUS_ACCEPTED:
+ return KLB_INC_ATTENDEE_STATUS_ACCEPTED;
+ case I_INC_STATUS_DECLINED:
+ return KLB_INC_ATTENDEE_STATUS_DECLINED;
+ case I_INC_STATUS_DELEGATED:
+ return KLBX_INC_ATTENDEE_STATUS_DELEGATED;
+ default:
+ return "None";
}
}
@@ -389,53 +389,53 @@ recurrence_i_to_k(const Recurrence *recurrence, xmlNodePtr node)
weekday_i_to_k(node, recurrence->weekdays);
switch (recurrence->recurrence_cycle) {
- case I_REC_CYCLE_DAILY:
- add_property(node, KLB_INC_RCR_CYCLE, "daily");
- break;
- case I_REC_CYCLE_WEEKLY:
- add_property(node, KLB_INC_RCR_CYCLE, "weekly");
- break;
- case I_REC_CYCLE_MONTHLY_DAYNUMBER:
- add_property(node, KLB_INC_RCR_CYCLE, "monthly");
- add_property(node, KLB_INC_RCR_CYCLETYPE, "daynumber");
- dnstr = g_strdup_printf ("%d", recurrence->day_number);
- add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
- g_free(dnstr);
- break;
- case I_REC_CYCLE_MONTHLY_WEEKDAY:
- add_property(node, KLB_INC_RCR_CYCLE, "monthly");
- add_property(node, KLB_INC_RCR_CYCLETYPE, "weekday");
- dnstr = g_strdup_printf ("%d", recurrence->day_number);
- add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
- g_free(dnstr);
- break;
- case I_REC_CYCLE_YEARLY_MONTHDAY:
- add_property(node, KLB_INC_RCR_CYCLE, "yearly");
- add_property(node, KLB_INC_RCR_CYCLETYPE, "monthday");
- dnstr = g_strdup_printf ("%d", recurrence->day_number);
- add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
- g_free(dnstr);
- monthStr = recurrence_month_i_to_k(recurrence->month);
- add_child_node(node, KLB_INC_RCR_MONTH, monthStr);
- break;
- case I_REC_CYCLE_YEARLY_YEARDAY:
- add_property(node, KLB_INC_RCR_CYCLE, "yearly");
- add_property(node, KLB_INC_RCR_CYCLETYPE, "yearday");
- dnstr = g_strdup_printf ("%d", recurrence->day_number);
- add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
- g_free(dnstr);
- break;
- case I_REC_CYCLE_YEARLY_WEEKDAY:
- add_property(node, KLB_INC_RCR_CYCLE, "yearly");
- add_property(node, KLB_INC_RCR_CYCLETYPE, "weekday");
- daynr_str = g_strdup_printf ("%d", recurrence->day_number);
- add_child_node(node, KLB_INC_RCR_DAYNUMBER, daynr_str);
- g_free(daynr_str);
- monthStr_ = recurrence_month_i_to_k(recurrence->month);
- add_child_node(node, KLB_INC_RCR_MONTH, monthStr_);
- break;
- default:
- log_debug("illegal recurrence cycle %d: ", recurrence->recurrence_cycle);
+ case I_REC_CYCLE_DAILY:
+ add_property(node, KLB_INC_RCR_CYCLE, "daily");
+ break;
+ case I_REC_CYCLE_WEEKLY:
+ add_property(node, KLB_INC_RCR_CYCLE, "weekly");
+ break;
+ case I_REC_CYCLE_MONTHLY_DAYNUMBER:
+ add_property(node, KLB_INC_RCR_CYCLE, "monthly");
+ add_property(node, KLB_INC_RCR_CYCLETYPE, "daynumber");
+ dnstr = g_strdup_printf ("%d", recurrence->day_number);
+ add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
+ g_free(dnstr);
+ break;
+ case I_REC_CYCLE_MONTHLY_WEEKDAY:
+ add_property(node, KLB_INC_RCR_CYCLE, "monthly");
+ add_property(node, KLB_INC_RCR_CYCLETYPE, "weekday");
+ dnstr = g_strdup_printf ("%d", recurrence->day_number);
+ add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
+ g_free(dnstr);
+ break;
+ case I_REC_CYCLE_YEARLY_MONTHDAY:
+ add_property(node, KLB_INC_RCR_CYCLE, "yearly");
+ add_property(node, KLB_INC_RCR_CYCLETYPE, "monthday");
+ dnstr = g_strdup_printf ("%d", recurrence->day_number);
+ add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
+ g_free(dnstr);
+ monthStr = recurrence_month_i_to_k(recurrence->month);
+ add_child_node(node, KLB_INC_RCR_MONTH, monthStr);
+ break;
+ case I_REC_CYCLE_YEARLY_YEARDAY:
+ add_property(node, KLB_INC_RCR_CYCLE, "yearly");
+ add_property(node, KLB_INC_RCR_CYCLETYPE, "yearday");
+ dnstr = g_strdup_printf ("%d", recurrence->day_number);
+ add_child_node(node, KLB_INC_RCR_DAYNUMBER, dnstr);
+ g_free(dnstr);
+ break;
+ case I_REC_CYCLE_YEARLY_WEEKDAY:
+ add_property(node, KLB_INC_RCR_CYCLE, "yearly");
+ add_property(node, KLB_INC_RCR_CYCLETYPE, "weekday");
+ daynr_str = g_strdup_printf ("%d", recurrence->day_number);
+ add_child_node(node, KLB_INC_RCR_DAYNUMBER, daynr_str);
+ g_free(daynr_str);
+ monthStr_ = recurrence_month_i_to_k(recurrence->month);
+ add_child_node(node, KLB_INC_RCR_MONTH, monthStr_);
+ break;
+ default:
+ log_debug("illegal recurrence cycle %d: ", recurrence->recurrence_cycle);
}
n_range = add_child_node(node, KLB_INC_RCR_RANGE, NULL);
@@ -462,4 +462,3 @@ recurrence_i_to_k(const Recurrence *recurrence, xmlNodePtr node)
exclusion_list = exclusion_list->next;
}
}
-
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 92a56a6..ac85914 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
@@ -240,7 +240,7 @@ static gboolean
handle_incidence_alarm(I_incidence *incidence, xmlNodePtr node)
{
if (strcmp ((gchar *) node->name, KLB_INC_ALARM) != 0)
- return FALSE;
+ return FALSE;
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"));
@@ -512,11 +512,11 @@ handle_incidence_recurrence (I_incidence *incidence, xmlNodePtr node)
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)
- || handle_element_integer(KLB_INC_RCR_DAYNUMBER, &incidence->recurrence->day_number, n)
- || handle_incidence_recurrence_exclusion(&incidence->recurrence->exclusion, n)
- || handle_element_integer(KLB_INC_RCR_INTERVAL, &incidence->recurrence->interval, n)
- || handle_incidence_recurrence_range(&incidence->recurrence->range_date, &incidence->recurrence->range_number, n)
- || handle_incidence_recurrence_month(&incidence->recurrence->month, n))
+ || handle_element_integer(KLB_INC_RCR_DAYNUMBER, &incidence->recurrence->day_number, n)
+ || handle_incidence_recurrence_exclusion(&incidence->recurrence->exclusion, n)
+ || handle_element_integer(KLB_INC_RCR_INTERVAL, &incidence->recurrence->interval, n)
+ || handle_incidence_recurrence_range(&incidence->recurrence->range_date, &incidence->recurrence->range_number, n)
+ || handle_incidence_recurrence_month(&incidence->recurrence->month, n))
continue;
i_kolab_store_add_xml_element(incidence->common, (gpointer) KOLAB_STORE_PTR_INC_RECURRENCE, n);
@@ -590,7 +590,7 @@ handle_incidence_organizer (I_incidence *i_incidence, xmlNodePtr node)
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)
- || handle_element_string(KLB_INC_SMTP_ADDRESS, &i_incidence->organizer_smtp_address, n))
+ || handle_element_string(KLB_INC_SMTP_ADDRESS, &i_incidence->organizer_smtp_address, n))
continue;
i_kolab_store_add_xml_element(i_incidence->common, (gpointer) KOLAB_STORE_PTR_INC_ORGANIZER, n);
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 ec73375..17c08a8 100644
--- a/src/libekolabconv/main/src/kolab/task-i-to-k.c
+++ b/src/libekolabconv/main/src/kolab/task-i-to-k.c
@@ -34,18 +34,18 @@ static gchar*
task_status_i_to_k (Task_status i_task_status)
{
switch (i_task_status) {
- case I_TASK_NOT_STARTED:
- return KLB_TASK_STATUS_NOT_STARTED;
- case I_TASK_IN_PROGRESS:
- return KLB_TASK_STATUS_IN_PROGRESS;
- case I_TASK_COMPLETED:
- return KLB_TASK_STATUS_COMPLETED;
- case I_TASK_WAITING_ON_SOMEONE_ELSE:
- return KLB_TASK_STATUS_WAITING_ON_SOMEONE_ELSE;
- case I_TASK_DEFERRED:
- return KLB_TASK_STATUS_DEFERRED;
- default:
- return KLB_TASK_STATUS_NOT_STARTED;
+ case I_TASK_NOT_STARTED:
+ return KLB_TASK_STATUS_NOT_STARTED;
+ case I_TASK_IN_PROGRESS:
+ return KLB_TASK_STATUS_IN_PROGRESS;
+ case I_TASK_COMPLETED:
+ return KLB_TASK_STATUS_COMPLETED;
+ case I_TASK_WAITING_ON_SOMEONE_ELSE:
+ return KLB_TASK_STATUS_WAITING_ON_SOMEONE_ELSE;
+ case I_TASK_DEFERRED:
+ return KLB_TASK_STATUS_DEFERRED;
+ default:
+ return KLB_TASK_STATUS_NOT_STARTED;
}
}
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 42bf35d..5d1da21 100644
--- a/src/libekolabconv/main/src/kolab/task-k-to-i.c
+++ b/src/libekolabconv/main/src/kolab/task-k-to-i.c
@@ -125,10 +125,10 @@ read_task(I_task *i_task, xmlNodePtr task_node, GError **error)
/* 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
- && (i_task->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_MONTHDAY
- || i_task->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY)) {
+ && i_task->incidence->recurrence
+ && !i_task->incidence->start_date
+ && (i_task->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_MONTHDAY
+ || i_task->incidence->recurrence->recurrence_cycle == I_REC_CYCLE_YEARLY_WEEKDAY)) {
g_free(i_task->incidence->recurrence);
i_task->incidence->recurrence = NULL;
@@ -209,8 +209,7 @@ handle_element_priority (gchar* name, gint *store, xmlNodePtr node)
value = xml_get_node_text(node);
g_debug ("**** handle_element_priority() node: %s - value: %s", node->name, value);
- 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)
diff --git a/src/libekolabconv/main/src/logging.c b/src/libekolabconv/main/src/logging.c
index 4a6d900..ebd24b0 100644
--- a/src/libekolabconv/main/src/logging.c
+++ b/src/libekolabconv/main/src/logging.c
@@ -51,8 +51,7 @@ log_warn (gchar *fmt, ...)
void
log_evolution_ical (const gchar *message, const ECalComponentWithTZ* epim)
{
- icalcomponent *ical_vevent = e_cal_component_get_icalcomponent (
- (ECalComponent*) epim->maincomp);
+ icalcomponent *ical_vevent = e_cal_component_get_icalcomponent ((ECalComponent*) epim->maincomp);
icalcomponent *ical_vcal = icalcomponent_new_vcalendar ();
icalcomponent *ical_vtz = NULL;
if (epim->timezone != NULL) {
@@ -103,4 +102,3 @@ log_kolab_mail (const gchar *message, const Kolab_conv_mail *kmail)
#endif /* KOLABCONV_DEBUG */
-
diff --git a/src/libekolabconv/main/src/structs/common.c b/src/libekolabconv/main/src/structs/common.c
index fda800f..a265f5d 100644
--- a/src/libekolabconv/main/src/structs/common.c
+++ b/src/libekolabconv/main/src/structs/common.c
@@ -308,7 +308,7 @@ print_date_or_datetime (const Date_or_datetime *dodt, const gchar *caption)
if (dodt->date)
/* log_debug("%s", convertGDateToString( dateOrDateTime->date)); */
log_debug("\n\t Date: %d-%d-%d", (dodt->date)->year,
- (dodt->date)->month, (dodt->date)->day);
+ (dodt->date)->month, (dodt->date)->day);
else if (dodt->date_time) {
log_debug ("\n%s", caption);
log_debug ("\n\t Time: %s", ctime (dodt->date_time));
@@ -368,7 +368,7 @@ print_kolab_attachment_store (const I_common *c)
Kolab_conv_mail_part *bin_attachment = (Kolab_conv_mail_part *) list->data;
log_debug ("\nItem# %d: \n\tFileName: %s, FileLength: %d", (++i),
- bin_attachment->name, bin_attachment->length);
+ bin_attachment->name, bin_attachment->length);
list = list->next;
}
#endif
@@ -397,13 +397,8 @@ print_evolution_store (const I_common *c)
Evolution_field *eField = ((Evolution_field *) list->data);
log_debug ("\nitem# %d: \t FieldName = %s, value = %s", (++i),
- eField->name->str, eField->value->str);
+ eField->name->str, eField->value->str);
list = list->next;
}
#endif
}
-
-
-
-
-
diff --git a/src/libekolabconv/main/src/structs/common.h b/src/libekolabconv/main/src/structs/common.h
index eef376d..e19ab8a 100644
--- a/src/libekolabconv/main/src/structs/common.h
+++ b/src/libekolabconv/main/src/structs/common.h
@@ -60,8 +60,8 @@
* A structure for holding evolution name value pair.
*/
typedef struct {
- GString *name;
- GString *value;
+ GString *name;
+ GString *value;
} Evolution_field;
@@ -113,39 +113,39 @@ typedef enum {
* A structure for holding common fields.
*/
typedef struct{
- GString *product_id;
- GString *uid;
- GString *body;
- GString *categories;
- Date_or_datetime *creation_datetime;
- Date_or_datetime *last_modified_datetime;
- Sensitivity sensitivity;
-
- /* help variable for html parsing, written and true by kontact when html parsing needed */
- gboolean is_html_richtext;
-
- /* KPilot synchronization stuff */
- gboolean has_pilot_sync_id;
- gboolean has_pilot_sync_status;
- gulong pilot_sync_id;
- gint pilot_sync_status;
-
- /* stores kolab xml trees which could not be mapped to evolution but
- * which should be preserved. Also the relation to the parent elements
- * of the xml tree can be stored.
- * Use the operations kolab_store_add_element() and
- * kolab_store_get_element_list() to access this property.
- */
- GHashTable *kolab_store;
-
- 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 *link_attachments; /* list of gchar* URLs */
-
- gchar *evolution_store; /* elements of type char* */
- gchar *vtimezone; /* complete ICalendar VTIMEZONE block */
+ GString *product_id;
+ GString *uid;
+ GString *body;
+ GString *categories;
+ Date_or_datetime *creation_datetime;
+ Date_or_datetime *last_modified_datetime;
+ Sensitivity sensitivity;
+
+ /* help variable for html parsing, written and true by kontact when html parsing needed */
+ gboolean is_html_richtext;
+
+ /* KPilot synchronization stuff */
+ gboolean has_pilot_sync_id;
+ gboolean has_pilot_sync_status;
+ gulong pilot_sync_id;
+ gint pilot_sync_status;
+
+ /* stores kolab xml trees which could not be mapped to evolution but
+ * which should be preserved. Also the relation to the parent elements
+ * of the xml tree can be stored.
+ * Use the operations kolab_store_add_element() and
+ * kolab_store_get_element_list() to access this property.
+ */
+ GHashTable *kolab_store;
+
+ 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 *link_attachments; /* list of gchar* URLs */
+
+ gchar *evolution_store; /* elements of type char* */
+ gchar *vtimezone; /* complete ICalendar VTIMEZONE block */
} I_common;
diff --git a/src/libekolabconv/main/src/structs/contact.c b/src/libekolabconv/main/src/structs/contact.c
index 347bd86..a8de2b8 100644
--- a/src/libekolabconv/main/src/structs/contact.c
+++ b/src/libekolabconv/main/src/structs/contact.c
@@ -235,9 +235,9 @@ print_custom_fields (I_contact *c)
log_debug ("\n\nCustom Fields:");
while (list != NULL) {
log_debug ("\nCustom Field: %d \tValue=%s, App=%s, Name=%s", (++i),
- ((Custom*) list->data)->value->str,
- ((Custom*) list->data)->app->str,
- ((Custom*) list->data)->name->str);
+ ((Custom*) list->data)->value->str,
+ ((Custom*) list->data)->app->str,
+ ((Custom*) list->data)->name->str);
list = list->next;
}
#endif
@@ -259,8 +259,8 @@ print_phone_numbers (I_contact *c)
log_debug ("\n\nPhone_numbers:");
while (list != NULL) {
log_debug ("\nPhone %d \tType: %d, Phone: %s", (++i),
- ((Phone_number*) list->data)->type,
- ((Phone_number*) list->data)->number);
+ ((Phone_number*) list->data)->type,
+ ((Phone_number*) list->data)->number);
list = list->next;
}
#endif
diff --git a/src/libekolabconv/main/src/structs/contact.h b/src/libekolabconv/main/src/structs/contact.h
index e0ab2a8..e5f6e01 100644
--- a/src/libekolabconv/main/src/structs/contact.h
+++ b/src/libekolabconv/main/src/structs/contact.h
@@ -149,7 +149,7 @@ typedef struct {
GList *custom_list; /* elements of type "Custom" */
- #define DEGREE_NOT_SET -999
+#define DEGREE_NOT_SET -999
gdouble latitude;
gdouble longitude;
diff --git a/src/libekolabconv/main/src/structs/incidence.c b/src/libekolabconv/main/src/structs/incidence.c
index 0812c9f..52ebb52 100644
--- a/src/libekolabconv/main/src/structs/incidence.c
+++ b/src/libekolabconv/main/src/structs/incidence.c
@@ -131,7 +131,7 @@ 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);
@@ -262,22 +262,22 @@ static gchar*
recurrence_cycle_to_string (Recurrence_cycle recurrence_cycle)
{
switch (recurrence_cycle) {
- case I_REC_CYCLE_DAILY:
- return "daily";
- case I_REC_CYCLE_WEEKLY:
- return "weekly";
- case I_REC_CYCLE_MONTHLY_DAYNUMBER:
- return "Monthly Day_Number";
- case I_REC_CYCLE_MONTHLY_WEEKDAY:
- return "Monthly Week_Day";
- case I_REC_CYCLE_YEARLY_MONTHDAY:
- return "Yearly Month_Day";
- case I_REC_CYCLE_YEARLY_YEARDAY:
- return "Yearly Year_Day";
- case I_REC_CYCLE_YEARLY_WEEKDAY:
- return "Yearly Week_Day";
- default:
- return "undefined";
+ case I_REC_CYCLE_DAILY:
+ return "daily";
+ case I_REC_CYCLE_WEEKLY:
+ return "weekly";
+ case I_REC_CYCLE_MONTHLY_DAYNUMBER:
+ return "Monthly Day_Number";
+ case I_REC_CYCLE_MONTHLY_WEEKDAY:
+ return "Monthly Week_Day";
+ case I_REC_CYCLE_YEARLY_MONTHDAY:
+ return "Yearly Month_Day";
+ case I_REC_CYCLE_YEARLY_YEARDAY:
+ return "Yearly Year_Day";
+ case I_REC_CYCLE_YEARLY_WEEKDAY:
+ return "Yearly Week_Day";
+ default:
+ return "undefined";
}
}
#endif
@@ -325,9 +325,9 @@ print_attendee (const GList *attendee)
log_debug ("\n\tDisplayName: %s", attendee->display_name->str);
log_debug ("\n\tSmtpAddres: %s", attendee->smtp_address->str);
log_debug ("\n\trequest_response: %s", (attendee->request_response == TRUE ? "true"
- : "false"));
+ : "false"));
log_debug ("\n\tinvitation_sent: %s", (attendee->invitation_sent == TRUE ? "true"
- : "false"));
+ : "false"));
log_debug ("\n\tStatus: %d", attendee->status);
log_debug ("\n\tRole: %d\n", attendee->role);
@@ -423,8 +423,8 @@ print_incidence (const I_incidence *i_incidence)
log_debug ("\nLocation: %s", i_incidence->location->str);
if (i_incidence->organizer_display_name && i_incidence->organizer_smtp_address)
log_debug ("\nOrganizer Display Name=%s, Smtp Address=%s",
- i_incidence->organizer_display_name->str,
- i_incidence->organizer_smtp_address->str);
+ i_incidence->organizer_display_name->str,
+ i_incidence->organizer_smtp_address->str);
print_date_or_datetime (i_incidence->start_date, "Start Date");
print_advanced_alarm_list( i_incidence->advanced_alarm );
diff --git a/src/libekolabconv/main/src/structs/incidence.h b/src/libekolabconv/main/src/structs/incidence.h
index 110d72b..0aad2cc 100644
--- a/src/libekolabconv/main/src/structs/incidence.h
+++ b/src/libekolabconv/main/src/structs/incidence.h
@@ -113,9 +113,9 @@ 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; */
+ /* 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; */
+ /* 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. */
diff --git a/src/libekolabconv/main/src/util.c b/src/libekolabconv/main/src/util.c
index 69a1a71..84313ef 100644
--- a/src/libekolabconv/main/src/util.c
+++ b/src/libekolabconv/main/src/util.c
@@ -103,7 +103,7 @@ gchar **str_split(const gchar *str, const gchar *delim)
/* append terminating NULL pointer */
tokens[tokc] = NULL;
- return tokens;
+ return tokens;
}
/**
diff --git a/src/libekolabconv/test/src/Makefile.am b/src/libekolabconv/test/src/Makefile.am
index bfb533a..fcf870b 100644
--- a/src/libekolabconv/test/src/Makefile.am
+++ b/src/libekolabconv/test/src/Makefile.am
@@ -1,65 +1,64 @@
-bin_PROGRAMS = \
+bin_PROGRAMS = \
unittest-libekolabconv
-unittest_libekolabconv_SOURCES = \
- email-parser.c\
- main.c \
- testbase.c \
- test-evolution-contact.c \
- test-evolution-event.c \
- test-evolution-note.c \
- test-evolution-task.c \
- test-kolab-contact.c \
- test-kolab-event.c \
- test-kolab-note.c \
- test-kolab-task.c \
+unittest_libekolabconv_SOURCES = \
+ email-parser.c \
+ main.c \
+ testbase.c \
+ test-evolution-contact.c \
+ test-evolution-event.c \
+ test-evolution-note.c \
+ test-evolution-task.c \
+ test-kolab-contact.c \
+ test-kolab-event.c \
+ test-kolab-note.c \
+ test-kolab-task.c \
test-util.c
-unittest_libekolabconv_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+unittest_libekolabconv_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"kolab-libekolabconv\" \
$(GMIME_CFLAGS)
-unittest_libekolabconv_LDADD = \
+unittest_libekolabconv_LDADD = \
$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
- $(KOLAB_LIB_EKOLABCONVKOLAB) \
- $(KOLAB_LIB_EKOLABCONVSTRUCTS) \
- $(KOLAB_LIB_EKOLABCONV) \
- $(CAMEL_LIBS) \
- $(GLIB_LIBS) \
- $(GMIME_LIBS) \
+ $(KOLAB_LIB_EKOLABCONVKOLAB) \
+ $(KOLAB_LIB_EKOLABCONVSTRUCTS) \
+ $(KOLAB_LIB_EKOLABCONV) \
+ $(CAMEL_LIBS) \
+ $(GLIB_LIBS) \
+ $(GMIME_LIBS) \
$(EDS_LIBS)
-unittest_libekolabconv_CFLAGS = \
- $(CFLAGS) \
- $(ADD_CFLAGS) \
- $(KOLAB_INCLUDE) \
+unittest_libekolabconv_CFLAGS = \
+ $(CFLAGS) \
+ $(ADD_CFLAGS) \
+ $(KOLAB_INCLUDE) \
$(KOLAB_INCLUDE_EKOLABCONV)
-AM_CPPFLAGS = \
- $(CAMEL_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GMIME_CFLAGS) \
+AM_CPPFLAGS = \
+ $(CAMEL_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GMIME_CFLAGS) \
$(EDS_CFLAGS)
-AM_CFLAGS = \
- $(CFLAGS) \
- $(ADD_CFLAGS) \
- $(KOLAB_INCLUDE) \
+AM_CFLAGS = \
+ $(CFLAGS) \
+ $(ADD_CFLAGS) \
+ $(KOLAB_INCLUDE) \
$(KOLAB_INCLUDE_EKOLABCONV)
-noinst_HEADERS = \
- email-parser.h \
- main.h \
- testbase.h \
- test-convert-setup.h \
+noinst_HEADERS = \
+ email-parser.h \
+ main.h \
+ testbase.h \
+ test-convert-setup.h \
test-util.h
-noinstdir = \
+noinstdir = \
$(pkgincludedir)
-EXTRA_DIST = \
+EXTRA_DIST = \
$(noinst_HEADERS)
## File created by the gnome-build tools
-
diff --git a/src/libekolabconv/test/src/email-parser.c b/src/libekolabconv/test/src/email-parser.c
index 33d30e1..ac239a5 100644
--- a/src/libekolabconv/test/src/email-parser.c
+++ b/src/libekolabconv/test/src/email-parser.c
@@ -89,7 +89,7 @@ decode_base64_image_string (gchar *str, ssize_t len, gint *image_length)
/* base64 decode the input string */
*image_length = g_mime_encoding_base64_decode_step ((guchar *) str, len,
- (guchar *) image_data, &state, &save);
+ (guchar *) image_data, &state, &save);
return image_data;
}
@@ -112,22 +112,22 @@ remove_extra_chars_after_xml_end_tag(gchar *xml_data, gchar *end_tag)
static gchar
*quoted_printable_to_string(gchar *str, gint *text_length)
{
- gint len = strlen(str);
- gchar *text_data = g_new0(gchar, len);
- gint state = 0;
- guint32 save;
-
- /* quoted printable decode the input string */
- *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 */
- 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);
- remove_extra_chars_after_xml_end_tag(text_data, NOTE_CLOSING_TAG);
-
- return text_data;
+ gint len = strlen(str);
+ gchar *text_data = g_new0(gchar, len);
+ gint state = 0;
+ guint32 save;
+
+ /* quoted printable decode the input string */
+ *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 */
+ 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);
+ remove_extra_chars_after_xml_end_tag(text_data, NOTE_CLOSING_TAG);
+
+ return text_data;
}
#if 0
@@ -199,7 +199,7 @@ add_klb_mail_list_to_g_mime_message (GMimeMessage *message, const GList* klb_mai
mime_part = g_mime_part_new_with_type (tokens[0], tokens[1]);
stream = g_mime_stream_mem_new_with_buffer (klb_mail_part->data,
- klb_mail_part->length);
+ klb_mail_part->length);
content = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
g_object_unref (stream);
@@ -279,17 +279,15 @@ g_mime_read_email (gchar *email_file_name)
printf ("\nMime Message: Reply To = %s", mime_message->reply_to);
printf ("\nMime Message: tz offset = %d", mime_message->tz_offset);
- printf (
- "\n\n\n*****************STEP 2: Get all Parts of Message (Attachments)**********************************\n");
+ printf ("\n\n\n*****************STEP 2: Get all Parts of Message (Attachments)**********************************\n");
/* 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);
+ &g_mime_obj_data);
iterator = g_mime_obj_data.g_mime_objects;
- printf (
- "\n\n\n*****************STEP 3: Loop through all Attachments**********************************\n");
+ printf ("\n\n\n*****************STEP 3: Loop through all Attachments**********************************\n");
while (iterator != NULL) {
/* Get the first GMimeObject */
g_mime_obj = ((GMimeObject *) iterator->data);
@@ -300,7 +298,7 @@ g_mime_read_email (gchar *email_file_name)
if (g_mime_obj->disposition) {
printf ("\nContent Disposition: %s", g_mime_content_disposition_to_string (
- g_mime_obj->disposition, 2));
+ g_mime_obj->disposition, 2));
}
@@ -377,9 +375,9 @@ read_kolab_email_file(const gchar *filename, GError** error) {
type = g_mime_obj->content_type->type;
/* 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) ){
+ (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); */
@@ -441,4 +439,3 @@ write_kolab_email_file (const Kolab_conv_mail *mail, const gchar *filename, GErr
g_object_unref (message);
}
-
diff --git a/src/libekolabconv/test/src/main.c b/src/libekolabconv/test/src/main.c
index afe89bf..074b102 100644
--- a/src/libekolabconv/test/src/main.c
+++ b/src/libekolabconv/test/src/main.c
@@ -66,7 +66,7 @@ read_config_file()
static void
log_handler (const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
+ const gchar *message, gpointer user_data)
{
gchar *level;
@@ -74,27 +74,27 @@ log_handler (const gchar *log_domain, GLogLevelFlags log_level,
(void)user_data;
switch (log_level) {
- case G_LOG_LEVEL_ERROR:
- level = "ERROR";
- break;
- case G_LOG_LEVEL_CRITICAL:
- level = "CRITICAL";
- break;
- case G_LOG_LEVEL_WARNING:
- level = "WARNING";
- break;
- case G_LOG_LEVEL_MESSAGE:
- level = "MESSAGE";
- break;
- case G_LOG_LEVEL_INFO:
- level = "INFO";
- break;
- case G_LOG_LEVEL_DEBUG:
- level = "DEBUG";
- break;
- default:
- level = "UNDEF";
- break;
+ case G_LOG_LEVEL_ERROR:
+ level = "ERROR";
+ break;
+ case G_LOG_LEVEL_CRITICAL:
+ level = "CRITICAL";
+ break;
+ case G_LOG_LEVEL_WARNING:
+ level = "WARNING";
+ break;
+ case G_LOG_LEVEL_MESSAGE:
+ level = "MESSAGE";
+ break;
+ case G_LOG_LEVEL_INFO:
+ level = "INFO";
+ break;
+ case G_LOG_LEVEL_DEBUG:
+ level = "DEBUG";
+ break;
+ default:
+ level = "UNDEF";
+ break;
}
fprintf(log_fp, "%s: %s\n", level, message);
fflush(log_fp);
diff --git a/src/libekolabconv/test/src/test-convert-setup.h b/src/libekolabconv/test/src/test-convert-setup.h
index f0b1ce9..664c544 100644
--- a/src/libekolabconv/test/src/test-convert-setup.h
+++ b/src/libekolabconv/test/src/test-convert-setup.h
@@ -228,219 +228,219 @@ void validate_evolution_note_2(const I_note *inote, gint stage);
void validate_evolution_note_bug_3297386(const I_note *inote, gint stage);
-#define process_pim_type(PIM_TYPE) \
-struct {\
- gchar *filename;\
- void (*validate_op)(const PIM_TYPE*, int stage);\
-}
+#define process_pim_type(PIM_TYPE) \
+ struct { \
+ gchar *filename; \
+ void (*validate_op)(const PIM_TYPE*, int stage); \
+ }
static const process_pim_type(I_contact) test_k_I_contact[] = {
- {"100.", validate_kolab_contact_100},
- {"200.", validate_kolab_contact_200},
- {"201.", validate_kolab_contact_201},
- {"300.", validate_kolab_contact_300},
- {"302.", validate_kolab_contact_302},
- {"500.", validate_kolab_contact_500}
+ {"100.", validate_kolab_contact_100},
+ {"200.", validate_kolab_contact_200},
+ {"201.", validate_kolab_contact_201},
+ {"300.", validate_kolab_contact_300},
+ {"302.", validate_kolab_contact_302},
+ {"500.", validate_kolab_contact_500}
};
static const process_pim_type(I_contact) test_e_I_contact[] = {
- {"contact_e1.vcf", validate_evolution_contact_1},
- {"contact_e2.vcf", validate_evolution_contact_2},
- {"contact_e3.vcf", validate_evolution_contact_3},
- {"contact_e4.vcf", validate_evolution_contact_4},
- {"contact_e5.vcf", validate_evolution_contact_5},
- {"contact_b1.vcf", validate_evolution_contact_b1}
+ {"contact_e1.vcf", validate_evolution_contact_1},
+ {"contact_e2.vcf", validate_evolution_contact_2},
+ {"contact_e3.vcf", validate_evolution_contact_3},
+ {"contact_e4.vcf", validate_evolution_contact_4},
+ {"contact_e5.vcf", validate_evolution_contact_5},
+ {"contact_b1.vcf", validate_evolution_contact_b1}
};
static const process_pim_type(I_event) test_k_I_event[] = {
- {"100.", validate_kolab_event_100},
- {"101.", validate_kolab_event_101},
- {"102.", validate_kolab_event_102},
- {"103.", validate_kolab_event_103},
- {"104.", validate_kolab_event_104},
- {"105.", validate_kolab_event_105},
- {"106.", validate_kolab_event_106},
- {"107.", validate_kolab_event_107},
- {"108.", validate_kolab_event_108},
- {"109.", validate_kolab_event_109},
- {"110.", validate_kolab_event_110},
- {"111.", validate_kolab_event_111},
- {"112.", validate_kolab_event_112},
- {"113.", validate_kolab_event_113},
- {"114.", validate_kolab_event_114},
- {"115.", validate_kolab_event_115},
- {"116.", validate_kolab_event_116},
- {"117.", validate_kolab_event_117},
- {"118.", validate_kolab_event_118},
- {"119.", validate_kolab_event_119},
- {"120.", validate_kolab_event_120},
- {"121.", validate_kolab_event_121},
- {"122.", validate_kolab_event_122},
- {"123.", validate_kolab_event_123},
- {"124.", validate_kolab_event_124},
- {"125.", validate_kolab_event_125},
- {"126.", validate_kolab_event_126},
- {"127.", validate_kolab_event_127},
- {"128.", validate_kolab_event_128},
- {"129.", validate_kolab_event_129},
- {"130.", validate_kolab_event_130},
- {"131.", validate_kolab_event_131},
- {"132.", validate_kolab_event_132},
- {"133.", validate_kolab_event_133},
- {"134.", validate_kolab_event_134},
- {"135.", validate_kolab_event_135},
- {"136.", validate_kolab_event_136},
- {"137.", validate_kolab_event_137},
- {"138.", validate_kolab_event_138},
- {"139.", validate_kolab_event_139},
- {"140.", validate_kolab_event_140},
- {"201.", validate_kolab_event_201},
- {"202.", validate_kolab_event_202},
- {"203.", validate_kolab_event_203},
- {"204.", validate_kolab_event_204},
- {"205.", validate_kolab_event_205},
- {"206.", validate_kolab_event_206},
- {"207.", validate_kolab_event_207},
- {"208.", validate_kolab_event_208},
- {"500.", validate_kolab_event_500},
- {"501.", validate_kolab_event_501},
- {"502.", validate_kolab_event_502},
- {"503.", validate_kolab_event_503},
- {"504.", validate_kolab_event_504},
- {"505.", validate_kolab_event_505},
- {"506.", validate_kolab_event_506}
+ {"100.", validate_kolab_event_100},
+ {"101.", validate_kolab_event_101},
+ {"102.", validate_kolab_event_102},
+ {"103.", validate_kolab_event_103},
+ {"104.", validate_kolab_event_104},
+ {"105.", validate_kolab_event_105},
+ {"106.", validate_kolab_event_106},
+ {"107.", validate_kolab_event_107},
+ {"108.", validate_kolab_event_108},
+ {"109.", validate_kolab_event_109},
+ {"110.", validate_kolab_event_110},
+ {"111.", validate_kolab_event_111},
+ {"112.", validate_kolab_event_112},
+ {"113.", validate_kolab_event_113},
+ {"114.", validate_kolab_event_114},
+ {"115.", validate_kolab_event_115},
+ {"116.", validate_kolab_event_116},
+ {"117.", validate_kolab_event_117},
+ {"118.", validate_kolab_event_118},
+ {"119.", validate_kolab_event_119},
+ {"120.", validate_kolab_event_120},
+ {"121.", validate_kolab_event_121},
+ {"122.", validate_kolab_event_122},
+ {"123.", validate_kolab_event_123},
+ {"124.", validate_kolab_event_124},
+ {"125.", validate_kolab_event_125},
+ {"126.", validate_kolab_event_126},
+ {"127.", validate_kolab_event_127},
+ {"128.", validate_kolab_event_128},
+ {"129.", validate_kolab_event_129},
+ {"130.", validate_kolab_event_130},
+ {"131.", validate_kolab_event_131},
+ {"132.", validate_kolab_event_132},
+ {"133.", validate_kolab_event_133},
+ {"134.", validate_kolab_event_134},
+ {"135.", validate_kolab_event_135},
+ {"136.", validate_kolab_event_136},
+ {"137.", validate_kolab_event_137},
+ {"138.", validate_kolab_event_138},
+ {"139.", validate_kolab_event_139},
+ {"140.", validate_kolab_event_140},
+ {"201.", validate_kolab_event_201},
+ {"202.", validate_kolab_event_202},
+ {"203.", validate_kolab_event_203},
+ {"204.", validate_kolab_event_204},
+ {"205.", validate_kolab_event_205},
+ {"206.", validate_kolab_event_206},
+ {"207.", validate_kolab_event_207},
+ {"208.", validate_kolab_event_208},
+ {"500.", validate_kolab_event_500},
+ {"501.", validate_kolab_event_501},
+ {"502.", validate_kolab_event_502},
+ {"503.", validate_kolab_event_503},
+ {"504.", validate_kolab_event_504},
+ {"505.", validate_kolab_event_505},
+ {"506.", validate_kolab_event_506}
};
static const process_pim_type(I_event) test_e_I_event[] = {
- {"event_e1.ics", validate_evolution_event_1},
- {"event_e2.ics", validate_evolution_event_2},
- {"event_e3.ics", validate_evolution_event_3},
- {"event_e4.ics", validate_evolution_event_4},
- {"event_e5.ics", validate_evolution_event_5},
- {"event_e6.ics", validate_evolution_event_6},
- {"event_e7.ics", validate_evolution_event_7},
- {"event_e8.ics", validate_evolution_event_8},
- {"event_e9.ics", validate_evolution_event_9},
- {"event_e10.ics", validate_evolution_event_10},
- {"event_e11.ics", validate_evolution_event_11},
- {"event_e12.ics", validate_evolution_event_12},
- {"event_e13.ics", validate_evolution_event_13},
- {"event_e14.ics", validate_evolution_event_14},
- {"event_e15.ics", validate_evolution_event_15},
- {"event_e16.ics", validate_evolution_event_16},
- {"event_e17.ics", validate_evolution_event_17},
- {"event_e18.ics", validate_evolution_event_18},
- {"event_e19.ics", validate_evolution_event_19},
- {"event_e20.ics", validate_evolution_event_20},
- {"event_e21.ics", validate_evolution_event_21},
- {"event_e22.ics", validate_evolution_event_22},
- {"event_e23.ics", validate_evolution_event_23},
- {"event_e24.ics", validate_evolution_event_24},
- {"event_e25.ics", validate_evolution_event_25},
- {"event_e26.ics", validate_evolution_event_26},
- {"event_e27.ics", validate_evolution_event_27},
- {"event_e28.ics", validate_evolution_event_28},
- {"event_e29.ics", validate_evolution_event_29},
- {"event_e30.ics", validate_evolution_event_30},
- {"event_tz1.ics", validate_evolution_event_tz1},
- {"event_tz2.ics", validate_evolution_event_tz2},
- {"event_tz3.ics", validate_evolution_event_tz3},
- {"event_tz4.ics", validate_evolution_event_tz4},
- {"event_tz5.ics", validate_evolution_event_tz5},
- {"event_tz6.ics", validate_evolution_event_tz6},
- {"event_tz7.ics", validate_evolution_event_tz7},
- {"event_tz8.ics", validate_evolution_event_tz8},
- {"event_r1.ics", validate_evolution_event_r1},
- {"event_b1.ics", validate_evolution_event_b1},
- {"event_b2.ics", validate_evolution_event_b2}
+ {"event_e1.ics", validate_evolution_event_1},
+ {"event_e2.ics", validate_evolution_event_2},
+ {"event_e3.ics", validate_evolution_event_3},
+ {"event_e4.ics", validate_evolution_event_4},
+ {"event_e5.ics", validate_evolution_event_5},
+ {"event_e6.ics", validate_evolution_event_6},
+ {"event_e7.ics", validate_evolution_event_7},
+ {"event_e8.ics", validate_evolution_event_8},
+ {"event_e9.ics", validate_evolution_event_9},
+ {"event_e10.ics", validate_evolution_event_10},
+ {"event_e11.ics", validate_evolution_event_11},
+ {"event_e12.ics", validate_evolution_event_12},
+ {"event_e13.ics", validate_evolution_event_13},
+ {"event_e14.ics", validate_evolution_event_14},
+ {"event_e15.ics", validate_evolution_event_15},
+ {"event_e16.ics", validate_evolution_event_16},
+ {"event_e17.ics", validate_evolution_event_17},
+ {"event_e18.ics", validate_evolution_event_18},
+ {"event_e19.ics", validate_evolution_event_19},
+ {"event_e20.ics", validate_evolution_event_20},
+ {"event_e21.ics", validate_evolution_event_21},
+ {"event_e22.ics", validate_evolution_event_22},
+ {"event_e23.ics", validate_evolution_event_23},
+ {"event_e24.ics", validate_evolution_event_24},
+ {"event_e25.ics", validate_evolution_event_25},
+ {"event_e26.ics", validate_evolution_event_26},
+ {"event_e27.ics", validate_evolution_event_27},
+ {"event_e28.ics", validate_evolution_event_28},
+ {"event_e29.ics", validate_evolution_event_29},
+ {"event_e30.ics", validate_evolution_event_30},
+ {"event_tz1.ics", validate_evolution_event_tz1},
+ {"event_tz2.ics", validate_evolution_event_tz2},
+ {"event_tz3.ics", validate_evolution_event_tz3},
+ {"event_tz4.ics", validate_evolution_event_tz4},
+ {"event_tz5.ics", validate_evolution_event_tz5},
+ {"event_tz6.ics", validate_evolution_event_tz6},
+ {"event_tz7.ics", validate_evolution_event_tz7},
+ {"event_tz8.ics", validate_evolution_event_tz8},
+ {"event_r1.ics", validate_evolution_event_r1},
+ {"event_b1.ics", validate_evolution_event_b1},
+ {"event_b2.ics", validate_evolution_event_b2}
};
static const process_pim_type(I_task) test_k_I_task[] = {
- {"100.", validate_kolab_task_100},
- {"101.", validate_kolab_task_101},
- {"102.", validate_kolab_task_102},
- {"103.", validate_kolab_task_103},
- {"104.", validate_kolab_task_104},
- {"105.", validate_kolab_task_105},
- {"106.", validate_kolab_task_106},
- {"107.", validate_kolab_task_107},
- {"108.", validate_kolab_task_108},
- {"109.", validate_kolab_task_109},
- {"110.", validate_kolab_task_110},
- {"111.", validate_kolab_task_111},
- {"112.", validate_kolab_task_112},
- {"201.", validate_kolab_task_201},
- {"202.", validate_kolab_task_202},
- {"203.", validate_kolab_task_203},
- {"204.", validate_kolab_task_204},
- {"205.", validate_kolab_task_205},
- {"206.", validate_kolab_task_206},
- {"207.", validate_kolab_task_207},
- {"208.", validate_kolab_task_208},
- {"209.", validate_kolab_task_209},
- {"210.", validate_kolab_task_210},
- {"211.", validate_kolab_task_211},
- {"212.", validate_kolab_task_212},
- {"213.", validate_kolab_task_213},
- {"214.", validate_kolab_task_214},
- {"215.", validate_kolab_task_215},
- {"216.", validate_kolab_task_216},
- {"217.", validate_kolab_task_217},
- {"218.", validate_kolab_task_218},
- {"219.", validate_kolab_task_219},
- {"220.", validate_kolab_task_220},
- {"221.", validate_kolab_task_221},
- {"222.", validate_kolab_task_222},
- {"223.", validate_kolab_task_223},
- {"224.", validate_kolab_task_224},
- {"225.", validate_kolab_task_225},
- {"226.", validate_kolab_task_226},
- {"227.", validate_kolab_task_227},
- {"228.", validate_kolab_task_228},
- {"229.", validate_kolab_task_229},
- {"230.", validate_kolab_task_230},
- {"231.", validate_kolab_task_231},
- {"232.", validate_kolab_task_232},
- {"233.", validate_kolab_task_233},
- {"234.", validate_kolab_task_234},
- {"235.", validate_kolab_task_235},
- {"236.", validate_kolab_task_236},
- {"502.", validate_kolab_task_502},
- {"503.", validate_kolab_task_503},
- {"3286494.", validate_kolab_task_3286494}
+ {"100.", validate_kolab_task_100},
+ {"101.", validate_kolab_task_101},
+ {"102.", validate_kolab_task_102},
+ {"103.", validate_kolab_task_103},
+ {"104.", validate_kolab_task_104},
+ {"105.", validate_kolab_task_105},
+ {"106.", validate_kolab_task_106},
+ {"107.", validate_kolab_task_107},
+ {"108.", validate_kolab_task_108},
+ {"109.", validate_kolab_task_109},
+ {"110.", validate_kolab_task_110},
+ {"111.", validate_kolab_task_111},
+ {"112.", validate_kolab_task_112},
+ {"201.", validate_kolab_task_201},
+ {"202.", validate_kolab_task_202},
+ {"203.", validate_kolab_task_203},
+ {"204.", validate_kolab_task_204},
+ {"205.", validate_kolab_task_205},
+ {"206.", validate_kolab_task_206},
+ {"207.", validate_kolab_task_207},
+ {"208.", validate_kolab_task_208},
+ {"209.", validate_kolab_task_209},
+ {"210.", validate_kolab_task_210},
+ {"211.", validate_kolab_task_211},
+ {"212.", validate_kolab_task_212},
+ {"213.", validate_kolab_task_213},
+ {"214.", validate_kolab_task_214},
+ {"215.", validate_kolab_task_215},
+ {"216.", validate_kolab_task_216},
+ {"217.", validate_kolab_task_217},
+ {"218.", validate_kolab_task_218},
+ {"219.", validate_kolab_task_219},
+ {"220.", validate_kolab_task_220},
+ {"221.", validate_kolab_task_221},
+ {"222.", validate_kolab_task_222},
+ {"223.", validate_kolab_task_223},
+ {"224.", validate_kolab_task_224},
+ {"225.", validate_kolab_task_225},
+ {"226.", validate_kolab_task_226},
+ {"227.", validate_kolab_task_227},
+ {"228.", validate_kolab_task_228},
+ {"229.", validate_kolab_task_229},
+ {"230.", validate_kolab_task_230},
+ {"231.", validate_kolab_task_231},
+ {"232.", validate_kolab_task_232},
+ {"233.", validate_kolab_task_233},
+ {"234.", validate_kolab_task_234},
+ {"235.", validate_kolab_task_235},
+ {"236.", validate_kolab_task_236},
+ {"502.", validate_kolab_task_502},
+ {"503.", validate_kolab_task_503},
+ {"3286494.", validate_kolab_task_3286494}
};
static const process_pim_type(I_task) test_e_I_task[] = {
- {"task_e1.ics", validate_evolution_task_1},
- {"task_e2.ics", validate_evolution_task_2},
- {"task_e3.ics", validate_evolution_task_3},
- {"task_e4.ics", validate_evolution_task_4},
- {"task_e5.ics", validate_evolution_task_5},
- {"task_e6.ics", validate_evolution_task_6},
- {"task_e7.ics", validate_evolution_task_7},
- {"task_e8.ics", validate_evolution_task_8},
- {"task_e9.ics", validate_evolution_task_9},
- {"task_e10.ics", validate_evolution_task_10},
- {"task_e11.ics", validate_evolution_task_11},
- {"task_e12.ics", validate_evolution_task_12},
- {"task_e13.ics", validate_evolution_task_13},
- {"task_e14.ics", validate_evolution_task_14},
- {"bug_3286514.ics", validate_evolution_task_bug_3286514}
+ {"task_e1.ics", validate_evolution_task_1},
+ {"task_e2.ics", validate_evolution_task_2},
+ {"task_e3.ics", validate_evolution_task_3},
+ {"task_e4.ics", validate_evolution_task_4},
+ {"task_e5.ics", validate_evolution_task_5},
+ {"task_e6.ics", validate_evolution_task_6},
+ {"task_e7.ics", validate_evolution_task_7},
+ {"task_e8.ics", validate_evolution_task_8},
+ {"task_e9.ics", validate_evolution_task_9},
+ {"task_e10.ics", validate_evolution_task_10},
+ {"task_e11.ics", validate_evolution_task_11},
+ {"task_e12.ics", validate_evolution_task_12},
+ {"task_e13.ics", validate_evolution_task_13},
+ {"task_e14.ics", validate_evolution_task_14},
+ {"bug_3286514.ics", validate_evolution_task_bug_3286514}
};
static const process_pim_type(I_note) test_k_I_note[] = {
- {"100.", validate_kolab_note_100},
- {"200.", validate_kolab_note_200}
+ {"100.", validate_kolab_note_100},
+ {"200.", validate_kolab_note_200}
};
static const process_pim_type(I_note) test_e_I_note[] = {
- {"note_e1.ics", validate_evolution_note_1},
- {"note_e2.ics", validate_evolution_note_2},
- {"bug_3297386.ics", validate_evolution_note_bug_3297386}
+ {"note_e1.ics", validate_evolution_note_1},
+ {"note_e2.ics", validate_evolution_note_2},
+ {"bug_3297386.ics", validate_evolution_note_bug_3297386}
};
diff --git a/src/libekolabconv/test/src/test-evolution-contact.c b/src/libekolabconv/test/src/test-evolution-contact.c
index 7ba749f..8293c60 100644
--- a/src/libekolabconv/test/src/test-evolution-contact.c
+++ b/src/libekolabconv/test/src/test-evolution-contact.c
@@ -39,15 +39,14 @@ validate_evolution_contact_1 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "pas-id-4C1F87A700000000",
- "Notizen\n123",
- "Miscellaneous,Strategien,Strategies,Wartend,Time & Expenses,Competition,Key Customer,Geschenke,Gifts,Geburtstag,Ideen,Suppliers,Konkurrenz,Ideas,Jahrestag,VIP,Holiday,International,Favoriten,HeiÃe Kontakte,Favorites,Goals/Objectives,GeschÃftlich,Urlaubskarten,PersÃnlich,Urlaub,Zeit und Ausgaben,Hot Contacts,Ziele/Zielsetzungen,Lieferanten,Phone Calls,Anrufe,Status,Waiting,Holiday Cards,Business,Allgemeines,SchlÃssel-Kunde",
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- "2010-08-24 15:37:58", stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "pas-id-4C1F87A700000000",
+ "Notizen\n123",
+ "Miscellaneous,Strategien,Strategies,Wartend,Time & Expenses,Competition,Key Customer,Geschenke,Gifts,Geburtstag,Ideen,Suppliers,Konkurrenz,Ideas,Jahrestag,VIP,Holiday,International,Favoriten,HeiÃe Kontakte,Favorites,Goals/Objectives,GeschÃftlich,Urlaubskarten,PersÃnlich,Urlaub,Zeit und Ausgaben,Hot Contacts,Ziele/Zielsetzungen,Lieferanten,Phone Calls,Anrufe,Status,Waiting,Holiday Cards,Business,Allgemeines,SchlÃssel-Kunde",
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ "2010-08-24 15:37:58", stage);
/*
* Name Fields
@@ -80,11 +79,11 @@ validate_evolution_contact_1 (const I_contact *icontact, gint stage)
* Addresses
*/
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
- "P Adresse", "P Postfach", "P Stadt", "P Bundesstaat", "P Postleitzahl", "P Land");
+ "P Adresse", "P Postfach", "P Stadt", "P Bundesstaat", "P Postleitzahl", "P Land");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_BUSINESS,
- "G Adresse", "G Postfach", "G Stadt", "G Bundesstaat", "G Postleitzahl", "G Land");
+ "G Adresse", "G Postfach", "G Stadt", "G Bundesstaat", "G Postleitzahl", "G Land");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_OTHER,
- "W Adresse", "W Postfach", "W Stadt", "W Bundesstaat", "W Postleitzahl", "W Land");
+ "W Adresse", "W Postfach", "W Stadt", "W Bundesstaat", "W Postleitzahl", "W Land");
assert_list_length(icontact->addresses, 3);
/*
@@ -126,11 +125,10 @@ validate_evolution_contact_1 (const I_contact *icontact, gint stage)
/*
* Attached Multimedia Files
*/
- assert_binary_attachment_equal(
- "./src/libekolabconv/test/resources/evolution/contact/contact_e1_photo.png",
- "kolab-picture.png",
- "image/png",
- icontact->photo);
+ assert_binary_attachment_equal("./src/libekolabconv/test/resources/evolution/contact/contact_e1_photo.png",
+ "kolab-picture.png",
+ "image/png",
+ icontact->photo);
/*
* Geolocation Fields
@@ -143,7 +141,7 @@ validate_evolution_contact_1 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:Video-Chat\r\nCALURI:Kalender\r\nX-MOZILLA-HTML:TRUE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
@@ -155,15 +153,14 @@ validate_evolution_contact_2 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "pas-id-4C73E9E900000000",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- "2010-08-24 15:48:57", stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "pas-id-4C73E9E900000000",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ "2010-08-24 15:48:57", stage);
/*
* Name Fields
@@ -237,7 +234,7 @@ validate_evolution_contact_2 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:\r\nCALURI:\r\nX-MOZILLA-HTML:FALSE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
void
@@ -248,15 +245,14 @@ validate_evolution_contact_3 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "pas-id-4C73EAF900000001",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- "2010-08-24 16:01:39", stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "pas-id-4C73EAF900000001",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ "2010-08-24 16:01:39", stage);
/*
* Name Fields
@@ -342,7 +338,7 @@ validate_evolution_contact_3 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:\r\nCALURI:\r\nX-MOZILLA-HTML:FALSE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
void
@@ -353,15 +349,14 @@ validate_evolution_contact_4 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "pas-id-4C73EB8400000002",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- "2010-08-24 15:56:53", stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "pas-id-4C73EB8400000002",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ "2010-08-24 15:56:53", stage);
/*
* Name Fields
@@ -444,7 +439,7 @@ validate_evolution_contact_4 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:\r\nCALURI:\r\nX-MOZILLA-HTML:FALSE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
void
@@ -455,29 +450,28 @@ validate_evolution_contact_5 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "pas-id-4CA9939100000000",
- "ÎÏÎÎ ÎÏÎÏÏÎÎÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ, ÎÎ ÏÎÎ ÏÏÎ ÎÎÎÎÎÎÎ ÎÎÎÎÎÎÏÎÎ Î ÎÎÎÎÎÎ ÏÏÎÏ"
- " ÎÎÎÏÏÎÏÎÏ ÎÎÏÏ ÏÎÎÎÏÏÎÎÏ ÎÏÎÎÎÎÏÎÏÎ ÏÏÎ ÏÎÏÎÏÎÎ ÏÎÏ ÏÏÏÎÎÏ, ÎÎÏÎÎÏ ÎÎÎ"
- "ÏÎÏÎÏÎÎÏÎ ÎÎÎÎÏÎ[1]. ÎÎ ÎÎÎ ÏÎÏÎÎÎÏ ÏÏÏÎÏ ÎÎÏÎÎÎÎÎÏ ÏÎÏÎÏÎÏÎÏÎÏÎÎ ÏÎ ÎÎ"
- "ÎÏÎ ÎÎÎÎÎÎÎ ÏÎ ÎÎÎÎ ÎÎÎÎÎ, ÎÎÎÏÎÏÏÏÎÎÏÎÎ ÎÎÎ ÎÎÏÎÎÏÏÎÎÎ ÎÏÎÏÎÏÎ ÎÎ ÎÎÎÎ"
- "ÎÏÎÏÎ ÏÎ ÏÎÎÎÎÏÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÎÏÎÎÏ ÏÏÎÏ ÎÎÎÏÏÎÏÎÏ ÎÎÏÏ ÎÏÎÎÎÎÏÎÎÏ, ÏÏÏ"
- "Î ÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÎÎÎÎ ÏÏÎ ÎÎÎÎÎÏÏÎÎÎ ÎÎÏÎ ÎÎÎÎÏÎÏÏÎ ÎÎÎÏÎ (ÎÎ. ÎÎÎÎÎÎÎÎ"
- "ÏÎ). ÎÎÎÎÎÎÏÎÎÎÏ ÎÎÏÏÎÏÎÏÎÎ ÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎÎÏ ÏÎÏ ÎÎÎÏÎÎÎÏÎÏÎÏÎÎ ÎÎÏÏ Ï"
- "ÎÏ ÎÎÎÎÏÎÎÎÏ ÏÎÎÎÎÏ ÎÏÏ ÎÎÎÎÎ ÏÎ ÎÎÎÎÎ, ÏÏÎÎÏÏÏ ÏÏÎÎÏÏÎÏÎ ÎÎÎ ÏÎÎÎÏÏÎÎÎ"
- "Î ÎÎÎÎÎÎÎÏÎÎ ÎÎÎ ÎÎÎÎÏÎÎÎÎÏÎÎ ÎÏÏ ÎÎÎÎÏ, ÏÏÏÏ Î ÎÎÏÎÎÎÎÎÏÎ, Î ÎÎÎÎÎÎ Î "
- "ÎÎÎÏÏÏÎÎ ÎÎÏÏ ÎÏÎÎÎÎÏÎÎÏ ÎÏÎÎÎÎÎ. Î ÎÎÎÎÎÎÎ ÎÏÎÏÎÎÎÎ ÏÎÎÎÏÎÎÎÎ ÏÎÏ ÏÎÎÏ"
- "ÎÎÎÎÏÎÎ ÏÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÎÎÎÎÎ ÎÎÎÎÏ ÏÏÏÎÎÏ. ÎÎ ÎÎÎÎÏ ÎÎÎÎÏÎÏÎÎÏ[2], ÎÏ"
- "ÎÎÏÎÎÏÎÎ ÏÎ ÏÎÏÎÏÎÎ ÎÏÎÎÏÏÎ ÎÎÎÎÏÎ ÎÎÎ ÎÎÎÎÎÎÏÎÎÎÏ ÎÎÎÎÎÎÏ ÎÎÎÎÎÎÏ ÎÎÎÎ"
- "ÎÎÎÏ, ÏÏÏÏ ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ Î ÎÎÎÎÎÎÎ ÏÏÎ ÏÏÎÎÏÎ ÎÏÏ ÏÎ ÎÏÏÎÏÎ. ÎÎÎÎÎÎÎÎ "
- "ÎÏÎÏÎÏ ÏÏÏÎ ÎÎ ÎÎÎÏÎÏÎÏÎÎÎÏÏ ÏÏÎÎÎÏÏ ÎÎÎÎÎÎÎ ÎÎ ÏÎ ÎÎÎÎÏ ÎÎÎ ÏÎ ÏÎÏÎÎÎÎ"
- "ÎÎÎ ÏÎÏ[3].",
- "ÕÕÖÕÕÖÕÖÕ",
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- "2010-10-04 08:42:57", stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "pas-id-4CA9939100000000",
+ "ÎÏÎÎ ÎÏÎÏÏÎÎÎ ÏÎÏ ÎÎÎÎÎÎÎÎÏ, ÎÎ ÏÎÎ ÏÏÎ ÎÎÎÎÎÎÎ ÎÎÎÎÎÎÏÎÎ Î ÎÎÎÎÎÎ ÏÏÎÏ"
+ " ÎÎÎÏÏÎÏÎÏ ÎÎÏÏ ÏÎÎÎÏÏÎÎÏ ÎÏÎÎÎÎÏÎÏÎ ÏÏÎ ÏÎÏÎÏÎÎ ÏÎÏ ÏÏÏÎÎÏ, ÎÎÏÎÎÏ ÎÎÎ"
+ "ÏÎÏÎÏÎÎÏÎ ÎÎÎÎÏÎ[1]. ÎÎ ÎÎÎ ÏÎÏÎÎÎÏ ÏÏÏÎÏ ÎÎÏÎÎÎÎÎÏ ÏÎÏÎÏÎÏÎÏÎÏÎÎ ÏÎ ÎÎ"
+ "ÎÏÎ ÎÎÎÎÎÎÎ ÏÎ ÎÎÎÎ ÎÎÎÎÎ, ÎÎÎÏÎÏÏÏÎÎÏÎÎ ÎÎÎ ÎÎÏÎÎÏÏÎÎÎ ÎÏÎÏÎÏÎ ÎÎ ÎÎÎÎ"
+ "ÎÏÎÏÎ ÏÎ ÏÎÎÎÎÏÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÎÏÎÎÏ ÏÏÎÏ ÎÎÎÏÏÎÏÎÏ ÎÎÏÏ ÎÏÎÎÎÎÏÎÎÏ, ÏÏÏ"
+ "Î ÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÎÎÎÎ ÏÏÎ ÎÎÎÎÎÏÏÎÎÎ ÎÎÏÎ ÎÎÎÎÏÎÏÏÎ ÎÎÎÏÎ (ÎÎ. ÎÎÎÎÎÎÎÎ"
+ "ÏÎ). ÎÎÎÎÎÎÏÎÎÎÏ ÎÎÏÏÎÏÎÏÎÎ ÎÎÎÎÎÎ ÎÎ ÎÎÎÎÎÎÏ ÏÎÏ ÎÎÎÏÎÎÎÏÎÏÎÏÎÎ ÎÎÏÏ Ï"
+ "ÎÏ ÎÎÎÎÏÎÎÎÏ ÏÎÎÎÎÏ ÎÏÏ ÎÎÎÎÎ ÏÎ ÎÎÎÎÎ, ÏÏÎÎÏÏÏ ÏÏÎÎÏÏÎÏÎ ÎÎÎ ÏÎÎÎÏÏÎÎÎ"
+ "Î ÎÎÎÎÎÎÎÏÎÎ ÎÎÎ ÎÎÎÎÏÎÎÎÎÏÎÎ ÎÏÏ ÎÎÎÎÏ, ÏÏÏÏ Î ÎÎÏÎÎÎÎÎÏÎ, Î ÎÎÎÎÎÎ Î "
+ "ÎÎÎÏÏÏÎÎ ÎÎÏÏ ÎÏÎÎÎÎÏÎÎÏ ÎÏÎÎÎÎÎ. Î ÎÎÎÎÎÎÎ ÎÏÎÏÎÎÎÎ ÏÎÎÎÏÎÎÎÎ ÏÎÏ ÏÎÎÏ"
+ "ÎÎÎÎÏÎÎ ÏÏÎÎÎÎÎÎ ÎÎÎ ÏÎ ÎÎÎÎÎÎ ÎÎÎÎÏ ÏÏÏÎÎÏ. ÎÎ ÎÎÎÎÏ ÎÎÎÎÏÎÏÎÎÏ[2], ÎÏ"
+ "ÎÎÏÎÎÏÎÎ ÏÎ ÏÎÏÎÏÎÎ ÎÏÎÎÏÏÎ ÎÎÎÎÏÎ ÎÎÎ ÎÎÎÎÎÎÏÎÎÎÏ ÎÎÎÎÎÎÏ ÎÎÎÎÎÎÏ ÎÎÎÎ"
+ "ÎÎÎÏ, ÏÏÏÏ ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ Î ÎÎÎÎÎÎÎ ÏÏÎ ÏÏÎÎÏÎ ÎÏÏ ÏÎ ÎÏÏÎÏÎ. ÎÎÎÎÎÎÎÎ "
+ "ÎÏÎÏÎÏ ÏÏÏÎ ÎÎ ÎÎÎÏÎÏÎÏÎÎÎÏÏ ÏÏÎÎÎÏÏ ÎÎÎÎÎÎÎ ÎÎ ÏÎ ÎÎÎÎÏ ÎÎÎ ÏÎ ÏÎÏÎÎÎÎ"
+ "ÎÎÎ ÏÎÏ[3].",
+ "ÕÕÖÕÕÖÕÖÕ",
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ "2010-10-04 08:42:57", stage);
/*
* Name Fields
@@ -506,9 +500,9 @@ validate_evolution_contact_5 (const I_contact *icontact, gint stage)
* Addresses
*/
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
- "àààààà ààààà àààààààààà àààààààààà àààààà àààààààààààààààààààààààààààààààà ààààà àààààààààà "
- "àààààààààààààààà. ààààà àààààà àààâ à ààààààààààààààààà àààààààààà.",
- "àààààààààààààà", "ààààààààààààà", "àààààà", "", "ààààààà");
+ "àààààà ààààà àààààààààà àààààààààà àààààà àààààààààààààààààààààààààààààààà ààààà àààààààààà "
+ "àààààààààààààààà. ààààà àààààà àààâ à ààààààààààààààààà àààààààààà.",
+ "àààààààààààààà", "ààààààààààààà", "àààààà", "", "ààààààà");
assert_list_length(icontact->addresses, 1);
/*
@@ -555,7 +549,7 @@ validate_evolution_contact_5 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:\r\nCALURI:\r\nX-MOZILLA-HTML:FALSE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
@@ -567,15 +561,14 @@ validate_evolution_contact_b1 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- NULL,
- "20110330T111653Z-5957-1000-19106-0 christian-t60",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_NULL,
- NULL,
- NULL, stage);
+ validate_icommon(icontact->common,
+ NULL,
+ "20110330T111653Z-5957-1000-19106-0 christian-t60",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_NULL,
+ NULL,
+ NULL, stage);
/*
* Name Fields
@@ -649,6 +642,6 @@ validate_evolution_contact_b1 (const I_contact *icontact, gint stage)
*/
assert_equal_gchar("BEGIN:VCARD\r\nVERSION:3.0\r\nX-EVOLUTION-VIDEO-URL:\r\nCALURI:\r\nX-MOZILLA-HTML:FALSE\r\nEND:VCARD",
- icontact->common->evolution_store);
+ icontact->common->evolution_store);
}
diff --git a/src/libekolabconv/test/src/test-evolution-event.c b/src/libekolabconv/test/src/test-evolution-event.c
index 8d0179f..bc4240a 100644
--- a/src/libekolabconv/test/src/test-evolution-event.c
+++ b/src/libekolabconv/test/src/test-evolution-event.c
@@ -38,17 +38,17 @@ validate_evolution_event_1(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, "IEvent",
- "20100825T143806Z-1270-1000-1-38 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:40:07",
- "2010-08-25 14:40:07", stage);
+ "20100825T143806Z-1270-1000-1-38 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:40:07",
+ "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 */
- stage);
+ "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);
@@ -67,23 +67,23 @@ validate_evolution_event_2(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common,
- NULL,
- "20100825T144011Z-1270-1000-1-39 hhelwi-virt bonn tarent de",
- "Beschreibung\nText\n123",
- "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",
- ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:42:20", "2010-08-25 14:42:20", stage);
+ NULL,
+ "20100825T144011Z-1270-1000-1-39 hhelwi-virt bonn tarent de",
+ "Beschreibung\nText\n123",
+ "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",
+ 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 */
- stage);
+ "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);
@@ -99,18 +99,18 @@ validate_evolution_event_3(const I_event *ievent, gint stage)
log_bitmask(stage);
validate_icommon(ievent->incidence->common,
- NULL,
- "20100825T144419Z-1270-1000-1-41 hhelwi-virt bonn tarent de",
- NULL, NULL,
- ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:45:51", "2010-08-25 14:45:51", stage);
+ NULL,
+ "20100825T144419Z-1270-1000-1-41 hhelwi-virt bonn tarent de",
+ NULL, NULL,
+ 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 */
- stage);
+ "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);
@@ -124,18 +124,18 @@ validate_evolution_event_4(const I_event *ievent, gint stage)
log_bitmask(stage);
validate_icommon(ievent->incidence->common,
- NULL,
- "20100825T144649Z-1270-1000-1-43 hhelwi-virt bonn tarent de",
- NULL, NULL,
- ICOMMON_SENSITIVITY_PUBLIC, "2010-08-25 14:48:07", "2010-08-25 14:48:07", stage);
+ NULL,
+ "20100825T144649Z-1270-1000-1-43 hhelwi-virt bonn tarent de",
+ NULL, NULL,
+ 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 */
- stage);
+ "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);
@@ -148,19 +148,18 @@ validate_evolution_event_5(const I_event *ievent, gint stage)
{
log_bitmask(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 */
+ 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 */
}
void
@@ -168,19 +167,18 @@ validate_evolution_event_6(const I_event *ievent, gint stage)
{
log_bitmask(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 */
+ 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 */
}
void
@@ -188,19 +186,18 @@ validate_evolution_event_7(const I_event *ievent, gint stage)
{
log_bitmask(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 */
+ 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 */
}
void
@@ -208,19 +205,18 @@ validate_evolution_event_8(const I_event *ievent, gint stage)
{
log_bitmask(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 */
+ 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 */
}
void
@@ -231,12 +227,12 @@ 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 */
- stage);
+ "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);
}
@@ -250,7 +246,7 @@ validate_evolution_event_10(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY, 2, 4, NULL, 0, 0, 0);
+ I_REC_CYCLE_DAILY, 2, 4, NULL, 0, 0, 0);
}
void
@@ -264,12 +260,12 @@ validate_evolution_event_11(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T150952Z-1270-1000-1-52 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:11:22", stage);
+ "20100825T150952Z-1270-1000-1-52 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:11:22", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY, 2, 0, rdate, 0, 0, 0);
+ I_REC_CYCLE_DAILY, 2, 0, rdate, 0, 0, 0);
}
void
@@ -281,12 +277,12 @@ validate_evolution_event_12(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T151125Z-1270-1000-1-53 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:12:13", stage);
+ "20100825T151125Z-1270-1000-1-53 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:12:13", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY, 3, 0, NULL, 0, 0, 0);
+ I_REC_CYCLE_DAILY, 3, 0, NULL, 0, 0, 0);
}
void
@@ -298,12 +294,12 @@ validate_evolution_event_13(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T151648Z-1270-1000-1-55 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:18:08", stage);
+ "20100825T151648Z-1270-1000-1-55 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:18:08", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY, 2, 4, NULL, I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY, 0, 0);
+ I_REC_CYCLE_WEEKLY, 2, 4, NULL, I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY, 0, 0);
}
void
@@ -317,12 +313,12 @@ validate_evolution_event_14(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T151811Z-1270-1000-1-56 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:19:22", stage);
+ "20100825T151811Z-1270-1000-1-56 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:19:22", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY, 2, 0, rdate, I_COMMON_MONDAY | I_COMMON_TUESDAY, 0, 0);
+ I_REC_CYCLE_WEEKLY, 2, 0, rdate, I_COMMON_MONDAY | I_COMMON_TUESDAY, 0, 0);
}
void
@@ -334,12 +330,12 @@ validate_evolution_event_15(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T151925Z-1270-1000-1-57 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:20:05", stage);
-;
+ "20100825T151925Z-1270-1000-1-57 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:20:05", stage);
+ ;
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY, 1, 0, NULL, I_COMMON_SATURDAY | I_COMMON_SUNDAY, 0, 0);
+ I_REC_CYCLE_WEEKLY, 1, 0, NULL, I_COMMON_SATURDAY | I_COMMON_SUNDAY, 0, 0);
}
void
@@ -351,12 +347,12 @@ validate_evolution_event_16(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T152033Z-1270-1000-1-58 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:24:45", stage);
+ "20100825T152033Z-1270-1000-1-58 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:24:45", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER, 2, 2, NULL, 0, 1, 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER, 2, 2, NULL, 0, 1, 0);
}
void
@@ -383,12 +379,12 @@ validate_evolution_event_17(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T152448Z-1270-1000-1-59 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:26:43", stage);
+ "20100825T152448Z-1270-1000-1-59 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:26:43", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 2, NULL, I_COMMON_THURSDAY, 1, 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 2, NULL, I_COMMON_THURSDAY, 1, 0);
}
void
@@ -417,12 +413,12 @@ validate_evolution_event_18(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T152646Z-1270-1000-1-60 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:28:25", stage);
+ "20100825T152646Z-1270-1000-1-60 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:28:25", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 0, rdate, I_COMMON_WEDNESDAY, -1, 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 0, rdate, I_COMMON_WEDNESDAY, -1, 0);
}
void
@@ -448,12 +444,12 @@ validate_evolution_event_19(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T152828Z-1270-1000-1-61 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:29:19", stage);
+ "20100825T152828Z-1270-1000-1-61 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:29:19", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER, 1, 0, NULL, 0, 13, 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER, 1, 0, NULL, 0, 13, 0);
}
void
@@ -479,12 +475,12 @@ validate_evolution_event_20(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T152921Z-1270-1000-1-62 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:30:55", stage);
+ "20100825T152921Z-1270-1000-1-62 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:30:55", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER, 1, 3, NULL, 0, -1, 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER, 1, 3, NULL, 0, -1, 0);
}
void
@@ -511,12 +507,12 @@ validate_evolution_event_21(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T153056Z-1270-1000-1-63 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:33:59", stage);
+ "20100825T153056Z-1270-1000-1-63 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:33:59", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 2, NULL, I_COMMON_WEDNESDAY, 5, 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY, 1, 2, NULL, I_COMMON_WEDNESDAY, 5, 0);
}
void
@@ -544,12 +540,12 @@ validate_evolution_event_22(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T153415Z-1270-1000-1-64 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:35:20", stage);
+ "20100825T153415Z-1270-1000-1-64 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:35:20", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY, 1, 2, NULL, 0, 31, I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY, 1, 2, NULL, 0, 31, I_COMMON_AUG);
}
@@ -580,12 +576,12 @@ validate_evolution_event_23(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T153522Z-1270-1000-1-65 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:36:55", stage);
+ "20100825T153522Z-1270-1000-1-65 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:36:55", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY, 2, 0, rdate, 0, 31, I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY, 2, 0, rdate, 0, 31, I_COMMON_AUG);
}
void
@@ -612,12 +608,12 @@ validate_evolution_event_24(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T153656Z-1270-1000-1-66 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-25 15:37:29", stage);
+ "20100825T153656Z-1270-1000-1-66 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-25 15:37:29", stage);
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY, 1, 0, NULL, 0, 31, I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY, 1, 0, NULL, 0, 31, I_COMMON_AUG);
}
void
@@ -650,13 +646,13 @@ 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 */
+ 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);
@@ -675,9 +671,9 @@ validate_evolution_event_26(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T154548Z-1270-1000-1-71 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PRIVATE,
- NULL, "2010-08-25 15:46:07", stage);
+ "20100825T154548Z-1270-1000-1-71 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PRIVATE,
+ NULL, "2010-08-25 15:46:07", stage);
g_assert(ievent->incidence->recurrence == NULL);
}
@@ -691,9 +687,9 @@ validate_evolution_event_27(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100825T154636Z-1270-1000-1-72 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_CONFIDENTIAL,
- NULL, "2010-08-25 15:47:12", stage);
+ "20100825T154636Z-1270-1000-1-72 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_CONFIDENTIAL,
+ NULL, "2010-08-25 15:47:12", stage);
g_assert(ievent->incidence->recurrence == NULL);
}
@@ -707,37 +703,37 @@ validate_evolution_event_28(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20100826T073231Z-1270-1000-1-74 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-08-26 07:40:05", stage);
+ "20100826T073231Z-1270-1000-1-74 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-08-26 07:40:05", stage);
g_assert_cmpint(g_list_length(ievent->incidence->attendee), ==, 6);
assert_attendee_in_list(ievent->incidence->attendee, "Donald Duck",
- "donald duck de", I_INC_STATUS_NONE, TRUE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
+ "donald duck de", I_INC_STATUS_NONE, TRUE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
assert_attendee_in_list(ievent->incidence->attendee, "Micky Maus",
- "micky maus nl", I_INC_STATUS_ACCEPTED, FALSE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
+ "micky maus nl", I_INC_STATUS_ACCEPTED, FALSE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
assert_attendee_in_list(ievent->incidence->attendee, "Daisy Duck",
- "daisy duck de", I_INC_STATUS_DECLINED, TRUE, TRUE, I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_RESOURCE);
+ "daisy duck de", I_INC_STATUS_DECLINED, TRUE, TRUE, I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_RESOURCE);
assert_attendee_in_list(ievent->incidence->attendee, "Bill Gates",
- "bill gates com", I_INC_STATUS_TENTATIVE, TRUE, TRUE, I_INC_ROLE_RESOURCE, I_INC_CUTYPE_ROOM);
+ "bill gates com", I_INC_STATUS_TENTATIVE, TRUE, TRUE, I_INC_ROLE_RESOURCE, I_INC_CUTYPE_ROOM);
assert_attendee_in_list(ievent->incidence->attendee, "Sir Mix-a-Lot",
- "sir mix-a-lot com", I_INC_STATUS_DELEGATED, FALSE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "sir mix-a-lot com", I_INC_STATUS_DELEGATED, FALSE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(ievent->incidence->attendee, "MC Hammer",
- "mc hammer org", I_INC_STATUS_NONE, TRUE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
+ "mc hammer org", I_INC_STATUS_NONE, TRUE, TRUE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
/*
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=CHAIR;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;
- CN=Donald Duck;LANGUAGE=en:MAILTO:donald duck de
-ATTENDEE;CUTYPE=GROUP;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=FALSE;
- CN=Micky Maus;LANGUAGE=en:MAILTO:micky maus nl
-ATTENDEE;CUTYPE=RESOURCE;ROLE=OPT-PARTICIPANT;PARTSTAT=DECLINED;RSVP=TRUE;
- CN=Daisy Duck;LANGUAGE=en:MAILTO:daisy duck de
-ATTENDEE;CUTYPE=ROOM;ROLE=NON-PARTICIPANT;PARTSTAT=TENTATIVE;RSVP=TRUE;
- CN=Bill Gates;LANGUAGE=en:MAILTO:bill gates com
-ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=DELEGATED;RSVP=FALSE;CN=Sir
- Mix-a-Lot;LANGUAGE=en:MAILTO:sir mix-a-lot com
-ATTENDEE;CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=MC Hammer;
- LANGUAGE=en:MAILTO:mc hammer org
- */
+ ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=CHAIR;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;
+ CN=Donald Duck;LANGUAGE=en:MAILTO:donald duck de
+ ATTENDEE;CUTYPE=GROUP;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=FALSE;
+ CN=Micky Maus;LANGUAGE=en:MAILTO:micky maus nl
+ ATTENDEE;CUTYPE=RESOURCE;ROLE=OPT-PARTICIPANT;PARTSTAT=DECLINED;RSVP=TRUE;
+ CN=Daisy Duck;LANGUAGE=en:MAILTO:daisy duck de
+ ATTENDEE;CUTYPE=ROOM;ROLE=NON-PARTICIPANT;PARTSTAT=TENTATIVE;RSVP=TRUE;
+ CN=Bill Gates;LANGUAGE=en:MAILTO:bill gates com
+ ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=DELEGATED;RSVP=FALSE;CN=Sir
+ Mix-a-Lot;LANGUAGE=en:MAILTO:sir mix-a-lot com
+ ATTENDEE;CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=MC Hammer;
+ LANGUAGE=en:MAILTO:mc hammer org
+ */
g_assert(ievent->incidence->recurrence == NULL);
}
@@ -751,15 +747,15 @@ validate_evolution_event_29(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon(ievent->incidence->common, NULL,
- "20101004T083558Z-1277-1000-1-3 hhelwi-virt bonn tarent de",
- "ØÛÙ ÙÙØÙÙ ÙÛØØÙÙÙ ØÚØÙÙ ÙØØÛ "
- "(ØÛØØâØÙØØØÛ) ØØØ. ØØØÛ ØÛÚØ ÚØØØØØÙØÛ "
- "ÂØÚØÙÙÂØ ØÚØÙÙ (ØØÙØÙâØØØÛÛ) ØØ "
- "ØØÛÙÛØ.\n\nØØØÛ ØØØ ØØØÙâØØØ ÙÙØÙÙâØÛ ØØ "
- "ÙØØÛÙ ØÚØÙÙ ØØ ØØÛÙÛØ.",
- "ÙØØÙØ ØÙØØÙØ",
- ICOMMON_SENSITIVITY_PUBLIC,
- NULL, "2010-10-04 08:38:57", stage);
+ "20101004T083558Z-1277-1000-1-3 hhelwi-virt bonn tarent de",
+ "ØÛÙ ÙÙØÙÙ ÙÛØØÙÙÙ ØÚØÙÙ ÙØØÛ "
+ "(ØÛØØâØÙØØØÛ) ØØØ. ØØØÛ ØÛÚØ ÚØØØØØÙØÛ "
+ "ÂØÚØÙÙÂØ ØÚØÙÙ (ØØÙØÙâØØØÛÛ) ØØ "
+ "ØØÛÙÛØ.\n\nØØØÛ ØØØ ØØØÙâØØØ ÙÙØÙÙâØÛ ØØ "
+ "ÙØØÛÙ ØÚØÙÙ ØØ ØØÛÙÛØ.",
+ "ÙØØÙØ ØÙØØÙØ",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ NULL, "2010-10-04 08:38:57", stage);
g_assert(ievent->incidence->recurrence == NULL);
}
@@ -774,13 +770,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
@@ -788,26 +784,25 @@ validate_evolution_event_tz1(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/America/La_Paz\n"
- "X-LIC-LOCATION:America/La_Paz\n"
- "BEGIN:STANDARD\n"
- "TZNAME:BOT\n"
- "DTSTART:19700320T230000\n"
- "TZOFFSETFROM:-0400\n"
- "TZOFFSETTO:-0400\n"
- "END:STANDARD\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/America/La_Paz\n"
+ "X-LIC-LOCATION:America/La_Paz\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:BOT\n"
+ "DTSTART:19700320T230000\n"
+ "TZOFFSETFROM:-0400\n"
+ "TZOFFSETTO:-0400\n"
+ "END:STANDARD\n"
+ "END:VTIMEZONE\n",
+ 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 */
- stage);
+ "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);
@@ -820,34 +815,33 @@ validate_evolution_event_tz2(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/Africa/Windhoek\n"
- "X-LIC-LOCATION:Africa/Windhoek\n"
- "BEGIN:STANDARD\n"
- "TZNAME:WAT\n"
- "DTSTART:19700404T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n"
- "TZOFFSETFROM:+0200\n"
- "TZOFFSETTO:+0100\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:WAST\n"
- "DTSTART:19700905T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9\n"
- "TZOFFSETFROM:+0100\n"
- "TZOFFSETTO:+0200\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/Africa/Windhoek\n"
+ "X-LIC-LOCATION:Africa/Windhoek\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:WAT\n"
+ "DTSTART:19700404T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n"
+ "TZOFFSETFROM:+0200\n"
+ "TZOFFSETTO:+0100\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:WAST\n"
+ "DTSTART:19700905T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9\n"
+ "TZOFFSETFROM:+0100\n"
+ "TZOFFSETTO:+0200\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ 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 */
- stage);
+ "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);
@@ -860,34 +854,33 @@ validate_evolution_event_tz3(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/America/New_York\n"
- "X-LIC-LOCATION:America/New_York\n"
- "BEGIN:STANDARD\n"
- "TZNAME:EST\n"
- "DTSTART:19701107T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11\n"
- "TZOFFSETFROM:-0400\n"
- "TZOFFSETTO:-0500\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:EDT\n"
- "DTSTART:19700314T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3\n"
- "TZOFFSETFROM:-0500\n"
- "TZOFFSETTO:-0400\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/America/New_York\n"
+ "X-LIC-LOCATION:America/New_York\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:EST\n"
+ "DTSTART:19701107T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11\n"
+ "TZOFFSETFROM:-0400\n"
+ "TZOFFSETTO:-0500\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:EDT\n"
+ "DTSTART:19700314T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3\n"
+ "TZOFFSETFROM:-0500\n"
+ "TZOFFSETTO:-0400\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ 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 */
- stage);
+ "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);
@@ -900,34 +893,33 @@ validate_evolution_event_tz4(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/Australia/Sydney\n"
- "X-LIC-LOCATION:Australia/Sydney\n"
- "BEGIN:STANDARD\n"
- "TZNAME:EST\n"
- "DTSTART:19700404T030000\n"
- "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n"
- "TZOFFSETFROM:+1100\n"
- "TZOFFSETTO:+1000\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:EST\n"
- "DTSTART:19701003T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10\n"
- "TZOFFSETFROM:+1000\n"
- "TZOFFSETTO:+1100\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/Australia/Sydney\n"
+ "X-LIC-LOCATION:Australia/Sydney\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:EST\n"
+ "DTSTART:19700404T030000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n"
+ "TZOFFSETFROM:+1100\n"
+ "TZOFFSETTO:+1000\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:EST\n"
+ "DTSTART:19701003T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10\n"
+ "TZOFFSETFROM:+1000\n"
+ "TZOFFSETTO:+1100\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ 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 */
- stage);
+ "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);
@@ -940,34 +932,33 @@ validate_evolution_event_tz5(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
- "X-LIC-LOCATION:Europe/Berlin\n"
- "BEGIN:STANDARD\n"
- "TZNAME:CET\n"
- "DTSTART:19701031T030000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
- "TZOFFSETFROM:+0200\n"
- "TZOFFSETTO:+0100\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:CEST\n"
- "DTSTART:19700328T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
- "TZOFFSETFROM:+0100\n"
- "TZOFFSETTO:+0200\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
+ "X-LIC-LOCATION:Europe/Berlin\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:CET\n"
+ "DTSTART:19701031T030000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
+ "TZOFFSETFROM:+0200\n"
+ "TZOFFSETTO:+0100\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:CEST\n"
+ "DTSTART:19700328T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
+ "TZOFFSETFROM:+0100\n"
+ "TZOFFSETTO:+0200\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ 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 */
- stage);
+ "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);
@@ -983,12 +974,12 @@ 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 */
- stage);
+ "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);
@@ -1001,36 +992,35 @@ validate_evolution_event_tz7(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
- "X-LIC-LOCATION:Europe/Berlin\n"
- "BEGIN:STANDARD\n"
- "TZNAME:CET\n"
- "DTSTART:19701030T030000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
- "TZOFFSETFROM:+0200\n"
- "TZOFFSETTO:+0100\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:CEST\n"
- "DTSTART:19700327T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
- "TZOFFSETFROM:+0100\n"
- "TZOFFSETTO:+0200\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
+ "X-LIC-LOCATION:Europe/Berlin\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:CET\n"
+ "DTSTART:19701030T030000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
+ "TZOFFSETFROM:+0200\n"
+ "TZOFFSETTO:+0100\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:CEST\n"
+ "DTSTART:19700327T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
+ "TZOFFSETFROM:+0100\n"
+ "TZOFFSETTO:+0200\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ strip_cr_cpy(ievent->incidence->common->vtimezone));
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 */
- stage);
+ "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);
@@ -1043,36 +1033,35 @@ validate_evolution_event_tz8(const I_event *ievent, gint stage)
{
log_bitmask(stage);
- assert_equal_gchar(
- "BEGIN:VTIMEZONE\n"
- "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
- "X-LIC-LOCATION:Europe/Berlin\n"
- "BEGIN:STANDARD\n"
- "TZNAME:CET\n"
- "DTSTART:19701030T030000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
- "TZOFFSETFROM:+0200\n"
- "TZOFFSETTO:+0100\n"
- "END:STANDARD\n"
- "BEGIN:DAYLIGHT\n"
- "TZNAME:CEST\n"
- "DTSTART:19700327T020000\n"
- "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
- "TZOFFSETFROM:+0100\n"
- "TZOFFSETTO:+0200\n"
- "END:DAYLIGHT\n"
- "END:VTIMEZONE\n",
- strip_cr_cpy(ievent->incidence->common->vtimezone));
+ assert_equal_gchar("BEGIN:VTIMEZONE\n"
+ "TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin\n"
+ "X-LIC-LOCATION:Europe/Berlin\n"
+ "BEGIN:STANDARD\n"
+ "TZNAME:CET\n"
+ "DTSTART:19701030T030000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n"
+ "TZOFFSETFROM:+0200\n"
+ "TZOFFSETTO:+0100\n"
+ "END:STANDARD\n"
+ "BEGIN:DAYLIGHT\n"
+ "TZNAME:CEST\n"
+ "DTSTART:19700327T020000\n"
+ "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n"
+ "TZOFFSETFROM:+0100\n"
+ "TZOFFSETTO:+0200\n"
+ "END:DAYLIGHT\n"
+ "END:VTIMEZONE\n",
+ strip_cr_cpy(ievent->incidence->common->vtimezone));
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 */
- stage);
+ "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);
@@ -1089,10 +1078,10 @@ validate_evolution_event_r1(const I_event *ievent, gint stage)
g_assert(ievent->incidence != NULL);
validate_icommon (ievent->incidence->common, NULL,
- "20110120T132752Z-5806-1000-5804-0 hhelwi-virt bonn tarent de",
- "d",
- "c",
- ICOMMON_SENSITIVITY_PUBLIC, NULL, NULL, stage);
+ "20110120T132752Z-5806-1000-5804-0 hhelwi-virt bonn tarent de",
+ "d",
+ "c",
+ ICOMMON_SENSITIVITY_PUBLIC, NULL, NULL, stage);
g_assert(ievent->incidence->recurrence == NULL);
}
@@ -1105,36 +1094,36 @@ validate_evolution_event_b1(const I_event *ievent, gint stage)
(void)stage;
/* resulting alarm should look like this in kolab:
- <advanced-alarms>
- <alarm type="email">
- <enabled>1</enabled>
- <start-offset>-15</start-offset>
- <addresses>
- <address>mail gmx de</address>
- <address>mail2 server de</address>
- </addresses>
- <mail-text>Hier der Text</mail-text>
- <attachments/>
- </alarm>
- </advanced-alarms>
- */
+ <advanced-alarms>
+ <alarm type="email">
+ <enabled>1</enabled>
+ <start-offset>-15</start-offset>
+ <addresses>
+ <address>mail gmx de</address>
+ <address>mail2 server de</address>
+ </addresses>
+ <mail-text>Hier der Text</mail-text>
+ <attachments/>
+ </alarm>
+ </advanced-alarms>
+ */
/* advanced alarms */
g_assert_cmpint(g_list_length(ievent->incidence->advanced_alarm), ==, 1);
/* this is a mapped simple alarm from kolab */
mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_EMAIL,
- -15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_EMAIL,
+ -15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
g_assert(mail_alarm->email_param);
g_assert_cmpint(g_list_length(mail_alarm->email_param->addresses), ==, 3);
@@ -1150,13 +1139,13 @@ validate_evolution_event_b2(const I_event *ievent, gint stage)
g_assert_cmpint(g_list_length(ievent->incidence->attendee), ==, 5);
assert_attendee_in_list(ievent->incidence->attendee, "Individual",
- "h helwich tarent de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
+ "h helwich tarent de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
assert_attendee_in_list(ievent->incidence->attendee, "Group",
- "mc hammer org", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
+ "mc hammer org", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
assert_attendee_in_list(ievent->incidence->attendee, "Resource",
- "donald duck de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_RESOURCE);
+ "donald duck de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_RESOURCE);
assert_attendee_in_list(ievent->incidence->attendee, "Room",
- "daisy duck de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_ROOM);
+ "daisy duck de", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_ROOM);
assert_attendee_in_list(ievent->incidence->attendee, "Unknown",
- "bill gates com", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "bill gates com", I_INC_STATUS_NONE, TRUE, FALSE, I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
}
diff --git a/src/libekolabconv/test/src/test-evolution-note.c b/src/libekolabconv/test/src/test-evolution-note.c
index b0c8d0e..f6ce709 100644
--- a/src/libekolabconv/test/src/test-evolution-note.c
+++ b/src/libekolabconv/test/src/test-evolution-note.c
@@ -33,8 +33,8 @@ validate_evolution_note_1(const I_note *inote, gint stage)
g_assert(inote->common != NULL);
validate_icommon(inote->common, "-//Ximian//NONSGML Evolution Calendar//EN",
- "20100824T152249Z-1270-1000-1-2 hhelwi-virt bonn tarent de",
- NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 15:22:58", "2010-08-24 15:22:58", stage);
+ "20100824T152249Z-1270-1000-1-2 hhelwi-virt bonn tarent de",
+ NULL, NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 15:22:58", "2010-08-24 15:22:58", stage);
assert_equal("note_e1", inote->summary);
}
@@ -46,8 +46,8 @@ validate_evolution_note_2(const I_note *inote, gint stage)
g_assert(inote->common != NULL);
validate_icommon(inote->common, "-//Ximian//NONSGML Evolution Calendar//EN",
- "20100824T152122Z-1270-1000-1-1 hhelwi-virt bonn tarent de",
- "Text\n123", NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 15:22:46", "2010-08-24 15:22:46", stage);
+ "20100824T152122Z-1270-1000-1-1 hhelwi-virt bonn tarent de",
+ "Text\n123", NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 15:22:46", "2010-08-24 15:22:46", stage);
assert_equal("note_e2", inote->summary);
}
@@ -57,7 +57,6 @@ validate_evolution_note_bug_3297386(const I_note *inote, gint stage)
{
(void)stage;
- assert_equal_gchar(
- "BEGIN:VJOURNAL\r\nORGANIZER;CN=Hendrik Helwich:MAILTO:h helwich tarent de\r\nX-EVOLUTION-RECIPIENTS:bill gates com;donald duck de\r\nDTSTART;VALUE=DATE:20110505\r\nEND:VJOURNAL\r\n",
- inote->common->evolution_store);
+ assert_equal_gchar("BEGIN:VJOURNAL\r\nORGANIZER;CN=Hendrik Helwich:MAILTO:h helwich tarent de\r\nX-EVOLUTION-RECIPIENTS:bill gates com;donald duck de\r\nDTSTART;VALUE=DATE:20110505\r\nEND:VJOURNAL\r\n",
+ inote->common->evolution_store);
}
diff --git a/src/libekolabconv/test/src/test-evolution-task.c b/src/libekolabconv/test/src/test-evolution-task.c
index 54943e3..85368b8 100644
--- a/src/libekolabconv/test/src/test-evolution-task.c
+++ b/src/libekolabconv/test/src/test-evolution-task.c
@@ -38,25 +38,24 @@ validate_evolution_task_1(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e1",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e1",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -71,25 +70,24 @@ validate_evolution_task_2(const I_task *itask, gint stage)
/* todo not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e2",
- NULL,
- NULL,
- NULL,
- "2010-08-18",
- stage);
+ "task_e2",
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-18",
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -105,25 +103,24 @@ validate_evolution_task_3(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, VTIMEZONE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e3",
- NULL,
- NULL,
- NULL,
- "2010-08-11 13:30:00",
- stage);
+ "task_e3",
+ NULL,
+ NULL,
+ NULL,
+ "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 */
@@ -139,25 +136,24 @@ validate_evolution_task_4(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e4",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e4",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -174,25 +170,24 @@ validate_evolution_task_5(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e5",
- NULL,
- NULL,
- NULL,
- "2010-08-20 01:30:00",
- stage);
+ "task_e5",
+ NULL,
+ NULL,
+ NULL,
+ "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 */
@@ -209,25 +204,24 @@ validate_evolution_task_6(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, ATTACH:file: */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e6",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e6",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -247,25 +241,24 @@ validate_evolution_task_7(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, URL */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e7",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e7",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(4, priority_xkcal_to_k(itask->priority)); /* 7 not possible in kolab, mapped to 4 */
@@ -277,7 +270,7 @@ validate_evolution_task_7(const I_task *itask, gint stage)
* Evolution Store
*/
assert_equal_gchar("BEGIN:VTODO\r\nURL:www.example.de\r\nEND:VTODO\r\n",
- itask->incidence->common->evolution_store);
+ itask->incidence->common->evolution_store);
}
@@ -288,25 +281,24 @@ validate_evolution_task_8(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e8",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e8",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 5 not possible in kolab, mapped to 3 */
@@ -323,25 +315,24 @@ validate_evolution_task_9(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e9",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e9",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(2, priority_xkcal_to_k(itask->priority)); /* evolution 3 mapped to kolab 2 */
@@ -358,25 +349,24 @@ validate_evolution_task_10(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e10",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e10",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -393,25 +383,24 @@ validate_evolution_task_11(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, COMPLETED */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e11",
- NULL,
- NULL,
- NULL,
- "2010-08-19 08:00:00",
- stage);
+ "task_e11",
+ NULL,
+ NULL,
+ NULL,
+ "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 */
@@ -429,74 +418,73 @@ validate_evolution_task_12(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE, X-LIC-ERROR;X-LIC-ERRORTYPE, ATTENDEE;CUTYPE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e12",
- NULL,
- "Hendrik Helwich",
- "MAILTO:h helwich tarent de",
- NULL,
- stage);
+ "task_e12",
+ NULL,
+ "Hendrik Helwich",
+ "MAILTO:h helwich tarent de",
+ NULL,
+ stage);
/* 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 */
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL); /* Chait is mapped to I_INC_ROLE_REQUIRED due to non equivalent value */
+ "Donald Duck",
+ "donald duck de",
+ 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 */
assert_attendee_in_list(itask->incidence->attendee,
- "Micky Maus",
- "micky maus nl",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
+ "Micky Maus",
+ "micky maus nl",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_GROUP);
assert_attendee_in_list(itask->incidence->attendee,
- "Daisy Duck",
- "daisy duck de",
- I_INC_STATUS_DECLINED,
- TRUE,
- FALSE,
- I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_RESOURCE);
+ "Daisy Duck",
+ "daisy duck de",
+ I_INC_STATUS_DECLINED,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_RESOURCE);
assert_attendee_in_list(itask->incidence->attendee,
- "Bill Gates",
- "bill gates com",
- I_INC_STATUS_TENTATIVE,
- TRUE,
- FALSE,
- I_INC_ROLE_RESOURCE, I_INC_CUTYPE_ROOM);
+ "Bill Gates",
+ "bill gates com",
+ I_INC_STATUS_TENTATIVE,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_RESOURCE, I_INC_CUTYPE_ROOM);
assert_attendee_in_list(itask->incidence->attendee,
- "Sir Mix-a-Lot",
- "sir mix-a-lot com",
- I_INC_STATUS_DELEGATED,
- FALSE,
- FALSE,
- 0, I_INC_CUTYPE_UNDEFINED);
+ "Sir Mix-a-Lot",
+ "sir mix-a-lot com",
+ I_INC_STATUS_DELEGATED,
+ FALSE,
+ FALSE,
+ 0, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "MC Hammer",
- "mc hammer org",
- I_INC_STATUS_NONE,
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_INDIVIDUAL);
+ "MC Hammer",
+ "mc hammer org",
+ I_INC_STATUS_NONE,
+ TRUE,
+ 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 */
@@ -509,28 +497,27 @@ 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 */
- 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e13",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e13",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
@@ -546,25 +533,24 @@ validate_evolution_task_14(const I_task *itask, gint stage)
/* TODO not handled elements: DTSTAMP, SEQUENCE */
/* 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 */
- stage);
+ 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 */
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_e14",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task_e14",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority)); /* 0 not possible in kolab, set to default 3 */
diff --git a/src/libekolabconv/test/src/test-kolab-contact.c b/src/libekolabconv/test/src/test-kolab-contact.c
index ea99d8d..2a97b65 100644
--- a/src/libekolabconv/test/src/test-kolab-contact.c
+++ b/src/libekolabconv/test/src/test-kolab-contact.c
@@ -45,16 +45,15 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- 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" ?? */
- NULL,
- 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);
+ validate_icommon(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" ?? */
+ NULL,
+ 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);
/*
* Name Fields
@@ -101,11 +100,11 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
* Addresses
*/
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
- "P StraÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "P Ort", "P Bundesland", "53123", "Albanien");
+ "P StraÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "P Ort", "P Bundesland", "53123", "Albanien");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_BUSINESS,
- "G StarÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "G Ort", "G Bundesland/Kanton", "53111", "Ãgypten");
+ "G StarÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "G Ort", "G Bundesland/Kanton", "53111", "Ãgypten");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_OTHER,
- "W StraÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "W Ort", "W Bundesland", "43212", "Afghanistan");
+ "W StraÃe", IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL, "W Ort", "W Bundesland", "43212", "Afghanistan");
/*
* Phone Numbers
@@ -148,15 +147,13 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
assert_equal_double(DEGREE_NOT_SET, icontact->latitude);
assert_equal_double(DEGREE_NOT_SET, icontact->longitude);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Contacts/100.tnef.attach",
- NULL, "application/x-outlook-tnef",
- icontact->common, 0);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Contacts/100.tnef.attach",
+ NULL, "application/x-outlook-tnef",
+ icontact->common, 0);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Contacts/100-contact-photo.jpg",
- "ContactPicture.jpg", "image/jpeg",
- icontact->common, 1);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Contacts/100-contact-photo.jpg",
+ "ContactPicture.jpg", "image/jpeg",
+ icontact->common, 1);
/*
* Kolab Store
@@ -192,9 +189,9 @@ validate_kolab_contact_100 (const I_contact *icontact, gint stage)
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");
+ 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");
}
void
@@ -207,16 +204,15 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- "KAddressBook 3.3, Kolab resource",
- "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 */
- "2010-06-15 17:33:37",
- "2010-06-30 13:52:32",
- stage);
+ validate_icommon(icontact->common,
+ "KAddressBook 3.3, Kolab resource",
+ "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 */
+ "2010-06-15 17:33:37",
+ "2010-06-30 13:52:32",
+ stage);
/*
* Name Fields
@@ -247,18 +243,18 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
* Addresses
*/
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
- "Privat StraÃe\n123", "Privat Postfach",
- "Privat Ort", "Privat Region", "Privat Postleitzahl", "Deutschland");
+ "Privat StraÃe\n123", "Privat Postfach",
+ "Privat Ort", "Privat Region", "Privat Postleitzahl", "Deutschland");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_BUSINESS,
- "GeschÃft StraÃe", "GeschÃft Postfach",
- "GeschÃft Ort", "GeschÃft Region", "GeschÃft Postleitzahl", "Djibouti");
+ "GeschÃft StraÃe", "GeschÃft Postfach",
+ "GeschÃft Ort", "GeschÃft Region", "GeschÃft Postleitzahl", "Djibouti");
assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_OTHER,
- "Inland StraÃe",
- IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
- IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
- IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
- IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
- "Deutschland");
+ "Inland StraÃe",
+ IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
+ IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
+ IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
+ IS_TEST_STAGE_EVO_TO_INTERN(stage) ? "" : NULL,
+ "Deutschland");
/* 3 following addresses are in kolab store */
/*
@@ -295,11 +291,10 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
*/
assert(icontact->common->kolab_attachment_store == NULL);
- assert_binary_attachment_equal(
- "./src/libekolabconv/test/resources/imap/Contacts/200-contact-photo.png",
- "kolab-picture.png",
- "image/png",
- icontact->photo);
+ assert_binary_attachment_equal("./src/libekolabconv/test/resources/imap/Contacts/200-contact-photo.png",
+ "kolab-picture.png",
+ "image/png",
+ icontact->photo);
/*
* Geolocation Fields
@@ -361,17 +356,15 @@ validate_kolab_contact_201 (const I_contact *icontact, gint stage)
assert(g_list_length(icontact->common->kolab_attachment_store) == 2);
- assert_binary_attachment_equal(
- "./src/libekolabconv/test/resources/imap/Contacts/201-kolab-logo.png",
- "kolab-logo.png",
- "image/png",
- icontact->common->kolab_attachment_store->data);
-
- assert_binary_attachment_equal(
- "./src/libekolabconv/test/resources/imap/Contacts/201-sound",
- "sound",
- "audio/unknown",
- icontact->common->kolab_attachment_store->next->data);
+ assert_binary_attachment_equal("./src/libekolabconv/test/resources/imap/Contacts/201-kolab-logo.png",
+ "kolab-logo.png",
+ "image/png",
+ icontact->common->kolab_attachment_store->data);
+
+ assert_binary_attachment_equal("./src/libekolabconv/test/resources/imap/Contacts/201-sound",
+ "sound",
+ "audio/unknown",
+ icontact->common->kolab_attachment_store->next->data);
}
void
@@ -386,16 +379,15 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
/*
* Common Fields
*/
- validate_icommon(
- icontact->common,
- "KAddressBook 3.3, Kolab resource",
- "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 */
- "2010-12-14 14:48:15",
- "2010-12-14 14:48:15",
- stage);
+ validate_icommon(icontact->common,
+ "KAddressBook 3.3, Kolab resource",
+ "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 */
+ "2010-12-14 14:48:15",
+ "2010-12-14 14:48:15",
+ stage);
/*
* Name Fields
@@ -477,10 +469,10 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
/* validate number of locations with unknown elements */
/* g_assert_cmpint(g_hash_table_size(icontact->common->kolab_store), ==, 2); */
/* 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");
- validate_kolab_store_xml(list, 1, "unknown43");
+ 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");
+ validate_kolab_store_xml(list, 1, "unknown43");
list = kolab_store_get_element_list(icontact->common, icontact->common);
g_assert_cmpint(g_list_length(list), ==, IS_TEST_STAGE_EVO_TO_INTERN(stage) ? 12:7);
@@ -533,7 +525,7 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
Address *addr;
addr = assert_address_in_list(icontact->addresses, ICONTACT_ADDR_TYPE_HOME,
- "street", "Privat Postfach", "Privat Ort", "Privat Region", "Privat Postleitzahl", "Deutschland");
+ "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);
@@ -552,11 +544,10 @@ validate_kolab_contact_302 (const I_contact *icontact, gint stage)
*/
assert(icontact->common->kolab_attachment_store == NULL);
- assert_binary_attachment_equal(
- "./src/libekolabconv/test/resources/imap/Contacts/100-contact-photo.jpg",
- IS_TEST_STAGE_INTERN_TO_EVO(stage) ? "kolab-picture.jpg" : "ContactPicture.jpg",
- "image/jpeg",
- icontact->photo);
+ assert_binary_attachment_equal("./src/libekolabconv/test/resources/imap/Contacts/100-contact-photo.jpg",
+ IS_TEST_STAGE_INTERN_TO_EVO(stage) ? "kolab-picture.jpg" : "ContactPicture.jpg",
+ "image/jpeg",
+ icontact->photo);
}
diff --git a/src/libekolabconv/test/src/test-kolab-event.c b/src/libekolabconv/test/src/test-kolab-event.c
index fc5ed82..ddffb84 100644
--- a/src/libekolabconv/test/src/test-kolab-event.c
+++ b/src/libekolabconv/test/src/test-kolab-event.c
@@ -38,23 +38,23 @@ validate_kolab_event_100(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.132E74C769684382891031D889490CC8",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:25:20",
- "2010-08-23 08:25:55",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.132E74C769684382891031D889490CC8",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:25:20",
+ "2010-08-23 08:25:55",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Betreff",
- "Ort",
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-23 07:00:00",
- stage);
+ "Betreff",
+ "Ort",
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-24 07:30:00", ievent->end_date->date_time);
@@ -72,10 +72,9 @@ validate_kolab_event_100(const I_event *ievent, gint stage)
g_assert_cmpint(g_list_length(ievent->incidence->common->kolab_attachment_store), ==, 1);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/100.tnef.attach",
- NULL, "application/x-outlook-tnef",
- ievent->incidence->common, 0);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Calendar/100.tnef.attach",
+ NULL, "application/x-outlook-tnef",
+ ievent->incidence->common, 0);
}
void
@@ -87,48 +86,48 @@ validate_kolab_event_101(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.087637891D644410BF210F577C90DA1A",
- "Text\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:29:37",
- "2010-08-23 08:29:37",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.087637891D644410BF210F577C90DA1A",
+ "Text\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:29:37",
+ "2010-08-23 08:29:37",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Betreff",
- "Ort",
- NULL,
- NULL,
- "2010-08-25 07:00:00",
- stage);
+ "Betreff",
+ "Ort",
+ NULL,
+ NULL,
+ "2010-08-25 07:00:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* attendees */
assert_attendee_in_list(ievent->incidence->attendee,
- "Hendrik Helwich (h helwich tarent de)",
- "h helwich tarent de",
- I_INC_STATUS_NONE,
- TRUE,
- TRUE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Hendrik Helwich (h helwich tarent de)",
+ "h helwich tarent de",
+ I_INC_STATUS_NONE,
+ TRUE,
+ TRUE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* event */
assert_equal_timestamp("2010-08-26 07:30:00", ievent->end_date->date_time);
@@ -156,23 +155,23 @@ validate_kolab_event_102(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.B59E888AB0D84F5BA1BAD43BEEC15FC2",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:31:50",
- "2010-08-23 08:34:40",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.B59E888AB0D84F5BA1BAD43BEEC15FC2",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:31:50",
+ "2010-08-23 08:34:40",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Betreff",
- "Ort",
- NULL,
- NULL,
- "2010-08-23",
- stage);
+ "Betreff",
+ "Ort",
+ NULL,
+ NULL,
+ "2010-08-23",
+ stage);
/* event */
assert_equal_gdate("2010-08-23", ievent->end_date->date);
@@ -196,23 +195,23 @@ validate_kolab_event_103(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.3FF30815C6534CC1B04231E7E1B84DE0",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:34:15",
- "2010-08-23 08:34:39",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.3FF30815C6534CC1B04231E7E1B84DE0",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:34:15",
+ "2010-08-23 08:34:39",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Betreff",
- "Ort",
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ "Betreff",
+ "Ort",
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -236,23 +235,23 @@ validate_kolab_event_104(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.99E4CF1408D64CD9BE391B3B1BA433E1",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:34:43",
- "2010-08-23 08:36:59",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.99E4CF1408D64CD9BE391B3B1BA433E1",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:34:43",
+ "2010-08-23 08:36:59",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -276,23 +275,23 @@ validate_kolab_event_105(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.3B4BE7A2FD344DF8876CA05F1A33DA44",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:34:57",
- "2010-08-23 08:36:59",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.3B4BE7A2FD344DF8876CA05F1A33DA44",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:34:57",
+ "2010-08-23 08:36:59",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -316,23 +315,23 @@ validate_kolab_event_106(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.90A2920B92BF4FAF83DC9CEB3B7B84C8",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:35:58",
- "2010-08-23 08:36:57",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.90A2920B92BF4FAF83DC9CEB3B7B84C8",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:35:58",
+ "2010-08-23 08:36:57",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -356,23 +355,23 @@ validate_kolab_event_107(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.094C43511FE84231AFF0DA64A0F3D572",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:37:30",
- "2010-08-23 08:38:42",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.094C43511FE84231AFF0DA64A0F3D572",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:37:30",
+ "2010-08-23 08:38:42",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -396,23 +395,23 @@ validate_kolab_event_108(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.CF7182FCA75645D3A819F2E18B9DE739",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:38:24",
- "2010-08-23 08:38:24",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.CF7182FCA75645D3A819F2E18B9DE739",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:38:24",
+ "2010-08-23 08:38:24",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -436,39 +435,39 @@ validate_kolab_event_109(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.114120AC5BD141FDB8117DF70AB5FAED",
- "\r\n",
- "Blaue Kategorie",
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:43:04",
- "2010-08-23 08:43:04",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.114120AC5BD141FDB8117DF70AB5FAED",
+ "\r\n",
+ "Blaue Kategorie",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:43:04",
+ "2010-08-23 08:43:04",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -492,23 +491,23 @@ validate_kolab_event_110(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.8277A45E2B1D4A448773C0B2E326C0A2",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:38:35",
- "2010-08-23 08:44:02",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.8277A45E2B1D4A448773C0B2E326C0A2",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:38:35",
+ "2010-08-23 08:44:02",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 07:00:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 07:00:00",
+ stage);
/* event */
assert_equal_timestamp("2010-08-23 07:30:00", ievent->end_date->date_time);
@@ -532,39 +531,39 @@ validate_kolab_event_111(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.E9FEA7AA3F0544D6A8FEA3C7C8D70F6B",
- "\r\n",
- "Lila Kategorie,Gelbe Kategorie,Blaue Kategorie",
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:44:05",
- "2010-08-23 08:44:05",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.E9FEA7AA3F0544D6A8FEA3C7C8D70F6B",
+ "\r\n",
+ "Lila Kategorie,Gelbe Kategorie,Blaue Kategorie",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:44:05",
+ "2010-08-23 08:44:05",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -588,39 +587,39 @@ validate_kolab_event_112(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.925E577D43C64BF0A203F73FEB4DD757",
- "Text\r\n123\r\nabc\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 08:44:39",
- "2010-08-23 08:44:39",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.925E577D43C64BF0A203F73FEB4DD757",
+ "Text\r\n123\r\nabc\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 08:44:39",
+ "2010-08-23 08:44:39",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -644,39 +643,39 @@ validate_kolab_event_113(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.A3BC0405B1A949D7849CCD093139805D",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PRIVATE,
- "2010-08-23 08:45:53",
- "2010-08-23 08:45:53",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.A3BC0405B1A949D7849CCD093139805D",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PRIVATE,
+ "2010-08-23 08:45:53",
+ "2010-08-23 08:45:53",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -700,49 +699,49 @@ validate_kolab_event_114(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.EC02464D4C9B42CE9C69B8580BDA76D9",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:25:41",
- "2010-08-23 09:25:41",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.EC02464D4C9B42CE9C69B8580BDA76D9",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:25:41",
+ "2010-08-23 09:25:41",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -766,49 +765,49 @@ validate_kolab_event_115(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.61A1257E11404AAC84D7108B5648F978",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:26:29",
- "2010-08-23 09:26:29",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.61A1257E11404AAC84D7108B5648F978",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:26:29",
+ "2010-08-23 09:26:29",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY,
- 1,
- 0,
- NULL,
- 0,
- 0,
- 0);
+ I_REC_CYCLE_DAILY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -832,49 +831,49 @@ validate_kolab_event_116(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.48D03B223AEC4BBE83F5330B57A63912",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:27:16",
- "2010-08-23 09:27:16",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.48D03B223AEC4BBE83F5330B57A63912",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:27:16",
+ "2010-08-23 09:27:16",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY,
- 3,
- 0,
- NULL,
- 0,
- 0,
- 0);
+ I_REC_CYCLE_DAILY,
+ 3,
+ 0,
+ NULL,
+ 0,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -898,49 +897,49 @@ validate_kolab_event_117(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.0F9627DA8AB14AC794730E1608BA4932",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:28:03",
- "2010-08-23 09:28:03",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.0F9627DA8AB14AC794730E1608BA4932",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:28:03",
+ "2010-08-23 09:28:03",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_DAILY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
- 0,
- 0);
+ I_REC_CYCLE_DAILY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -964,49 +963,49 @@ validate_kolab_event_118(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.50BCC1BD7F2942A49EB9A185C5DBDC4E",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:30:29",
- "2010-08-23 09:30:29",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.50BCC1BD7F2942A49EB9A185C5DBDC4E",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:30:29",
+ "2010-08-23 09:30:29",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-24 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-24 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 2,
- 0,
- NULL,
- I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 2,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-24 11:00:00", ievent->end_date->date_time);
@@ -1030,49 +1029,49 @@ validate_kolab_event_119(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.F84F22C2458F4D928F37677231CBB026",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:31:13",
- "2010-08-23 09:31:13",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.F84F22C2458F4D928F37677231CBB026",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:31:13",
+ "2010-08-23 09:31:13",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 1,
- 0,
- NULL,
- 0,
- 23,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 23,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -1096,49 +1095,49 @@ validate_kolab_event_120(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.2A18DA5FB8844E388EA9C9D570C5B7E6",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:32:11",
- "2010-08-23 09:32:11",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.2A18DA5FB8844E388EA9C9D570C5B7E6",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:32:11",
+ "2010-08-23 09:32:11",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-31 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-31 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 3,
- 0,
- NULL,
- 0,
- 31,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 3,
+ 0,
+ NULL,
+ 0,
+ 31,
+ 0);
/* event */
assert_equal_timestamp("2010-08-31 11:00:00", ievent->end_date->date_time);
@@ -1162,49 +1161,49 @@ validate_kolab_event_121(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.73CB404DC1B3494083891CB6C909BB23",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:35:08",
- "2010-08-23 09:35:08",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.73CB404DC1B3494083891CB6C909BB23",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:35:08",
+ "2010-08-23 09:35:08",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-28 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-28 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 2,
- 0,
- NULL,
- 0,
- 28,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 2,
+ 0,
+ NULL,
+ 0,
+ 28,
+ 0);
/* event */
assert_equal_timestamp("2010-08-28 11:00:00", ievent->end_date->date_time);
@@ -1228,49 +1227,49 @@ validate_kolab_event_122(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.3F7EF2D43F8C4E48B8E81510FAC83775",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:36:53",
- "2010-08-23 09:36:53",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.3F7EF2D43F8C4E48B8E81510FAC83775",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:36:53",
+ "2010-08-23 09:36:53",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-24 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-24 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 2,
- 0,
- NULL,
- I_COMMON_TUESDAY,
- 4,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 2,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY,
+ 4,
+ 0);
/* event */
assert_equal_timestamp("2010-08-24 11:00:00", ievent->end_date->date_time);
@@ -1294,49 +1293,49 @@ validate_kolab_event_123(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.01609FAA3B154E168ADB4C242781C110",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:37:34",
- "2010-08-23 09:37:34",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.01609FAA3B154E168ADB4C242781C110",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:37:34",
+ "2010-08-23 09:37:34",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-28 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-28 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 3,
- 0,
- NULL,
- I_COMMON_SATURDAY,
- 5,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 3,
+ 0,
+ NULL,
+ I_COMMON_SATURDAY,
+ 5,
+ 0);
/* event */
assert_equal_timestamp("2010-08-28 11:00:00", ievent->end_date->date_time);
@@ -1360,49 +1359,49 @@ validate_kolab_event_124(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.8CCB5B6F56934CA6863C7A17C820538D",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:39:19",
- "2010-08-23 09:39:19",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.8CCB5B6F56934CA6863C7A17C820538D",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:39:19",
+ "2010-08-23 09:39:19",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 1,
- 0,
- NULL,
- 0,
- 23,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 23,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -1426,49 +1425,49 @@ validate_kolab_event_125(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.92A024C2D37E4F2097034A6C7E99B440",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:40:51",
- "2010-08-23 09:40:51",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.92A024C2D37E4F2097034A6C7E99B440",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:40:51",
+ "2010-08-23 09:40:51",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-02-28 11:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-02-28 11:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 1,
- 0,
- NULL,
- 0,
- 28,
- I_COMMON_FEB);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 28,
+ I_COMMON_FEB);
/* event */
assert_equal_timestamp("2011-02-28 12:00:00", ievent->end_date->date_time);
@@ -1492,71 +1491,71 @@ validate_kolab_event_126(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.1EBA0394588747AD92DA11E56C85FE44",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:42:27",
- "2010-08-23 09:42:27",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.1EBA0394588747AD92DA11E56C85FE44",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:42:27",
+ "2010-08-23 09:42:27",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-08-04 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-08-04 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY | I_COMMON_SUNDAY,
- 4,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY | I_COMMON_SUNDAY,
+ 4,
+ I_COMMON_AUG);
/* 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);
/*
- <recurrence cycle="yearly" type="weekday">
- <interval>1</interval>
- <day>monday</day>
- <day>tuesday</day>
- <day>wednesday</day>
- <day>thursday</day>
- <day>friday</day>
- <day>saturday</day>
- <day>sunday</day>
- <daynumber>4</daynumber>
- <month>august</month>
- <range type="none"/>
+ <recurrence cycle="yearly" type="weekday">
+ <interval>1</interval>
+ <day>monday</day>
+ <day>tuesday</day>
+ <day>wednesday</day>
+ <day>thursday</day>
+ <day>friday</day>
+ <day>saturday</day>
+ <day>sunday</day>
+ <daynumber>4</daynumber>
+ <month>august</month>
+ <range type="none"/>
</recurrence>
RRULE:FREQ=YEARLY;BYDAY=MO,TU,WE,TH,FR,SA,SU;BYMONTHDAY=4;BYMONTH=8
- */
+ */
/* kolab store */
g_assert(ievent->incidence->common->kolab_store != NULL);
@@ -1576,49 +1575,49 @@ validate_kolab_event_127(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.9960E30147D0425A82514E061A8A94C8",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:43:33",
- "2010-08-23 09:43:33",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.9960E30147D0425A82514E061A8A94C8",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:43:33",
+ "2010-08-23 09:43:33",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-08-04 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-08-04 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
- 4,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
+ 4,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2011-08-04 11:00:00", ievent->end_date->date_time);
@@ -1642,49 +1641,49 @@ validate_kolab_event_128(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.68714769A05F40F08A491E5E72F5F633",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:44:07",
- "2010-08-23 09:44:07",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.68714769A05F40F08A491E5E72F5F633",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:44:07",
+ "2010-08-23 09:44:07",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-08-14 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-08-14 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY | I_COMMON_SATURDAY,
- 4,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY | I_COMMON_SATURDAY,
+ 4,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2011-08-14 11:00:00", ievent->end_date->date_time);
@@ -1708,49 +1707,49 @@ validate_kolab_event_129(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.0033AB320BDA4918A559E29A7DB61CF8",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:44:43",
- "2010-08-23 09:44:43",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.0033AB320BDA4918A559E29A7DB61CF8",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:44:43",
+ "2010-08-23 09:44:43",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-29 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-29 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY,
- 5,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY,
+ 5,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2010-08-29 11:00:00", ievent->end_date->date_time);
@@ -1774,49 +1773,49 @@ validate_kolab_event_130(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.D3610D9851A341B7992AF1904607B520",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:45:26",
- "2010-08-23 09:45:26",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.D3610D9851A341B7992AF1904607B520",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:45:26",
+ "2010-08-23 09:45:26",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-02-28 11:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-02-28 11:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY | I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY,
- 5,
- I_COMMON_FEB);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY | I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY,
+ 5,
+ I_COMMON_FEB);
/* event */
assert_equal_timestamp("2011-02-28 12:00:00", ievent->end_date->date_time);
@@ -1840,49 +1839,49 @@ validate_kolab_event_131(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.64D402213A924BF39811455D36BDE67A",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:47:45",
- "2010-08-23 09:47:45",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.64D402213A924BF39811455D36BDE67A",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:47:45",
+ "2010-08-23 09:47:45",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-08-01 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-08-01 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY | I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY,
- 1,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY | I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY | I_COMMON_SATURDAY,
+ 1,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2011-08-01 11:00:00", ievent->end_date->date_time);
@@ -1906,49 +1905,49 @@ validate_kolab_event_132(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.6B121CBF922C41F0AC5E91B56EAA4610",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:48:35",
- "2010-08-23 09:48:35",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.6B121CBF922C41F0AC5E91B56EAA4610",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:48:35",
+ "2010-08-23 09:48:35",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2011-08-01 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2011-08-01 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
- 1,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY | I_COMMON_TUESDAY | I_COMMON_WEDNESDAY | I_COMMON_THURSDAY | I_COMMON_FRIDAY,
+ 1,
+ I_COMMON_AUG);
/* event */
assert_equal_timestamp("2011-08-01 11:00:00", ievent->end_date->date_time);
@@ -1972,49 +1971,49 @@ validate_kolab_event_133(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.67BBC9B188794A27968E490FC381CD38",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:50:43",
- "2010-08-23 09:50:43",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.67BBC9B188794A27968E490FC381CD38",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:50:43",
+ "2010-08-23 09:50:43",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-11-28 11:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-11-28 11:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY | I_COMMON_SATURDAY,
- 5,
- I_COMMON_NOV);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY | I_COMMON_SATURDAY,
+ 5,
+ I_COMMON_NOV);
/* event */
assert_equal_timestamp("2010-11-28 12:00:00", ievent->end_date->date_time);
@@ -2038,49 +2037,49 @@ validate_kolab_event_134(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.368CA0DA11DC4F759A1F7670AFC8BCD3",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:52:50",
- "2010-08-23 09:52:50",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.368CA0DA11DC4F759A1F7670AFC8BCD3",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:52:50",
+ "2010-08-23 09:52:50",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-31 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-31 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 2,
- 0,
- NULL,
- I_COMMON_TUESDAY,
- 5,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 2,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY,
+ 5,
+ 0);
/* event */
assert_equal_timestamp("2010-08-31 11:00:00", ievent->end_date->date_time);
@@ -2104,49 +2103,49 @@ validate_kolab_event_135(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.90650AA582394CDFB0B3D090A1A7A30C",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:54:06",
- "2010-08-23 09:54:06",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.90650AA582394CDFB0B3D090A1A7A30C",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:54:06",
+ "2010-08-23 09:54:06",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-12-27 11:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-12-27 11:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 10,
- NULL,
- 1,
- 4,
- I_COMMON_DEC);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 10,
+ NULL,
+ 1,
+ 4,
+ I_COMMON_DEC);
/* event */
assert_equal_timestamp("2010-12-27 12:00:00", ievent->end_date->date_time);
@@ -2171,49 +2170,49 @@ validate_kolab_event_136(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.A864570513B049FDB74C7295055FAAF4",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:54:49",
- "2010-08-23 09:54:49",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.A864570513B049FDB74C7295055FAAF4",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:54:49",
+ "2010-08-23 09:54:49",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- rdate,
- I_COMMON_MONDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ rdate,
+ I_COMMON_MONDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -2237,39 +2236,39 @@ validate_kolab_event_137(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.7B3E79BD41E047BE8EAF573F72A3C3BF",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:55:35",
- "2010-08-23 09:55:35",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.7B3E79BD41E047BE8EAF573F72A3C3BF",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:55:35",
+ "2010-08-23 09:55:35",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-23 11:00:00", ievent->end_date->date_time);
@@ -2293,49 +2292,49 @@ validate_kolab_event_138(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.009A32D1BD574FC681F9E6FBA499BB35",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 09:57:48",
- "2010-08-23 09:57:48",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.009A32D1BD574FC681F9E6FBA499BB35",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 09:57:48",
+ "2010-08-23 09:57:48",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-30 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-30 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-30 11:00:00", ievent->end_date->date_time);
@@ -2359,49 +2358,49 @@ validate_kolab_event_139(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.BC1711428F1646098131D3943241B780",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 10:01:45",
- "2010-08-23 10:01:45",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.BC1711428F1646098131D3943241B780",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 10:01:45",
+ "2010-08-23 10:01:45",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-10-11 10:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-10-11 10:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-10-11 11:00:00", ievent->end_date->date_time);
@@ -2425,49 +2424,49 @@ validate_kolab_event_140(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.908D4D5690AD48148FB6ECDB41A0499D",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 10:03:29",
- "2010-08-23 10:03:29",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.908D4D5690AD48148FB6ECDB41A0499D",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 10:03:29",
+ "2010-08-23 10:03:29",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- NULL,
- NULL,
- NULL,
- NULL,
- "2010-08-23 12:30:00",
- stage);
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-23 12:30:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* recurrence */
validate_recurrence(ievent->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- NULL,
- I_COMMON_MONDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_MONDAY,
+ 0,
+ 0);
/* event */
assert_equal_timestamp("2010-08-23 16:00:00", ievent->end_date->date_time);
@@ -2493,32 +2492,32 @@ validate_kolab_event_201(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-414546177.646",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 14:13:01",
- "2010-08-24 14:13:01",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-414546177.646",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 14:13:01",
+ "2010-08-24 14:13:01",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "event_k1",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 08:00:00",
- stage);
+ "event_k1",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 08:00:00",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
@@ -2542,32 +2541,32 @@ validate_kolab_event_202(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1478387587.1025",
- "Text\n123",
- "Anwesenheit,Besonderer Anlass,Besprechung,Feiertag,Geburtstag,GeschÃftlich,GeschÃftliches,PersÃnlich,Reise,Schulung,Sprintprozess,Telefonanruf,Termin,Treffen,Urlaub,Verschiedenes",
- ICOMMON_SENSITIVITY_PRIVATE,
- "2010-08-24 14:14:33",
- "2010-08-24 14:14:33",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1478387587.1025",
+ "Text\n123",
+ "Anwesenheit,Besonderer Anlass,Besprechung,Feiertag,Geburtstag,GeschÃftlich,GeschÃftliches,PersÃnlich,Reise,Schulung,Sprintprozess,Telefonanruf,Termin,Treffen,Urlaub,Verschiedenes",
+ ICOMMON_SENSITIVITY_PRIVATE,
+ "2010-08-24 14:14:33",
+ "2010-08-24 14:14:33",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "event_k2",
- "Adresse",
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 08:00:00",
- stage);
+ "event_k2",
+ "Adresse",
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 08:00:00",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* event */
assert_equal_timestamp("2010-08-26 10:00:00", ievent->end_date->date_time);
@@ -2590,32 +2589,32 @@ validate_kolab_event_203(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1971934702.871",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 14:15:44",
- "2010-08-24 14:15:44",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1971934702.871",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 14:15:44",
+ "2010-08-24 14:15:44",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "event_k3",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-26",
- stage);
+ "event_k3",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-26",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* event */
assert_equal_gdate("2010-08-27", ievent->end_date->date);
@@ -2639,52 +2638,52 @@ validate_kolab_event_204(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-503971337.955",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 14:17:42",
- "2010-08-24 14:17:42",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-503971337.955",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 14:17:42",
+ "2010-08-24 14:17:42",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "event_k4",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 08:00:00",
- stage);
+ "event_k4",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 08:00:00",
+ stage);
/* advanced alarms */
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 900,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 900,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- -900,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ -900,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
@@ -2702,9 +2701,9 @@ validate_kolab_event_204(const I_event *ievent, gint stage)
g_assert_cmpint(g_list_length(ievent->incidence->common->kolab_attachment_store), ==, 1);
assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/204.png.attach",
- "anhang1", "image/png",
- ievent->incidence->common, 0);
+ "src/libekolabconv/test/resources/imap/Calendar/204.png.attach",
+ "anhang1", "image/png",
+ ievent->incidence->common, 0);
}
void
@@ -2716,80 +2715,80 @@ validate_kolab_event_205(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1839033818.373",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 14:21:57",
- "2010-08-24 14:21:57",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1839033818.373",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 14:21:57",
+ "2010-08-24 14:21:57",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "event_k5",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 08:00:00",
- stage);
+ "event_k5",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 08:00:00",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname1 Nachname1",
+ "Name1 example net",
+ I_INC_STATUS_NONE,
+ 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,
- "Vorname2 Nachname2",
- "Name2 example net",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_UNDEFINED);
+ "Vorname2 Nachname2",
+ "Name2 example net",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ 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,
- "Vorname3 Nachname3",
- "Name3 example net",
- I_INC_STATUS_DECLINED,
- TRUE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_RESOURCE, I_INC_CUTYPE_UNDEFINED);
+ "Vorname3 Nachname3",
+ "Name3 example net",
+ I_INC_STATUS_DECLINED,
+ 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,
- "Vorname4 Nachname4",
- "Name4 example net",
- I_INC_STATUS_TENTATIVE,
- TRUE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname4 Nachname4",
+ "Name4 example net",
+ I_INC_STATUS_TENTATIVE,
+ 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,
- "Vorname5 Nachname5",
- "Name5 example net",
- I_INC_STATUS_DELEGATED,
- TRUE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname5 Nachname5",
+ "Name5 example net",
+ I_INC_STATUS_DELEGATED,
+ 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,
- "Vorname6 Nachname6",
- "Name6 example net",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname6 Nachname6",
+ "Name6 example net",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ 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,
- "Vorname7 Nachname7",
- "Name7 example net",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname7 Nachname7",
+ "Name7 example net",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* event */
assert_equal_timestamp("2010-08-24 10:00:00", ievent->end_date->date_time);
@@ -2837,13 +2836,13 @@ validate_kolab_event_207(const I_event *ievent, gint stage)
/* 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
@@ -2853,13 +2852,13 @@ validate_kolab_event_208(const I_event *ievent, gint stage)
/* 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
@@ -2869,40 +2868,40 @@ validate_kolab_event_500(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 4.4.2, Kolab resource",
- "libkcal-921351035.297",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-07-30 16:33:17",
- "2010-07-30 16:34:51",
- stage);
+ "KOrganizer 4.4.2, Kolab resource",
+ "libkcal-921351035.297",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-07-30 16:33:17",
+ "2010-07-30 16:34:51",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "bumsfallera",
- "hier",
- "Christian Hilberg",
- "hilberg kernelconcepts de",
- "2010-07-30 09:30:00",
- stage);
+ "bumsfallera",
+ "hier",
+ "Christian Hilberg",
+ "hilberg kernelconcepts de",
+ "2010-07-30 09:30:00",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ NULL,
+ "silvan kobalt kc local",
+ I_INC_STATUS_NONE,
+ 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,
- "Christian Hilberg",
- "hilberg kernelconcepts de",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Christian Hilberg",
+ "hilberg kernelconcepts de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE, /* TODO: Incidence: <invitation-sent> must be false, runs anyway when its true */
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
}
@@ -2914,59 +2913,59 @@ validate_kolab_event_501(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
- "libkcal-1477131994.487",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2011-03-16 08:57:00",
- "2011-03-16 08:57:00",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
+ "libkcal-1477131994.487",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2011-03-16 08:57:00",
+ "2011-03-16 08:57:00",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "erinnerunge audio",
- NULL,
- "James Kirk",
- "jkirk tarent de",
- "2011-03-16",
- stage);
+ "erinnerunge audio",
+ NULL,
+ "James Kirk",
+ "jkirk tarent de",
+ "2011-03-16",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "James Kirk",
+ "jkirk tarent de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ 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 */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_AUDIO,
- -15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_AUDIO,
+ -15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
}
void
@@ -2976,45 +2975,45 @@ validate_kolab_event_502(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
- "libkcal-1356975605.58",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2011-03-16 13:24:00",
- "2011-03-16 13:24:00",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100115.1075236), Kolab resource",
+ "libkcal-1356975605.58",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2011-03-16 13:24:00",
+ "2011-03-16 13:24:00",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Erinnerung Datei ohne Anhang",
- NULL,
- "James Kirk",
- "jkirk tarent de",
- "2011-03-15",
- stage);
+ "Erinnerung Datei ohne Anhang",
+ NULL,
+ "James Kirk",
+ "jkirk tarent de",
+ "2011-03-15",
+ stage);
/* 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 */
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "James Kirk",
+ "jkirk tarent de",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ 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,
- I_ALARM_TYPE_PROCEDURE,
- 0,
- 15,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_PROCEDURE,
+ 0,
+ 15,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
}
void
@@ -3029,31 +3028,31 @@ validate_kolab_event_503(const I_event *ievent, gint stage)
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* this is a mapped simple alarm from kolab */
mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_EMAIL,
- -15,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_EMAIL,
+ -15,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
g_assert(mail_alarm->email_param);
g_assert_cmpint(g_list_length(mail_alarm->email_param->addresses), ==, 1);
@@ -3074,31 +3073,31 @@ validate_kolab_event_504(const I_event *ievent, gint stage)
/* this is a mapped simple alarm from kolab */
assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 99,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 99,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* this is a mapped simple alarm from kolab */
mail_alarm = assert_Alarm_in_list(ievent->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- -99,
- 0,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ -99,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
(void)mail_alarm;
}
@@ -3108,31 +3107,27 @@ validate_kolab_event_505(const I_event *ievent, gint stage)
(void)stage;
validate_link_attachments(ievent->incidence->common,
- "file:///home/hhelwi/attach_test/penguin.png",
- "file:///home/hhelwi/attach_test/bluefish.png", NULL);
+ "file:///home/hhelwi/attach_test/penguin.png",
+ "file:///home/hhelwi/attach_test/bluefish.png", NULL);
validate_inline_attachment_names(ievent->incidence->common,
- "bluefish.png", "penguin.png", NULL);
+ "bluefish.png", "penguin.png", NULL);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/505.bluefish.png",
- "bluefish.png", "image/png",
- ievent->incidence->common, 0);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Calendar/505.bluefish.png",
+ "bluefish.png", "image/png",
+ ievent->incidence->common, 0);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/505.clanbomber.png",
- "bomb.png", "image/png",
- ievent->incidence->common, 1);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Calendar/505.clanbomber.png",
+ "bomb.png", "image/png",
+ ievent->incidence->common, 1);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/505.package_toys.png",
- "package_toys.png", "image/png",
- ievent->incidence->common, 2);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Calendar/505.package_toys.png",
+ "package_toys.png", "image/png",
+ ievent->incidence->common, 2);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Calendar/505.penguin.png",
- "penguin.png", "image/png",
- ievent->incidence->common, 3);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Calendar/505.penguin.png",
+ "penguin.png", "image/png",
+ ievent->incidence->common, 3);
}
void
@@ -3144,33 +3139,33 @@ validate_kolab_event_506(const I_event *ievent, gint stage)
/* common */
validate_icommon(ievent->incidence->common,
- "Evolution/libekolabconv",
- "999463355",
- NULL,
- "Feiertag",
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-07-30 14:15:10",
- "2010-07-30 14:15:10",
- stage);
+ "Evolution/libekolabconv",
+ "999463355",
+ NULL,
+ "Feiertag",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-07-30 14:15:10",
+ "2010-07-30 14:15:10",
+ stage);
/* incidence */
validate_iincidence(ievent->incidence,
- "Tag der Arbeit",
- NULL,
- "Silvan Marco Fin",
- "silvan kobalt kc local",
- "2009-05-01",
- stage);
+ "Tag der Arbeit",
+ NULL,
+ "Silvan Marco Fin",
+ "silvan kobalt kc local",
+ "2009-05-01",
+ stage);
/* 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 */
+ 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);
diff --git a/src/libekolabconv/test/src/test-kolab-note.c b/src/libekolabconv/test/src/test-kolab-note.c
index 2034aa7..1d51622 100644
--- a/src/libekolabconv/test/src/test-kolab-note.c
+++ b/src/libekolabconv/test/src/test-kolab-note.c
@@ -37,8 +37,8 @@ validate_kolab_note_100(const I_note *inote, gint stage)
g_assert(inote->common != NULL);
validate_icommon(inote->common, "Toltec Connector Open Format (2.0)",
- "TOLTEC.4BF7A3B46373482BBF3633FDF5CE1DA4",
- "Text\r\n123\r\n", NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 09:30:50", "2010-08-24 09:30:50", stage);
+ "TOLTEC.4BF7A3B46373482BBF3633FDF5CE1DA4",
+ "Text\r\n123\r\n", NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 09:30:50", "2010-08-24 09:30:50", stage);
assert_equal("Text", inote->summary);
@@ -49,10 +49,9 @@ validate_kolab_note_100(const I_note *inote, gint stage)
g_assert_cmpint(g_list_length(inote->common->kolab_attachment_store), ==, 1);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Notes/100.tnef.attach",
- NULL, "application/x-outlook-tnef",
- inote->common, 0);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Notes/100.tnef.attach",
+ NULL, "application/x-outlook-tnef",
+ inote->common, 0);
}
void
@@ -64,9 +63,9 @@ validate_kolab_note_200(const I_note *inote, gint stage)
g_assert(inote->common != NULL);
validate_icommon(inote->common, "KNotes 3.6, Kolab resource",
- "libkcal-659505129.557",
- IS_TEST_STAGE_INTERN_TO_EVO(stage) ? "\nText\n123\n" : "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\"font-size:10pt;font-family:Sans Serif\">\n<p>Text</p>\n<p><span style=\"font-weight:600\">1</span><span style=\"font-style:italic\">2</span><span style=\"text-decoration:underline\">3</span></p>\n</body></html>\n",
- NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 13:41:27", "2010-08-24 13:42:25", stage);
+ "libkcal-659505129.557",
+ IS_TEST_STAGE_INTERN_TO_EVO(stage) ? "\nText\n123\n" : "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\"font-size:10pt;font-family:Sans Serif\">\n<p>Text</p>\n<p><span style=\"font-weight:600\">1</span><span style=\"font-style:italic\">2</span><span style=\"text-decoration:underline\">3</span></p>\n</body></html>\n",
+ NULL, ICOMMON_SENSITIVITY_PUBLIC, "2010-08-24 13:41:27", "2010-08-24 13:42:25", stage);
assert_equal("Name", inote->summary);
diff --git a/src/libekolabconv/test/src/test-kolab-task.c b/src/libekolabconv/test/src/test-kolab-task.c
index 5716114..fb545d0 100644
--- a/src/libekolabconv/test/src/test-kolab-task.c
+++ b/src/libekolabconv/test/src/test-kolab-task.c
@@ -38,23 +38,23 @@ validate_kolab_task_100(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.BD18A4EC0466435FB0B5C71E0D70677C",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 13:28:30",
- "2010-08-23 13:28:30",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.BD18A4EC0466435FB0B5C71E0D70677C",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 13:28:30",
+ "2010-08-23 13:28:30",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task1",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task1",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -69,10 +69,9 @@ validate_kolab_task_100(const I_task *itask, gint stage)
g_assert_cmpint(g_list_length(itask->incidence->common->kolab_attachment_store), ==, 1);
- assert_binary_attachment_store_equal(
- "src/libekolabconv/test/resources/imap/Tasks/100.tnef.attach",
- NULL, "application/x-outlook-tnef",
- itask->incidence->common, 0);
+ assert_binary_attachment_store_equal("src/libekolabconv/test/resources/imap/Tasks/100.tnef.attach",
+ NULL, "application/x-outlook-tnef",
+ itask->incidence->common, 0);
}
void
@@ -82,23 +81,23 @@ validate_kolab_task_101(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.DC06829AFDA34005B808D375C0143DC4",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 13:29:46",
- "2010-08-23 13:29:46",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.DC06829AFDA34005B808D375C0143DC4",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 13:29:46",
+ "2010-08-23 13:29:46",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task2",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task2",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(1, priority_xkcal_to_k(itask->priority));
@@ -118,23 +117,23 @@ validate_kolab_task_102(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.CB6B1047C0644A7988056CE7E96830FD",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:33:30",
- "2010-08-23 14:51:25",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.CB6B1047C0644A7988056CE7E96830FD",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:33:30",
+ "2010-08-23 14:51:25",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task3",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task3",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(5, priority_xkcal_to_k(itask->priority));
@@ -154,23 +153,23 @@ validate_kolab_task_103(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.396476894362478781A6D65BBE8547E0",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:34:39",
- "2010-08-23 14:46:58",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.396476894362478781A6D65BBE8547E0",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:34:39",
+ "2010-08-23 14:46:58",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task4",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task4",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -190,23 +189,23 @@ validate_kolab_task_104(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.6B82E435283F4373BBA360C4AE608D82",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:35:14",
- "2010-08-23 14:46:51",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.6B82E435283F4373BBA360C4AE608D82",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:35:14",
+ "2010-08-23 14:46:51",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task5",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task5",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -226,23 +225,23 @@ validate_kolab_task_105(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.3954FA1FE6B44B8C916D3BFB44C5BA2E",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:49:09",
- "2010-08-23 14:49:09",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.3954FA1FE6B44B8C916D3BFB44C5BA2E",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:49:09",
+ "2010-08-23 14:49:09",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task6",
- NULL,
- NULL,
- NULL,
- "2010-08-25",
- stage);
+ "task6",
+ NULL,
+ NULL,
+ NULL,
+ "2010-08-25",
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -265,23 +264,23 @@ validate_kolab_task_106(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.E9A3CC6AB743483E908B81FCBE8FFA5A",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:53:17",
- "2010-08-23 15:03:50",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.E9A3CC6AB743483E908B81FCBE8FFA5A",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:53:17",
+ "2010-08-23 15:03:50",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task7",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task7",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -309,23 +308,23 @@ validate_kolab_task_107(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.F9358F55D8FD475886974C50CA2C1CF1",
- "Text\r\n123\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:53:50",
- "2010-08-23 14:53:50",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.F9358F55D8FD475886974C50CA2C1CF1",
+ "Text\r\n123\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:53:50",
+ "2010-08-23 14:53:50",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task8",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task8",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -345,23 +344,23 @@ validate_kolab_task_108(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.34F258EA2D9844BC9F51C3D4EC54F591",
- "\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PRIVATE,
- "2010-08-23 14:56:00",
- "2010-08-23 14:56:00",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.34F258EA2D9844BC9F51C3D4EC54F591",
+ "\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PRIVATE,
+ "2010-08-23 14:56:00",
+ "2010-08-23 14:56:00",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task9",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task9",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -382,23 +381,23 @@ validate_kolab_task_109(const I_task *itask, gint stage)
* 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. */
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 08:29:38",
- "2010-08-24 08:29:38",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.4808AA62322C49B5BB781EA026E36DB0",
+ 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 */
validate_iincidence(itask->incidence,
- "task11",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "task11",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -419,23 +418,23 @@ validate_kolab_task_110(const I_task *itask, gint stage)
* 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. */
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 08:35:08",
- "2010-08-24 08:35:08",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.F08D21AF4C8A4F4FB77968AF672F2A42",
+ 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 */
- validate_iincidence(itask->incidence,
- "task12",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ validate_iincidence(itask->incidence,
+ "task12",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -455,23 +454,23 @@ validate_kolab_task_111(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.C6FA75F707E74116B563FBCBB92ADC4C",
- "\r\n\r\nMaren und Max Mustermann\r\nMusterstr. 8, 12345 Musterstadt, Deutschland\r\nTel.: +49 333 88888, Fax: +49 333 88999\r\nInternet: www.example.com E-Mail: mustermann example com\r\n\r\n\r\n\r\n",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 08:37:33",
- "2010-08-24 08:37:33",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.C6FA75F707E74116B563FBCBB92ADC4C",
+ "\r\n\r\nMaren und Max Mustermann\r\nMusterstr. 8, 12345 Musterstadt, Deutschland\r\nTel.: +49 333 88888, Fax: +49 333 88999\r\nInternet: www.example.com E-Mail: mustermann example com\r\n\r\n\r\n\r\n",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 08:37:33",
+ "2010-08-24 08:37:33",
+ stage);
/* incidence */
- validate_iincidence(itask->incidence,
- "task13",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ validate_iincidence(itask->incidence,
+ "task13",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -491,23 +490,23 @@ validate_kolab_task_112(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Toltec Connector Open Format (2.0)",
- "TOLTEC.EF3F44A545B04349AC252E027EF6B4FA",
- "\r\n",
- "Blaue Kategorie,Gelbe Kategorie,GrÃne Kategorie",
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-23 14:59:20",
- "2010-08-23 14:59:20",
- stage);
+ "Toltec Connector Open Format (2.0)",
+ "TOLTEC.EF3F44A545B04349AC252E027EF6B4FA",
+ "\r\n",
+ "Blaue Kategorie,Gelbe Kategorie,GrÃne Kategorie",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-23 14:59:20",
+ "2010-08-23 14:59:20",
+ stage);
/* incidence */
- validate_iincidence(itask->incidence,
- "task10",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ validate_iincidence(itask->incidence,
+ "task10",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -529,23 +528,23 @@ validate_kolab_task_201(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-564685637.860",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 11:44:55",
- "2010-08-24 11:44:55",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-564685637.860",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 11:44:55",
+ "2010-08-24 11:44:55",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k1",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k1",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -572,23 +571,23 @@ validate_kolab_task_202(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-2048156149.312",
- "Text\n123",
- "Anwesenheit,Besonderer Anlass,Besprechung,Feiertag,Geburtstag,Gesch\303\244ftlich,Gesch\303\244ftliches,Pers\303\266nlich,Reise,Schulung,Sprintprozess,Telefonanruf,Termin,Treffen,Urlaub,Verschiedenes",
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 11:47:48",
- "2010-08-24 11:47:48",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-2048156149.312",
+ "Text\n123",
+ "Anwesenheit,Besonderer Anlass,Besprechung,Feiertag,Geburtstag,Gesch\303\244ftlich,Gesch\303\244ftliches,Pers\303\266nlich,Reise,Schulung,Sprintprozess,Telefonanruf,Termin,Treffen,Urlaub,Verschiedenes",
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 11:47:48",
+ "2010-08-24 11:47:48",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k2",
- "Adresse",
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k2",
+ "Adresse",
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -615,23 +614,23 @@ validate_kolab_task_203(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-57372580.449",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PRIVATE,
- "2010-08-24 11:52:26",
- "2010-08-24 11:52:26",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-57372580.449",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PRIVATE,
+ "2010-08-24 11:52:26",
+ "2010-08-24 11:52:26",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k3",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24",
- stage);
+ "task_k3",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24",
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -657,23 +656,23 @@ validate_kolab_task_204(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-475965571.406",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_CONFIDENTIAL,
- "2010-08-24 11:53:13",
- "2010-08-24 11:53:13",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-475965571.406",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_CONFIDENTIAL,
+ "2010-08-24 11:53:13",
+ "2010-08-24 11:53:13",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k4",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 11:52:00",
- stage);
+ "task_k4",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 11:52:00",
+ stage);
/* task */
assert_equal_int(1, priority_xkcal_to_k(itask->priority));
@@ -699,23 +698,23 @@ validate_kolab_task_205(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-2073502845.847",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 11:54:03",
- "2010-08-24 11:54:03",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-2073502845.847",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 11:54:03",
+ "2010-08-24 11:54:03",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k5",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 11:53:00",
- stage);
+ "task_k5",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 11:53:00",
+ stage);
/* task */
assert_equal_int(5, priority_xkcal_to_k(itask->priority));
@@ -742,23 +741,23 @@ validate_kolab_task_206(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1845750769.323",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 11:54:53",
- "2010-08-24 11:54:53",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1845750769.323",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 11:54:53",
+ "2010-08-24 11:54:53",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k6",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k6",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -785,23 +784,23 @@ validate_kolab_task_207(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-2105009129.534",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 11:59:26",
- "2010-08-24 11:59:26",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-2105009129.534",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 11:59:26",
+ "2010-08-24 11:59:26",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k7",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k7",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -831,37 +830,37 @@ validate_kolab_task_208(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-875220073.856",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:12:07",
- "2010-08-24 12:12:07",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-875220073.856",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:12:07",
+ "2010-08-24 12:12:07",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k8",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k8",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 0,
- -15,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 0,
+ -15,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -880,19 +879,19 @@ validate_kolab_task_208(const I_task *itask, gint stage)
/* 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");
+ 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");
+ 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");
@@ -913,36 +912,36 @@ validate_kolab_task_209(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-65962915.813",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:12:58",
- "2010-08-24 12:12:58",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-65962915.813",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:12:58",
+ "2010-08-24 12:12:58",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k9",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k9",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
assert_Alarm_in_list(itask->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 0,
- -900,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 0,
+ -900,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -970,36 +969,36 @@ validate_kolab_task_210(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-981829110.767",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:14:15",
- "2010-08-24 12:14:15",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-981829110.767",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:14:15",
+ "2010-08-24 12:14:15",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k10",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k10",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
assert_Alarm_in_list(itask->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 0,
- -21600,
- 0,
- 0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 0,
+ -21600,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1026,23 +1025,23 @@ validate_kolab_task_211(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1488850974.420",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:17:11",
- "2010-08-24 12:17:11",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1488850974.420",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:17:11",
+ "2010-08-24 12:17:11",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k11",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k11",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1069,23 +1068,23 @@ validate_kolab_task_212(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-959617369.362",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:17:48",
- "2010-08-24 12:17:48",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-959617369.362",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:17:48",
+ "2010-08-24 12:17:48",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k12",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k12",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1112,80 +1111,80 @@ validate_kolab_task_213(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-31817.817",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:27:59",
- "2010-08-24 12:27:59",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-31817.817",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:27:59",
+ "2010-08-24 12:27:59",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k13",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k13",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* attendees */
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname Nachname",
- "em il",
- I_INC_STATUS_NONE,
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname Nachname",
+ "em il",
+ I_INC_STATUS_NONE,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname2 Nachname2",
- "em il2",
- I_INC_STATUS_ACCEPTED,
- TRUE,
- FALSE,
- I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_UNDEFINED);
+ "Vorname2 Nachname2",
+ "em il2",
+ I_INC_STATUS_ACCEPTED,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_OPTIONAL, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname3 Nachname3",
- "em il3",
- I_INC_STATUS_DECLINED,
- TRUE,
- FALSE,
- I_INC_ROLE_RESOURCE, I_INC_CUTYPE_UNDEFINED);
+ "Vorname3 Nachname3",
+ "em il3",
+ I_INC_STATUS_DECLINED,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_RESOURCE, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname4 Nachname4",
- "em il4",
- I_INC_STATUS_TENTATIVE,
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname4 Nachname4",
+ "em il4",
+ I_INC_STATUS_TENTATIVE,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname5 Nachname5",
- "em il5",
- I_INC_STATUS_DELEGATED,
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname5 Nachname5",
+ "em il5",
+ I_INC_STATUS_DELEGATED,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname6 Nachname6",
- "em il6",
- I_INC_STATUS_ACCEPTED,
- TRUE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname6 Nachname6",
+ "em il6",
+ I_INC_STATUS_ACCEPTED,
+ TRUE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
assert_attendee_in_list(itask->incidence->attendee,
- "Vorname7 Nachname7",
- "em il7",
- I_INC_STATUS_ACCEPTED,
- FALSE,
- FALSE,
- I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
+ "Vorname7 Nachname7",
+ "em il7",
+ I_INC_STATUS_ACCEPTED,
+ FALSE,
+ FALSE,
+ I_INC_ROLE_REQUIRED, I_INC_CUTYPE_UNDEFINED);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1215,33 +1214,33 @@ validate_kolab_task_214(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1992675640.644",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:31:12",
- "2010-08-24 12:31:12",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1992675640.644",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:31:12",
+ "2010-08-24 12:31:12",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k14",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k14",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_DAILY,
- 3,
- 0,
- NULL,
- 0,
- 0,
- 0);
+ I_REC_CYCLE_DAILY,
+ 3,
+ 0,
+ NULL,
+ 0,
+ 0,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1272,33 +1271,33 @@ validate_kolab_task_215(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-557133945.485",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:32:18",
- "2010-08-24 12:32:18",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-557133945.485",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:32:18",
+ "2010-08-24 12:32:18",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k15",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k15",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 2,
- 0,
- NULL,
- I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 2,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY | I_COMMON_THURSDAY | I_COMMON_SUNDAY,
+ 0,
+ 0);
g_assert(itask->incidence->common->kolab_store != NULL);
@@ -1330,33 +1329,33 @@ validate_kolab_task_216(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1813144776.207",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:34:06",
- "2010-08-24 12:34:06",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1813144776.207",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:34:06",
+ "2010-08-24 12:34:06",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k16",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k16",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 2,
- 0,
- NULL,
- 0,
- 24,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 2,
+ 0,
+ NULL,
+ 0,
+ 24,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1386,33 +1385,33 @@ validate_kolab_task_217(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1099303233.392",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:34:30",
- "2010-08-24 12:34:30",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1099303233.392",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:34:30",
+ "2010-08-24 12:34:30",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k17",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k17",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 1,
- 0,
- NULL,
- 0,
- 31,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 31,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1442,33 +1441,33 @@ validate_kolab_task_218(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1899014988.736",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:35:51",
- "2010-08-24 12:35:51",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1899014988.736",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:35:51",
+ "2010-08-24 12:35:51",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k18",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k18",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 1,
- 0,
- NULL,
- 0,
- -1,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 1,
+ 0,
+ NULL,
+ 0,
+ -1,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1498,33 +1497,33 @@ validate_kolab_task_219(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1604395120.121",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:36:49",
- "2010-08-24 12:36:49",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1604395120.121",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:36:49",
+ "2010-08-24 12:36:49",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k19",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k19",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_DAYNUMBER,
- 1,
- 0,
- NULL,
- 0,
- -5,
- 0);
+ I_REC_CYCLE_MONTHLY_DAYNUMBER,
+ 1,
+ 0,
+ NULL,
+ 0,
+ -5,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1554,33 +1553,33 @@ validate_kolab_task_220(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1644058209.390",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:37:51",
- "2010-08-24 12:37:51",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1644058209.390",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:37:51",
+ "2010-08-24 12:37:51",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k20",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k20",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_WEDNESDAY,
- 3,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_WEDNESDAY,
+ 3,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1610,33 +1609,33 @@ validate_kolab_task_221(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1721553616.1041",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:38:27",
- "2010-08-24 12:38:27",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1721553616.1041",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:38:27",
+ "2010-08-24 12:38:27",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k21",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k21",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 2,
- 0,
- NULL,
- I_COMMON_TUESDAY,
- -1,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 2,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY,
+ -1,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1666,33 +1665,33 @@ validate_kolab_task_222(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1644716785.216",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:39:24",
- "2010-08-24 12:39:24",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1644716785.216",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:39:24",
+ "2010-08-24 12:39:24",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k22",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k22",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_MONTHLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_FRIDAY,
- -5,
- 0);
+ I_REC_CYCLE_MONTHLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_FRIDAY,
+ -5,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1722,33 +1721,33 @@ validate_kolab_task_223(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1609928323.626",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:43:29",
- "2010-08-24 12:43:29",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1609928323.626",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:43:29",
+ "2010-08-24 12:43:29",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k23",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24 10:30:00",
- stage);
+ "task_k23",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24 10:30:00",
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 2,
- 0,
- NULL,
- 0,
- 24,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 2,
+ 0,
+ NULL,
+ 0,
+ 24,
+ I_COMMON_AUG);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1778,34 +1777,34 @@ validate_kolab_task_224(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-674787867.159",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:44:31",
- "2010-08-24 12:44:31",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-674787867.159",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:44:31",
+ "2010-08-24 12:44:31",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k24",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-02-28 12:44:31",
- stage);
+ "task_k24",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-02-28 12:44:31",
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 1,
- 0,
- NULL,
- 0,
- 28,
- I_COMMON_FEB);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 28,
+ I_COMMON_FEB);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -1835,34 +1834,34 @@ validate_kolab_task_225(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-98450016.195",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:47:03",
- "2010-08-24 12:47:03",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-98450016.195",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:47:03",
+ "2010-08-24 12:47:03",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k25",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k25",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
#if 0
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- Tuesday,
- 4,
- I_COMMON_MAR);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ Tuesday,
+ 4,
+ I_COMMON_MAR);
#endif
/* task */
@@ -1895,34 +1894,34 @@ validate_kolab_task_226(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-415677569.335",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:48:04",
- "2010-08-24 12:48:04",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-415677569.335",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:48:04",
+ "2010-08-24 12:48:04",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k26",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k26",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
#if 0
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- Friday,
- 5,
- I_COMMON_APR);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ Friday,
+ 5,
+ I_COMMON_APR);
#endif
/* task */
@@ -1955,33 +1954,33 @@ validate_kolab_task_227(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-764657317.114",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:48:46",
- "2010-08-24 12:48:46",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-764657317.114",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:48:46",
+ "2010-08-24 12:48:46",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k27",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-24",
- stage);
+ "task_k27",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-24",
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 1,
- 0,
- NULL,
- 0,
- 24,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 24,
+ I_COMMON_AUG);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2011,33 +2010,33 @@ validate_kolab_task_228(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1997930013.160",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:49:26",
- "2010-08-24 12:49:26",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1997930013.160",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:49:26",
+ "2010-08-24 12:49:26",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k28",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- "2010-08-29 11:53:00",
- stage);
+ "task_k28",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ "2010-08-29 11:53:00",
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_WEEKDAY,
- 1,
- 0,
- NULL,
- I_COMMON_SUNDAY,
- -5,
- I_COMMON_AUG);
+ I_REC_CYCLE_YEARLY_WEEKDAY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_SUNDAY,
+ -5,
+ I_COMMON_AUG);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2069,33 +2068,33 @@ validate_kolab_task_229(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1382625299.123",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:50:02",
- "2010-08-24 12:50:02",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1382625299.123",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:50:02",
+ "2010-08-24 12:50:02",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k29",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k29",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_YEARDAY,
- 1,
- 0,
- NULL,
- 0,
- 236,
- 0);
+ I_REC_CYCLE_YEARLY_YEARDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 236,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2125,33 +2124,33 @@ validate_kolab_task_230(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-284542898.784",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:51:12",
- "2010-08-24 12:51:12",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-284542898.784",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:51:12",
+ "2010-08-24 12:51:12",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k30",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k30",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_YEARDAY,
- 1,
- 0,
- NULL,
- 0,
- 366,
- 0);
+ I_REC_CYCLE_YEARLY_YEARDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 366,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2181,33 +2180,33 @@ validate_kolab_task_231(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-661442993.263",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:51:56",
- "2010-08-24 12:51:56",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-661442993.263",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:51:56",
+ "2010-08-24 12:51:56",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k31",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k31",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 3,
- NULL,
- I_COMMON_TUESDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 3,
+ NULL,
+ I_COMMON_TUESDAY,
+ 0,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2238,33 +2237,33 @@ validate_kolab_task_232(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-695549868.242",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:52:34",
- "2010-08-24 12:52:34",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-695549868.242",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:52:34",
+ "2010-08-24 12:52:34",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k32",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k32",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- rdate,
- I_COMMON_TUESDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ rdate,
+ I_COMMON_TUESDAY,
+ 0,
+ 0);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2294,33 +2293,33 @@ validate_kolab_task_233(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-1794627645.771",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:53:25",
- "2010-08-24 12:53:25",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-1794627645.771",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:53:25",
+ "2010-08-24 12:53:25",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k33",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k33",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_WEEKLY,
- 1,
- 0,
- NULL,
- I_COMMON_TUESDAY,
- 0,
- 0);
+ I_REC_CYCLE_WEEKLY,
+ 1,
+ 0,
+ NULL,
+ I_COMMON_TUESDAY,
+ 0,
+ 0);
/* recurrence exclusions */
/* TODO Double free problem, free function for exclusions commented in struct. */
@@ -2390,34 +2389,34 @@ validate_kolab_task_236(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
- "libkcal-674787867.159",
- NULL,
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2010-08-24 12:44:31",
- "2010-08-24 12:44:31",
- stage);
+ "KOrganizer 3.5.9 (enterprise35 20100805.1161816), Kolab resource",
+ "libkcal-674787867.159",
+ NULL,
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2010-08-24 12:44:31",
+ "2010-08-24 12:44:31",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "task_k24",
- NULL,
- "Hendrik Helwich",
- "h helwich tarent de",
- NULL,
- stage);
+ "task_k24",
+ NULL,
+ "Hendrik Helwich",
+ "h helwich tarent de",
+ NULL,
+ stage);
/* recurrence */
#if 0
validate_recurrence(itask->incidence->recurrence,
- I_REC_CYCLE_YEARLY_MONTHDAY,
- 1,
- 0,
- NULL,
- 0,
- 28,
- I_COMMON_FEB);
+ I_REC_CYCLE_YEARLY_MONTHDAY,
+ 1,
+ 0,
+ NULL,
+ 0,
+ 28,
+ I_COMMON_FEB);
#endif
/* task */
@@ -2444,17 +2443,17 @@ validate_kolab_task_502(const I_task *itask, gint stage)
/* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
- I_ALARM_TYPE_DISPLAY,
- 0,
- -42,
- 0,
- 0,
- "test\ntext\n123",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_DISPLAY,
+ 0,
+ -42,
+ 0,
+ 0,
+ "test\ntext\n123",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
}
@@ -2467,23 +2466,23 @@ validate_kolab_task_503(const I_task *itask, gint stage)
/* common */
validate_icommon(itask->incidence->common,
- "Horde::Kolab",
- "a5caed56de89c80cac676dc4284d81f7",
- "line1\r\n\\tline2",
- NULL,
- ICOMMON_SENSITIVITY_PUBLIC,
- "2011-08-23 11:29:29",
- "2011-08-23 11:29:29",
- stage);
+ "Horde::Kolab",
+ "a5caed56de89c80cac676dc4284d81f7",
+ "line1\r\n\\tline2",
+ NULL,
+ ICOMMON_SENSITIVITY_PUBLIC,
+ "2011-08-23 11:29:29",
+ "2011-08-23 11:29:29",
+ stage);
/* incidence */
validate_iincidence(itask->incidence,
- "summary?",
- NULL,
- NULL,
- NULL,
- NULL,
- stage);
+ "summary?",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ stage);
/* task */
assert_equal_int(3, priority_xkcal_to_k(itask->priority));
@@ -2515,15 +2514,15 @@ validate_kolab_task_3286494(const I_task *itask, gint stage)
/* advanced alarms */
assert_Alarm_in_list(itask->incidence->advanced_alarm,
- I_ALARM_TYPE_PROCEDURE,
- 0,
- -15,
- 1,
- 1,
- NULL,
- NULL,
- "/home/ialexa/reinschrift.odt",
- NULL,
- NULL,
- NULL);
+ I_ALARM_TYPE_PROCEDURE,
+ 0,
+ -15,
+ 1,
+ 1,
+ NULL,
+ NULL,
+ "/home/ialexa/reinschrift.odt",
+ NULL,
+ NULL,
+ NULL);
}
diff --git a/src/libekolabconv/test/src/test-util.c b/src/libekolabconv/test/src/test-util.c
index f6188c2..42db8d9 100644
--- a/src/libekolabconv/test/src/test-util.c
+++ b/src/libekolabconv/test/src/test-util.c
@@ -85,9 +85,9 @@ assert_equal_gdate(gchar *expected, GDate *gdate)
}
gstr = g_strdup_printf("%04d-%02d-%02d",
- g_date_get_year (gdate),
- g_date_get_month (gdate),
- g_date_get_day (gdate));
+ g_date_get_year (gdate),
+ g_date_get_month (gdate),
+ g_date_get_day (gdate));
gstr_new = g_string_new(gstr);
assert_equal(expected, gstr_new);
@@ -107,12 +107,12 @@ assert_equal_timestamp(gchar *expected, time_t *timestamp)
ts = gmtime(timestamp);
tstr = g_strdup_printf("%04d-%02d-%02d %02d:%02d:%02d",
- ts->tm_year + 1900,
- ts->tm_mon + 1,
- ts->tm_mday,
- ts->tm_hour,
- ts->tm_min,
- ts->tm_sec);
+ ts->tm_year + 1900,
+ ts->tm_mon + 1,
+ ts->tm_mday,
+ ts->tm_hour,
+ ts->tm_min,
+ ts->tm_sec);
g_debug("testing if string value '%s' is equal to expected value '%s'", tstr, expected);
@@ -155,17 +155,15 @@ assert_phone_in_list (GList *phone_nrs, gchar *nr_expected, Icontact_phone_type
if (p != NULL) {
g_debug ("testing if type '%d' matches expected type '%d'", p->type, type_expected);
- if (p->type == type_expected)
- {
+ if (p->type == type_expected) {
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);
+ p->number, nr_expected ? nr_expected : NULL);
g_assert (p->number != NULL);
g_assert (nr_expected != NULL);
- if (strcmp (p->number, nr_expected) == 0)
- {
+ if (strcmp (p->number, nr_expected) == 0) {
g_debug ("matching number '%s' found", nr_expected);
matched_number = 1;
ret = p;
@@ -246,13 +244,13 @@ assert_email_in_list (GList *emails, gchar *smtp_address_exp, gchar *display_nam
Address*
assert_address_in_list (GList *addresses,
- Icontact_address_type type,
- gchar *street,
- gchar *pobox,
- gchar *locality,
- gchar *region,
- gchar *postal_code,
- gchar *country)
+ Icontact_address_type type,
+ gchar *street,
+ gchar *pobox,
+ gchar *locality,
+ gchar *region,
+ gchar *postal_code,
+ gchar *country)
{
(void)type;
@@ -326,11 +324,11 @@ assert_address_in_list (GList *addresses,
}
if (matched_street == 1
- && matched_pobox == 1
- && matched_locality == 1
- && matched_region == 1
- && matched_postal_code == 1
- && matched_country == 1) {
+ && matched_pobox == 1
+ && matched_locality == 1
+ && matched_region == 1
+ && matched_postal_code == 1
+ && matched_country == 1) {
return addr;
}
@@ -342,61 +340,60 @@ assert_address_in_list (GList *addresses,
Alarm*
assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint start_offset, gint end_offset,
- gint repeat_count, gint repeat_interval, gchar *display_text, gchar *audio_file,
- gchar *proc_param_program, gchar *proc_param_arguments,
- gchar *email_param_subject, gchar *email_param_mail_text)
+ gint repeat_count, gint repeat_interval, gchar *display_text, gchar *audio_file,
+ 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;
- gint failed = 0; /* bitmap for error location */
- char *bm = NULL;
-
- g_assert (alarm != NULL);
-
- g_debug ("advancedAlarm values: "
- "AlarmType: %i, "
- "start_offset: %i, "
- "end_offset: %i, "
- "repeat_count: %i, "
- "repeat_interval: %i, "
- "display_text: '%s', "
- "audio_file: '%s', "
- "proc_param_program: '%s', "
- "proc_param_arguments: '%s', "
- "email_param_subject: '%s', "
- "email_param_mail_text: '%s'",
- alarm->type, alarm->start_offset, alarm->end_offset, alarm->repeat_count,
- alarm->repeat_interval, alarm->display_text ? alarm->display_text->str : "NULL",
- alarm->audio_file ? alarm->audio_file->str : "NULL",
- alarm->proc_param && alarm->proc_param->program ? alarm->proc_param->program->str : "NULL",
- alarm->proc_param && alarm->proc_param->arguments ? alarm->proc_param->arguments->str : "NULL",
- 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");
-
- CHECK_FAILED(alarm->type == type, failed, 1);
- CHECK_FAILED(alarm->start_offset == start_offset, failed, 2);
- CHECK_FAILED(alarm->end_offset == end_offset, failed, 3);
- CHECK_FAILED(alarm->repeat_count == repeat_count, failed, 4);
- CHECK_FAILED(alarm->repeat_interval == repeat_interval, failed, 5);
- CHECK_FAILED(display_text == NULL || strcmp(alarm->display_text->str, display_text) == 0, failed, 6);
- 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() */
- 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() */
-
- bm = int_to_bitmask(failed);
- g_debug ("checks for alarm: %s", bm);
- g_free(bm);
-
- if (!failed)
- return alarm;
-
- advancedAlarm = advancedAlarm->next;
+ Alarm *alarm = advancedAlarm->data;
+ gint failed = 0; /* bitmap for error location */
+ char *bm = NULL;
+
+ g_assert (alarm != NULL);
+
+ g_debug ("advancedAlarm values: "
+ "AlarmType: %i, "
+ "start_offset: %i, "
+ "end_offset: %i, "
+ "repeat_count: %i, "
+ "repeat_interval: %i, "
+ "display_text: '%s', "
+ "audio_file: '%s', "
+ "proc_param_program: '%s', "
+ "proc_param_arguments: '%s', "
+ "email_param_subject: '%s', "
+ "email_param_mail_text: '%s'",
+ alarm->type, alarm->start_offset, alarm->end_offset, alarm->repeat_count,
+ alarm->repeat_interval, alarm->display_text ? alarm->display_text->str : "NULL",
+ alarm->audio_file ? alarm->audio_file->str : "NULL",
+ alarm->proc_param && alarm->proc_param->program ? alarm->proc_param->program->str : "NULL",
+ alarm->proc_param && alarm->proc_param->arguments ? alarm->proc_param->arguments->str : "NULL",
+ 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");
+
+ CHECK_FAILED(alarm->type == type, failed, 1);
+ CHECK_FAILED(alarm->start_offset == start_offset, failed, 2);
+ CHECK_FAILED(alarm->end_offset == end_offset, failed, 3);
+ CHECK_FAILED(alarm->repeat_count == repeat_count, failed, 4);
+ CHECK_FAILED(alarm->repeat_interval == repeat_interval, failed, 5);
+ CHECK_FAILED(display_text == NULL || strcmp(alarm->display_text->str, display_text) == 0, failed, 6);
+ 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() */
+ 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() */
+
+ bm = int_to_bitmask(failed);
+ g_debug ("checks for alarm: %s", bm);
+ g_free(bm);
+
+ if (!failed)
+ return alarm;
+
+ advancedAlarm = advancedAlarm->next;
}
g_debug ("no matching alarm found in list");
@@ -408,7 +405,7 @@ assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint start_offset,
void
assert_attendee_in_list(GList *attendees, gchar *display_name, gchar *smtp_address, Incidence_status status,
- gboolean request_response, gboolean invitation_sent, Incidence_role role, Incidence_cutype type)
+ gboolean request_response, gboolean invitation_sent, Incidence_role role, Incidence_cutype type)
{
while (attendees != NULL) {
Attendee *attendee = attendees->data;
@@ -434,8 +431,7 @@ assert_attendee_in_list(GList *attendees, gchar *display_name, gchar *smtp_addre
void
assert_GDate_in_list(GList *date_list, gchar *value)
{
- while (date_list != NULL)
- {
+ while (date_list != NULL) {
gchar *gstr = NULL;
GDate *date_element = date_list->data;
@@ -463,8 +459,7 @@ assert_GDate_in_list(GList *date_list, gchar *value)
void
assert_String_in_list(GList *string_list, gchar *value)
{
- while (string_list != NULL)
- {
+ while (string_list != NULL) {
gchar *element = string_list->data;
g_assert (element != NULL);
if (strcmp(element, value) == 0) {
@@ -493,8 +488,8 @@ assert_custom_field_in_list (GList *custom_list, gchar *custom_field_type, gchar
/* 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,
- gchar* start_date, gint stage)
+ gchar *organizer_display_name, gchar *organizer_smtp_address,
+ gchar* start_date, gint stage)
{
(void)stage;
@@ -523,7 +518,7 @@ validate_iincidence(const I_incidence *iincidence, gchar *summary, gchar *locati
void
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)
+ 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 */
@@ -558,25 +553,20 @@ validate_icommon(const I_common *icommon, gchar* exp_product_id, gchar* exp_uid,
g_assert(icommon->last_modified_datetime != NULL);
g_assert(icommon->last_modified_datetime->date_time != NULL);
- if(exp_creation_date != NULL && exp_last_modification_date != NULL)
- {
+ if(exp_creation_date != NULL && exp_last_modification_date != NULL) {
assert_equal_timestamp(exp_creation_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)
- {
+ else if(exp_creation_date == NULL && exp_last_modification_date != NULL) {
/* 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)
- {
+ else if(exp_creation_date != NULL && exp_last_modification_date == NULL) {
/* 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
- {
+ } else {
/* 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);
@@ -586,22 +576,22 @@ validate_icommon(const I_common *icommon, gchar* exp_product_id, gchar* exp_uid,
void
validate_recurrence(const Recurrence *recurrence, Recurrence_cycle cycle,
- gint interval, gint range_number, gint *range_date, gint weekdays,
- gint day_number, Month month)
+ gint interval, gint range_number, gint *range_date, gint weekdays,
+ gint day_number, Month month)
{
g_assert(recurrence != NULL);
g_debug("recurrence (expected): recurrence_cycle: %i (%i), interval: %i (%i), range_number: %i (%i), "
- "range_date %i-%i-%i (%i-%i-%i), weekdays: %i (%i), day_number: %i (%i), Month: %i (%i)",
- recurrence->recurrence_cycle, cycle,
- recurrence->interval, interval,
- recurrence->range_number ? *recurrence->range_number : 0, range_number,
- recurrence->range_date ? recurrence->range_date->year : 0, range_date ? *(range_date+2) : 0,
- recurrence->range_date ? recurrence->range_date->month : 0, range_date ? *(range_date+1) : 0,
- recurrence->range_date ? recurrence->range_date->day : 0, range_date ? *range_date : 0,
- recurrence->weekdays, weekdays,
- recurrence->day_number, day_number,
- recurrence->month, month);
+ "range_date %i-%i-%i (%i-%i-%i), weekdays: %i (%i), day_number: %i (%i), Month: %i (%i)",
+ recurrence->recurrence_cycle, cycle,
+ recurrence->interval, interval,
+ recurrence->range_number ? *recurrence->range_number : 0, range_number,
+ recurrence->range_date ? recurrence->range_date->year : 0, range_date ? *(range_date+2) : 0,
+ recurrence->range_date ? recurrence->range_date->month : 0, range_date ? *(range_date+1) : 0,
+ recurrence->range_date ? recurrence->range_date->day : 0, range_date ? *range_date : 0,
+ recurrence->weekdays, weekdays,
+ recurrence->day_number, day_number,
+ recurrence->month, month);
g_assert(recurrence->recurrence_cycle == cycle);
g_assert(recurrence->interval == interval);
@@ -690,8 +680,7 @@ gchar
gchar *bitmask = g_new0(gchar, digits + digits/8);
- while (digits--)
- {
+ while (digits--) {
if (pos && (digits+1) % 8 == 0)
bitmask[pos++] = ' ';
@@ -764,40 +753,40 @@ strip_cr_cpy(const gchar *s)
*d++ = *s;
} while (*s++);
- return cpy;
+ return cpy;
}
void
validate_link_attachments(const I_common *icommon, ...)
{
- va_list ap;
- gchar* v1, *v2;
- GList *lal = icommon->link_attachments;
+ va_list ap;
+ gchar* v1, *v2;
+ GList *lal = icommon->link_attachments;
va_start(ap, icommon);
- for (; lal != NULL; lal = lal->next) {
- v1 = (gchar*) lal->data;
- v2 = va_arg(ap, gchar*);
- g_assert_cmpstr (v1, ==, v2);
- }
+ for (; lal != NULL; lal = lal->next) {
+ v1 = (gchar*) lal->data;
+ v2 = va_arg(ap, gchar*);
+ g_assert_cmpstr (v1, ==, v2);
+ }
v2 = va_arg(ap, gchar*);
g_assert(v2 == NULL);
- va_end(ap);
+ va_end(ap);
}
void
validate_inline_attachment_names(const I_common *icommon, ...)
{
- va_list ap;
- gchar* v1, *v2;
- GList *lal = icommon->inline_attachment_names;
+ va_list ap;
+ gchar* v1, *v2;
+ GList *lal = icommon->inline_attachment_names;
va_start(ap, icommon);
- for (; lal != NULL; lal = lal->next) {
- v1 = (gchar*) lal->data;
- v2 = va_arg(ap, gchar*);
- g_assert_cmpstr (v1, ==, v2);
- }
+ for (; lal != NULL; lal = lal->next) {
+ v1 = (gchar*) lal->data;
+ v2 = va_arg(ap, gchar*);
+ g_assert_cmpstr (v1, ==, v2);
+ }
v2 = va_arg(ap, gchar*);
g_assert(v2 == NULL);
- va_end(ap);
+ va_end(ap);
}
diff --git a/src/libekolabconv/test/src/test-util.h b/src/libekolabconv/test/src/test-util.h
index f174ac5..6db7f3f 100644
--- a/src/libekolabconv/test/src/test-util.h
+++ b/src/libekolabconv/test/src/test-util.h
@@ -50,32 +50,32 @@ Phone_number *assert_phone_in_list (GList *phone_nrs, gchar *nr_expected, Iconta
Email *assert_email_in_list (GList *emails, gchar *smtp_address_exp, gchar *display_name_exp);
Address *assert_address_in_list (GList *addresses, Icontact_address_type type, gchar *street, gchar *pobox,
- gchar *locality, gchar *region, gchar *postal_code, gchar *country);
+ gchar *locality, gchar *region, gchar *postal_code, gchar *country);
void assert_String_in_list(GList *string_list, gchar *value);
void assert_custom_field_in_list (GList *custom_list, gchar *custom_field_type, gchar *custom_field_name, gchar *field_value_exp);
Alarm* assert_Alarm_in_list (GList *advancedAlarm, Alarm_type type, gint startOffset, gint endOffset,
- gint repeatCount, gint repeatInterval, gchar *displayText, gchar *audioFile,
- gchar *procParam_program, gchar *procParam_arguments,
- gchar *emailParam_subject, gchar *emailParam_mailText);
+ gint repeatCount, gint repeatInterval, gchar *displayText, gchar *audioFile,
+ gchar *procParam_program, gchar *procParam_arguments,
+ gchar *emailParam_subject, gchar *emailParam_mailText);
void assert_attendee_in_list(GList *attendees, gchar *display_name, gchar *smtp_address, Incidence_status status,
- gboolean requestResponse, gboolean invitationSent, Incidence_role role, Incidence_cutype type);
+ gboolean requestResponse, gboolean invitationSent, Incidence_role role, Incidence_cutype type);
void assert_GDate_in_list(GList *date_list, gchar *value);
void validate_iincidence(const I_incidence *iincidence, gchar *summary, gchar *location,
- gchar *organizerDisplayName, gchar *organizerSmtpAddress,
- gchar* startDate, gint stage);
+ gchar *organizerDisplayName, gchar *organizerSmtpAddress,
+ gchar* startDate, gint stage);
void validate_icommon(const I_common *icommon, gchar* product_id, gchar* uid,
- gchar *body, gchar *categories, Sensitivity sensitivity, gchar *creation_date, gchar *last_modification_date, gint stage);
+ gchar *body, gchar *categories, Sensitivity sensitivity, gchar *creation_date, gchar *last_modification_date, gint stage);
void validate_recurrence(const Recurrence *recurrence, Recurrence_cycle cycle,
- gint interval, gint rangeNumber, gint *rangeDate, gint weekdays,
- gint dayNumber, Month month);
+ gint interval, gint rangeNumber, gint *rangeDate, gint weekdays,
+ gint dayNumber, Month month);
void assert_binary_attachment_equal(gchar *exp_data_file_name, gchar *name_exp, gchar *mime_type_exp, Kolab_conv_mail_part *value);
@@ -95,6 +95,6 @@ void strip_cr(char *s);
char *strip_cr_cpy(const char *s);
void assert_binary_attachment_store_equal(gchar *exp_data_file_name, gchar *name_exp, gchar *mime_type_exp,
- I_common *icommon, gint idx);
+ I_common *icommon, gint idx);
#endif /* TEST_UTIL_H_ */
diff --git a/src/libekolabutil/kolab-util-camel.c b/src/libekolabutil/kolab-util-camel.c
index 72cff4e..2e539a3 100644
--- a/src/libekolabutil/kolab-util-camel.c
+++ b/src/libekolabutil/kolab-util-camel.c
@@ -55,8 +55,8 @@ kolab_util_camel_init (GError **err)
/* init Camel subsystem */
if (camel_init (e_get_user_data_dir (), TRUE) != 0) {
g_set_error (err,
- KOLAB_CAMEL_ERROR,
- KOLAB_CAMEL_ERROR_GENERIC,
+ KOLAB_CAMEL_ERROR,
+ KOLAB_CAMEL_ERROR_GENERIC,
_("Failed to initialize Camel subsystem"));
return FALSE;
}
@@ -97,8 +97,8 @@ kolab_util_camel_get_storage_path (CamelService *service,
if (store_path == NULL) {
/* FIXME mark this as a translatable string */
g_set_error (err,
- KOLAB_CAMEL_KOLAB_ERROR,
- KOLAB_CAMEL_KOLAB_ERROR_DB,
+ KOLAB_CAMEL_KOLAB_ERROR,
+ KOLAB_CAMEL_KOLAB_ERROR_DB,
"Could not get Camel storage path");
}
diff --git a/src/libekolabutil/kolab-util-error.c b/src/libekolabutil/kolab-util-error.c
index b2e0746..4cb24cb 100644
--- a/src/libekolabutil/kolab-util-error.c
+++ b/src/libekolabutil/kolab-util-error.c
@@ -33,14 +33,14 @@
GQuark
kolab_camel_error_quark (void)
{
- static GQuark quark = 0;
+ static GQuark quark = 0;
- if (G_UNLIKELY (quark == 0)) {
- const gchar *string = "camel-imapx-error-quark";
- quark = g_quark_from_static_string (string);
- }
+ if (G_UNLIKELY (quark == 0)) {
+ const gchar *string = "camel-imapx-error-quark";
+ quark = g_quark_from_static_string (string);
+ }
- return quark;
+ return quark;
}
/*----------------------------------------------------------------------------*/
@@ -49,14 +49,14 @@ kolab_camel_error_quark (void)
GQuark
kolab_camel_kolab_error_quark (void)
{
- static GQuark quark = 0;
+ static GQuark quark = 0;
- if (G_UNLIKELY (quark == 0)) {
- const gchar *string = "camel-kolab-error-quark";
- quark = g_quark_from_static_string (string);
- }
+ if (G_UNLIKELY (quark == 0)) {
+ const gchar *string = "camel-kolab-error-quark";
+ quark = g_quark_from_static_string (string);
+ }
- return quark;
+ return quark;
}
/*----------------------------------------------------------------------------*/
@@ -65,15 +65,14 @@ kolab_camel_kolab_error_quark (void)
GQuark
kolab_util_error_quark (void)
{
- static GQuark quark = 0;
+ static GQuark quark = 0;
- if (G_UNLIKELY (quark == 0)) {
- const gchar *string = "kolab-util--error-quark";
- quark = g_quark_from_static_string (string);
- }
+ if (G_UNLIKELY (quark == 0)) {
+ const gchar *string = "kolab-util--error-quark";
+ quark = g_quark_from_static_string (string);
+ }
- return quark;
+ return quark;
}
/*----------------------------------------------------------------------------*/
-
diff --git a/src/libekolabutil/kolab-util-folder.c b/src/libekolabutil/kolab-util-folder.c
index 3f79dd9..796801f 100644
--- a/src/libekolabutil/kolab-util-folder.c
+++ b/src/libekolabutil/kolab-util-folder.c
@@ -87,7 +87,7 @@ kolab_util_folder_init (void)
{
if (kolab_util_folder_is_initialized)
return;
-
+
kolab_util_folder_type_map_init ();
kolab_util_folder_is_initialized = TRUE;
@@ -98,7 +98,7 @@ kolab_util_folder_shutdown (void)
{
if (! kolab_util_folder_is_initialized)
return;
-
+
kolab_util_folder_type_map_uninit ();
kolab_util_folder_is_initialized = FALSE;
@@ -167,24 +167,24 @@ kolab_util_folder_type_match_with_context_id (KolabFolderTypeID type_id,
(context_id < KOLAB_FOLDER_LAST_CONTEXT));
switch (context_id) {
- case KOLAB_FOLDER_CONTEXT_EMAIL:
- if ((type_id < KOLAB_FOLDER_TYPE_UNKNOWN) ||
- (type_id > KOLAB_FOLDER_TYPE_EMAIL_JUNKEMAIL))
- return FALSE;
- break;
- case KOLAB_FOLDER_CONTEXT_CALENDAR:
- if ((type_id < KOLAB_FOLDER_TYPE_EVENT) ||
- (type_id > KOLAB_FOLDER_TYPE_NOTE_DEFAULT))
- return FALSE;
- break;
- case KOLAB_FOLDER_CONTEXT_CONTACT:
- if ((type_id < KOLAB_FOLDER_TYPE_CONTACT) ||
- (type_id > KOLAB_FOLDER_TYPE_CONTACT_DEFAULT))
- return FALSE;
- break;
- default:
- /* can't happen */
- g_assert_not_reached ();
+ case KOLAB_FOLDER_CONTEXT_EMAIL:
+ if ((type_id < KOLAB_FOLDER_TYPE_UNKNOWN) ||
+ (type_id > KOLAB_FOLDER_TYPE_EMAIL_JUNKEMAIL))
+ return FALSE;
+ break;
+ case KOLAB_FOLDER_CONTEXT_CALENDAR:
+ if ((type_id < KOLAB_FOLDER_TYPE_EVENT) ||
+ (type_id > KOLAB_FOLDER_TYPE_NOTE_DEFAULT))
+ return FALSE;
+ break;
+ case KOLAB_FOLDER_CONTEXT_CONTACT:
+ if ((type_id < KOLAB_FOLDER_TYPE_CONTACT) ||
+ (type_id > KOLAB_FOLDER_TYPE_CONTACT_DEFAULT))
+ return FALSE;
+ break;
+ default:
+ /* can't happen */
+ g_assert_not_reached ();
}
return TRUE;
diff --git a/src/libekolabutil/kolab-util-kconv.c b/src/libekolabutil/kolab-util-kconv.c
index bc0b4e9..23793be 100644
--- a/src/libekolabutil/kolab-util-kconv.c
+++ b/src/libekolabutil/kolab-util-kconv.c
@@ -169,7 +169,7 @@ kolab_util_kconv_kconvmail_checksum (const Kolab_conv_mail *kconvmail)
/* we need to do checksumming over all members of the
* Kolab_conv_mail_parts, which includes the part
* name and mimetype (we do need to catch changes in
- * these parts since it also means "changed data set,
+ * these parts since it also means "changed data set,
* even if the actual payload data did not change)
*/
diff --git a/src/libekolabutil/kolab-util-sqlite.c b/src/libekolabutil/kolab-util-sqlite.c
index e30504d..15cc711 100644
--- a/src/libekolabutil/kolab-util-sqlite.c
+++ b/src/libekolabutil/kolab-util-sqlite.c
@@ -240,7 +240,7 @@ kolab_util_sqlite_db_close (KolabUtilSqliteDb *kdb,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
_("SQLite Error: %s"),
- sqlite3_errmsg (kdb->db));
+ sqlite3_errmsg (kdb->db));
return FALSE;
}
kdb->db = NULL;
@@ -356,7 +356,7 @@ kolab_util_sqlite_table_get_rowcount (KolabUtilSqliteDb *kdb,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
_("SQLite Error: %s"),
- sqlite3_errmsg (kdb->db));
+ sqlite3_errmsg (kdb->db));
(void)kolab_util_sqlite_fnlz_stmt (kdb, sql_stmt, NULL);
return -1;
}
diff --git a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
index e780461..f8c65d9 100644
--- a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
+++ b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
@@ -95,7 +95,7 @@ kolab_itest_fb_init (KolabITestFB *kitfb, GKeyFile *key_file)
* O_RD,
* NULL);
* g_assert (kitfb->cmp_fs != NULL);
- */
+ */
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
