Changeset 1052

Timestamp:

06/12/06 10:49:11 (2 years ago)

Author:

cstender

Message:

removed sync_vtype() completely from irmc_sync.c

Files:

• branches/irmc-development/src/irmc_sync.c (modified) (16 diffs)

branches/irmc-development/src/irmc_sync.c

@@ -30 +30 @@
 #include <libxml/parser.h>
 
-#include "sync_vtype.h"
 #include "irmc_sync.h"
 #include "irmc_bluetooth.h"
@@ -915 +914 @@
 {
   osync_trace(TRACE_ENTRY, "%s(%i, %p, %s, %s, %i)", __func__, sync_type, ctx, data, luid, type);
-  char *converted_event = NULL;
 
   irmc_environment *env = (irmc_environment *)osync_context_get_plugin_data(ctx);
-//  irmc_config *config = &(env->config);
+  irmc_config *config = &(env->config);
 
   if (sync_type == SLOW_SYNC) {
@@ -971 +969 @@
           }
         }
-
-        /* XXX drop sync_vtype_* functions. 
-        converted_event = sync_vtype_convert(event, 0 | (config->fixdst ? VOPTION_FIXDSTFROMCLIENT : 0) |
-                                                        (config->translatecharset ? VOPTION_FIXCHARSET : 0) |
-                                                        VOPTION_CALENDAR1TO2 |
-                                                        (config->alarmfromirmc ? 0 : VOPTION_REMOVEALARM) |
-                                                        VOPTION_CONVERTUTC, config->charset);
-        */                                              
-        // use original vcard (data) instead modifieded
-        converted_event = strdup(data);
-        event_size = strlen(converted_event);
-        osync_change_set_data(change, converted_event, event_size, TRUE);
+        event_size = strlen(event);
+        osync_change_set_data(change, event, event_size, TRUE);
         osync_change_set_changetype(change, CHANGE_ADDED);
         osync_context_report_change(ctx, change);
@@ -1000 +988 @@
     int event_size = strlen(data);
     if (event_size > 0) {
-      /* XXX drop sync_vtype_* functions            
-      converted_event = sync_vtype_convert(data, 0 | (config->fixdst ? VOPTION_FIXDSTFROMCLIENT : 0) |
-                                          (config->translatecharset ? VOPTION_FIXCHARSET : 0) |
-                                          VOPTION_CALENDAR1TO2 |
-                                          (config->alarmfromirmc ? 0 : VOPTION_REMOVEALARM) |
-                                          VOPTION_CONVERTUTC, config->charset );
-      */                                          
-      converted_event = strdup(data);
-      event_size = strlen(converted_event);
+      event_size = strlen(data);
     } else {
-      converted_event = NULL;
+      data = NULL;
       event_size = 0;
     }
@@ -1017 +997 @@
       osync_change_set_changetype(change, CHANGE_DELETED);
     else if (type == 'M' || event_size == 0) {
-      osync_change_set_data(change, converted_event, event_size, TRUE);
+      osync_change_set_data(change, data, event_size, TRUE);
       osync_change_set_changetype(change, CHANGE_MODIFIED);
     }
@@ -1034 +1014 @@
 
   irmc_environment *env = (irmc_environment *)osync_context_get_plugin_data(ctx);
-//  irmc_config *config = &(env->config);
+  irmc_config *config = &(env->config);
 
   if (sync_type == SLOW_SYNC) {
@@ -1107 +1087 @@
 {
   osync_trace(TRACE_ENTRY, "%s(%i, %p, %s, %s, %i)", __func__, sync_type, ctx, data, luid, type);                       
-  char *converted_vnote = NULL;
 
   irmc_environment *env = (irmc_environment *)osync_context_get_plugin_data(ctx);
@@ -1143 +1122 @@
         }
 
-        converted_vnote = sync_vtype_convert(vnote, 0 | (config->translatecharset ? VOPTION_FIXCHARSET : 0) |
-                                             VOPTION_FIXTELOTHER, config->charset);
-        vnote_size = strlen(converted_vnote);
-        osync_change_set_data(change, converted_vnote, vnote_size, TRUE);
+        vnote_size = strlen(vnote);
+        osync_change_set_data(change, vnote, vnote_size, TRUE);
         osync_change_set_changetype(change, CHANGE_ADDED);
         osync_context_report_change(ctx, change);
@@ -1163 +1140 @@
     int vnote_size = strlen(data);
     if (vnote_size > 0) {
-      converted_vnote = sync_vtype_convert(data, 0 | (config->translatecharset ? VOPTION_FIXCHARSET : 0) |
-                                           VOPTION_FIXTELOTHER, config->charset);
-      vnote_size = strlen(converted_vnote);
+      vnote_size = strlen(data);
     } else {
-      converted_vnote = NULL;
+      data = NULL;
       vnote_size = 0;
     }
@@ -1175 +1150 @@
     else if (type == 'M' || vnote_size == 0) {
       osync_change_set_changetype(change, CHANGE_MODIFIED);
-      osync_change_set_data(change, converted_vnote, vnote_size, TRUE);
+      osync_change_set_data(change, data, vnote_size, TRUE);
     }
 
@@ -1191 +1166 @@
   char name[256];
   char *data = NULL;
-  char *converted_data = NULL;
   int data_size = 0;
   char rsp_buffer[256];
@@ -1228 +1202 @@
 
   // convert the data depending on the object type.
-  /* XXX dropping sync_vtype_convert()
   if (data) {
-    if (strcmp(info->identifier, "event") == 0) {
-      converted_data = sync_vtype_convert(data, VOPTION_ADDUTF8CHARSET | 0 |
-                                          (config->fixdst ? VOPTION_FIXDSTTOCLIENT : 0) |
-                                          VOPTION_CALENDAR2TO1 | (config->alarmtoirmc ? 0 : VOPTION_REMOVEALARM) |
-                                          (config->convertade ? VOPTION_CONVERTALLDAYEVENT : 0), NULL);
-    } else if (strcmp(info->identifier, "contact") == 0) {
-      converted_data = sync_vtype_convert(data, VOPTION_ADDUTF8CHARSET, NULL);
-    } else if (strcmp(info->identifier, "note") == 0) {
-      converted_data = sync_vtype_convert(data, VOPTION_ADDUTF8CHARSET, NULL);
-    }
-
-    data_size = strlen(converted_data);
+    data_size = strlen(data);
   } else {
     data_size = 0;
   }
-  */
-
-  // use original data instead of converted
-  if (data) {
-          converted_data = strdup(data);
-          data_size = strlen(converted_data);
-  } else {
-          data_size = 0;
-  }
-
   // increase change counter
   (*(info->change_counter))++;
@@ -1278 +1230 @@
 
       // send the delete request
-      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? converted_data : NULL, data_size,
+      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? data : NULL, data_size,
                          rsp_buffer, &rsp_buffer_size, param_buffer, param_buffer_pos - param_buffer, &error)) {
-        g_free(converted_data);
+        g_free(data);
         osync_context_report_osyncerror(ctx, &error);
         osync_trace(TRACE_EXIT_ERROR, "%s FALSE: %s", __func__, osync_error_print(&error));
@@ -1293 +1245 @@
       osync_trace(TRACE_INTERNAL, "%s delete request: resp=%s new_luid=%s cc=%d\n", info->identifier, rsp_buffer, new_luid, *(info->change_counter) );
 
-      g_free(converted_data);
       break;
 
     case CHANGE_ADDED:
       // send the add request
-      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? converted_data : NULL, data_size,
+      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? data : NULL, data_size,
                          rsp_buffer, &rsp_buffer_size, param_buffer, param_buffer_pos - param_buffer, &error)) {
-        g_free(converted_data);
+        g_free(data);
         osync_context_report_osyncerror(ctx, &error);
         osync_trace(TRACE_EXIT_ERROR, "%s FALSE: %s", __func__, osync_error_print(&error));
@@ -1316 +1267 @@
       osync_change_set_uid(change, new_luid);
 
-      g_free(converted_data);
       break;
 
     case CHANGE_MODIFIED:
       // send the modify request
-      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? converted_data : NULL, data_size,
+      if (!irmc_obex_put(config->obexhandle, name, 0, data_size ? data : NULL, data_size,
                          rsp_buffer, &rsp_buffer_size, param_buffer, param_buffer_pos - param_buffer, &error)) {
-        g_free(converted_data);
         osync_context_report_osyncerror(ctx, &error);
         osync_trace(TRACE_EXIT_ERROR, "%s: FALSE: %s", __func__, osync_error_print(&error));
@@ -1336 +1285 @@
       osync_trace(TRACE_INTERNAL, "%s modified request: resp=%s new_luid=%s cc=%d\n", info->identifier, rsp_buffer, new_luid, *(info->change_counter) );
 
-      g_free(converted_data);
       break;