Changeset 2142

Timestamp:

06/12/07 14:13:50 (1 year ago)

Author:

mjahn

Message:

r1044@semo: mjahn | 2007-06-07 13:44:31 +0200

r1041@semo (orig r2096): dgollub | 2007-06-07 13:24:26 +0200
Copy of gnokii-sync 0.2X to trunk

r1042@semo (orig r2097): dgollub | 2007-06-07 13:31:22 +0200
Initial port of gnokii-sync to 0.30 API
Still not working .. quick hack on a 3h train ride.
Facing some problems with libgnokii :(

r1043@semo (orig r2098): dgollub | 2007-06-07 13:35:35 +0200
Updated INSTALL, README and ChangeLog? of gnokii-sync

Files:

• plugins/gnokii-sync/SConstruct (modified) (1 diff)
• plugins/gnokii-sync/build/linux/osync_build.py (modified) (2 diffs)
• plugins/gnokii-sync/src/SConscript (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_calendar.c (modified) (6 diffs)
• plugins/gnokii-sync/src/gnokii_calendar_format.c (modified) (8 diffs)
• plugins/gnokii-sync/src/gnokii_calendar_utils.c (modified) (2 diffs)
• plugins/gnokii-sync/src/gnokii_calendar_utils.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_config.c (modified) (7 diffs)
• plugins/gnokii-sync/src/gnokii_config.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_contact.c (modified) (9 diffs)
• plugins/gnokii-sync/src/gnokii_contact_format.c (modified) (7 diffs)
• plugins/gnokii-sync/src/gnokii_contact_utils.c (modified) (3 diffs)
• plugins/gnokii-sync/src/gnokii_sync.c (modified) (8 diffs)
• plugins/gnokii-sync/src/gnokii_sync.h (modified) (2 diffs)

plugins/gnokii-sync/SConstruct

@@ -54 +54 @@
-install_plugin = '${DESTDIR}$prefix/$libsuffix/opensync/plugins'
-install_format = '${DESTDIR}$prefix/$libsuffix/opensync/formats'
-install_config = '${DESTDIR}$prefix/share/opensync/defaults'
-
- install_config
+
-
-SConscript(['src/SConscript'])

plugins/gnokii-sync/build/linux/osync_build.py

@@ -37 +37 @@
-        env.ParseConfig('pkg-config --cflags --libs gnokii')
-        env.Append(CCFLAGS = r'-I.')
-
-
+
-        env.Append(CCFLAGS = r'-DVERSION="\"' + config.version + r'\""')
-        
@@ -50 +49 @@
-        
-        return testenv
+

plugins/gnokii-sync/src/SConscript

@@ -9 +9 @@
-
-# basic vformat plugins
-
-, 'gnokii_calendar_utils.c'], LIBS = ['opensync']
-, 'gnokii_contact_utils.c'], LIBS = ['opensync']
+, LIBPATH = '$prefix/$libsuffix'
+], LIBS = ['opensync'], LIBPATH = '$prefix/$libsuffix'
+], LIBS = ['opensync'], LIBPATH = '$prefix/$libsuffix'
-
-
-and config 
+
-env.Install(install_plugin, gnokii_sync)
-
-
-
+
-env.Install(install_format, gnokii_event)
-env.Install(install_format, gnokii_contact)

plugins/gnokii-sync/src/gnokii_calendar.c

@@ -202 +202 @@
-        if (error == GN_ERR_EMPTYLOCATION) {
-                osync_trace(TRACE_EXIT, "%s: no calendar note left.", __func__);
-                g_free(calnote);
-                return NULL;
-        }
@@ -209 +208 @@
-        if (error != GN_ERR_NONE) {
-                osync_trace(TRACE_EXIT_ERROR, "%s(): error while query the phone - gnokii: %s", __func__, gn_error_print(error));
-                g_free(calnote);
-                return NULL;
-        }
@@ -369 +367 @@
-                        break;
-
+                OSyncChange *change = osync_change_new(&error);
+
-                // prepare UID with gnokii-calendar-<memory location>
-                uid = g_strdup_printf ("gnokii-calendar-%i", calnote->location);
-
-
+
+
+
-                hash = gnokii_calendar_hash(calnote);
-                OSyncChangeType type = osync_hashtable_get_changetype(sinkenv->hashtable, uid, hash);
-
-                if (type == OSYNC_CHANGE_TYPE_UNMODIFIED) {
-                        g_free(hash);
-                        g_free(uid);
-                        g_free(calnote);
-                        continue;
-                }
-
-                osync_hashtable_update_hash(sinkenv->hashtable, type, uid, hash);
-
-                OSyncChange *change = osync_change_new(&error);
-
-                osync_change_set_uid(change, uid);
-                osync_change_set_hash(change, hash);    
-                osync_change_set_changetype(change, type);
-
-                // set data
-
-
-
+
+
-                        osync_change_unref(change);
-                        osync_context_report_osyncwarning(ctx, error);
@@ -400 +385 @@
-                        g_free(hash);
-                        g_free(uid);
-                        g_free(calnote);
-                        continue;
-                }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-                g_free(hash);
@@ -458 +443 @@
-        g_free(caldata);
-
-        osync_context_report_success(ctx);
-
-        osync_trace(TRACE_EXIT, "%s", __func__);
-}
@@ -575 +558 @@
-        }
-        
+        // answer the call
-        osync_context_report_success(ctx);
-
+
+
+
+
+
+
+
+
+
-        // update hashtable
-        osync_hashtable_update_hash(sinkenv->hashtable, osync_change_get_changetype(change), osync_change_get_uid(change), osync_change_get_hash(change));

plugins/gnokii-sync/src/gnokii_calendar_format.c

@@ -56 +56 @@
-
-        // Type
-ies
+y
-        switch (cal->type) {
-                case GN_CALNOTE_MEETING:
@@ -193 +193 @@
-                xmlfield = osync_xmlfield_new(xmlformat, "Alarm", error);
-
-                // TODO: How to handle AlarmAction?
-                // AUDIO by tone? 
-                // DISPLAY by silent?   
-                // EMAIL and PRODECDURE isn't supported by libgnokii
-                if (cal->alarm.tone)
-                        osync_xmlfield_set_key_value(xmlfield, "AlarmAction", "AUDIO");
-                else
-                        osync_xmlfield_set_key_value(xmlfield, "AlarmAction", "DISPLAY");
-
-
-
@@ -211 +204 @@
-
-        // Summary
-strlen(cal->text)
+cal->text
-                xmlfield = osync_xmlfield_new(xmlformat, "Summary", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->text);
@@ -217 +210 @@
-
-        // Phone Number
-strlen(cal->phone_number)
+cal->phone_number
-                xmlfield = osync_xmlfield_new(xmlformat, "Description", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->phone_number);
@@ -223 +216 @@
-
-        // mlocation
-strlen(cal->mlocation)
+cal->mlocation
-                xmlfield = osync_xmlfield_new(xmlformat, "Location", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->mlocation);
@@ -296 +289 @@
-}
-
-static void _xmlfield_category(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-        int i;
-        int numnodes = osync_xmlfield_get_key_count(xmlfield);
-        for (i=0; i < numnodes; i++) {
-                const char *category = osync_xmlfield_get_nth_key_value(xmlfield, i);
-
-                if (!strcasecmp(category, "Meeting"))
-                        calnote->type = GN_CALNOTE_MEETING;
-                else if (!strcasecmp(category, "Calling"))
-                        calnote->type = GN_CALNOTE_CALL;
-                else if (!strcasecmp(category, "Birthday"))
-                        calnote->type = GN_CALNOTE_BIRTHDAY;
-                else if (!strcasecmp(category, "Reminder"))
-                        calnote->type = GN_CALNOTE_REMINDER;
-                else if (!strcasecmp(category, "Memo"))
-                        calnote->type = GN_CALNOTE_MEMO;
-
-                else
-                        // When no known type was found it will check later
-                        // for a valid type. 
-                        calnote->type = 0;
-
-        }
-}
-
-static void _xmlfield_datestarted(gn_calnote *calnote, OSyncXMLField *xmlfield, int *alldayevent)
-{
-
-        const char *dtstart = osync_xmlfield_get_key_value(xmlfield, "Content");
-
-        struct tm *starttm = osync_time_vtime2tm(dtstart);
-        struct tm *tmptm = NULL;
-
-        if (!osync_time_isdate(dtstart) && osync_time_isutc(dtstart)) {
-                tmptm = starttm;
-                int offset = osync_time_timezone_diff(tmptm);
-                starttm = osync_time_tm2localtime(tmptm, offset);
-                g_free(tmptm);
-        }
-
-        calnote->time = gnokii_util_tm2timestamp(starttm);
-
-        g_free(starttm);
-
-        // Only 3 matches (=date) means all day event 
-        if (osync_time_isdate(dtstart))
-                *alldayevent = 1;
-
-        // Nokia cellphones cannot handle seconds in calendar - so set it to ZERO
-        calnote->time.second = 0;
-
-}
-
-void static _xmlfield_dateend(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-
-        const char *dtend = osync_xmlfield_get_key_value(xmlfield, "Content");
-
-
-        struct tm *endtm = osync_time_vtime2tm(dtend);
-        struct tm *tmptm = NULL;
-        if (!osync_time_isdate(dtend) && osync_time_isutc(dtend)) {
-                tmptm = endtm;
-                int offset = osync_time_timezone_diff(tmptm);
-                endtm = osync_time_tm2localtime(tmptm, offset);
-                g_free(tmptm);
-        }
-
-        calnote->end_time = gnokii_util_tm2timestamp(endtm);
-        g_free(endtm);
-
-        // Nokia cellphones cannot handle seconds in calendar so set it to ZERO
-        calnote->end_time.second = 0;
-
-}
-
-void static _xmlfield_alarm(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-        int seconds_before = 0;
-        time_t start_timet, alarm_timet;
-
-        calnote->alarm.enabled = 1;
-        
-        const char *action = osync_xmlfield_get_key_value(xmlfield, "AlarmAction");
-
-        if (!action)
-                osync_trace(TRACE_INTERNAL, "AlarmAction wasn't set!");
-
-        if (action && (!strcasecmp(action, "DISPLAY") || !strcasecmp(action, "AUDIO")))
-                calnote->alarm.tone = 1;
-
-
-        
-        const char *trigger = osync_xmlfield_get_key_value(xmlfield, "AlarmTrigger");
-
-        if (!trigger) 
-                osync_trace(TRACE_INTERNAL, "AlarmTrigger wasn't set!");
-
-        const char *triggertype = osync_xmlfield_get_attr(xmlfield, "Value");           
-
-        if (triggertype && !strcasecmp("DURATION", triggertype)) {
-                seconds_before = gnokii_util_alarmevent2secs(trigger);
-
-                // convert start event in to seconds
-                start_timet = gnokii_util_timestamp2unix(&(calnote->time));
-
-                // timestamp for alarm
-                alarm_timet = start_timet - seconds_before;
-        } else if (triggertype && ! strcasecmp("DATE-TIME", triggertype)) {
-                // TODO: untested! - check UTC offeset issues
-                alarm_timet = osync_time_vtime2unix(trigger, 0);
-        } else {
-                osync_trace(TRACE_INTERNAL, "Unkown TRIGGERVALUE - skip Alarm.");
-                return;
-        }
-
-        // convert timestamp of alarm to gnokii timestamp
-        calnote->alarm.timestamp = gnokii_util_unix2timestamp(alarm_timet);
-}
-
-void static _xmlfield_summary(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-        const char *summary = osync_xmlfield_get_key_value(xmlfield, "Content");
-        strncpy(calnote->text, summary, GN_CALNOTE_MAX_LENGTH); 
-}
-
-void static _xmlfield_location(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-        const char *location = osync_xmlfield_get_key_value(xmlfield, "Content");
-//      if (calnote->type == GN_CALNOTE_MEETING && location)
-        strncpy(calnote->mlocation, location, GN_CALNOTE_MAX_LENGTH);
-}
-
-void static _xmlfield_description(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-
-        const char *description = osync_xmlfield_get_key_value(xmlfield, "Content");
-//      if (calnote->type == GN_CALNOTE_CALL || gnokii_util_valid_number(tmp))
-        strncpy(calnote->phone_number, description, GN_CALNOTE_NUMBER_MAX_LENGTH);
-}
-
-void static _xmlfield_recurrencerule(gn_calnote *calnote, OSyncXMLField *xmlfield)
-{
-        int interval = 0;
-
-        const char *freq = osync_xmlfield_get_key_value(xmlfield, "Frequency");
-
-        if (!strcasecmp(freq, "DAILY"))
-                calnote->recurrence = GN_CALNOTE_DAILY;
-        else if (!strcasecmp(freq, "WEEKLY")) 
-                calnote->recurrence = GN_CALNOTE_WEEKLY;
-        else if (!strcasecmp(freq, "MONTHLY"))
-                calnote->recurrence = GN_CALNOTE_MONTHLY;
-        else if (!strcasecmp(freq, "YEARLY"))
-                calnote->recurrence = GN_CALNOTE_YEARLY;
-
-        const char *ival = osync_xmlfield_get_key_value(xmlfield, "Interval");
-
-        if (ival)
-                sscanf(ival, "%u", &interval);
-
-        // TODO: Get this merged by demerger....
-        // Nokia phones only support a interval of 2 for weeks
-        if (calnote->recurrence == GN_CALNOTE_WEEKLY && interval == 2)
-                calnote->recurrence = GN_CALNOTE_2WEEKLY;
-}
-
-
-/* 
- * Converts from XMLFormat-event to the gnokii event object type (gn_calnote).
@@ -473 +297 @@
-                        output, outpsize, config, free_input, error);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        osync_bool alldayevent = 0;
-
-
-
+
+
+
+
+
-                goto error;
-        }
-
+        if (xmlStrcmp(root->name, (xmlChar *) "vcal")) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Wrong (event) xml root element");
+                goto error;
+        }
+
+        // Event child
+        root = osxml_get_node(root, "Event");
+
-        // prepare calnote
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-
+        // DateEnd
+        cur = osxml_get_node(root, "DateEnd");
+        if (cur) {
+
+                tmp = osxml_find_node(cur, "Content");
+
+                endtm = osync_time_vtime2tm(tmp);
+                if (!osync_time_isdate(tmp) && osync_time_isutc(tmp)) {
+                        tmptm = endtm;
+                        endtm = osync_time_tm2localtime(tmptm, offset);
+                        g_free(tmptm);
+                }
+
+                g_free(tmp);
+
+                calnote->end_time = gnokii_util_tm2timestamp(endtm);
+
+                g_free(endtm);
+
+                // Nokia cellphones cannot handle seconds in calendar so set it to ZERO
+                calnote->end_time.second = 0;
+        }
+
+        /* Alarm - TODO: is not fully supported
+         *              Not supported:
+         *              ^^^^^^^^^^^^^^
+         *              # alarm after event
+         *              # alarm before event end
+         *              # ...
+         */
+        cur = osxml_get_node(root, "Alarm");
+        if (cur && calnote->time.year) {
+
+                int seconds_before = 0;
+                time_t start_timet, alarm_timet;
+
+                calnote->alarm.enabled = 1;
+                
+                tmp = osxml_find_node(cur, "AlarmAction");
+                if (tmp && !strcasecmp(tmp, "DISPLAY"))
+                        calnote->alarm.tone = 1;
+
+                g_free(tmp);
+                
+                // get AlarmTrigger root
+                xmlNode *sub = osxml_get_node(cur, "AlarmTrigger");
+
+                // get node with iCal duration
+                tmp = osxml_find_node(sub, "Content");
+
+                // convert iCal duration string into seconds (before event)
+                seconds_before = gnokii_util_alarmevent2secs(tmp);
+
+                g_free(tmp);
+                
+                // convert start event in to seconds
+                start_timet = gnokii_util_timestamp2unix(&(calnote->time));
+
+                // timestamp for alarm
+                alarm_timet = start_timet - seconds_before;
+
+                // convert timestamp of alarm to gnokii timestamp
+                calnote->alarm.timestamp = gnokii_util_unix2timestamp(alarm_timet);
+        }
+
+        // Summary
+        cur = osxml_get_node(root, "Summary");
+        if (cur) {
+                tmp = (char *) xmlNodeGetContent(cur);
+                strncpy(calnote->text, tmp, sizeof(calnote->text)); 
+                g_free(tmp);
+        }
+
+        // meeting location
+        cur = osxml_get_node(root, "Location");
+        if (cur) {
+                tmp = (char *) xmlNodeGetContent(cur);
+
+                if (calnote->type == GN_CALNOTE_MEETING && tmp)
+                        strncpy(calnote->mlocation, tmp, sizeof(calnote->mlocation));
+
+                g_free(tmp);
+        }
+
+        // PhoneNumber
+        cur = osxml_get_node(root, "Description");
+        if (cur) {
+                tmp = (char *) xmlNodeGetContent(cur);
+                if (calnote->type == GN_CALNOTE_CALL || gnokii_util_valid_number(tmp))
+                        strncpy(calnote->phone_number, tmp, sizeof(calnote->phone_number));
+
+                g_free(tmp);
+        }
+
+        // Reccurence
+        cur = osxml_get_node(root, "RecurrenceRule");
+        if (cur) {
+                int interval = 0;
+
+                for (cur = cur->children; cur; cur = cur->next) {
+
+                        tmp = (char *) xmlNodeGetContent(cur);
+
+                        if (strstr(tmp, "DAILY"))
+                                calnote->recurrence = GN_CALNOTE_DAILY;
+                        else if (strstr(tmp, "WEEKLY")) 
+                                calnote->recurrence = GN_CALNOTE_WEEKLY;
+                        else if (strstr(tmp, "MONTHLY"))
+                                calnote->recurrence = GN_CALNOTE_MONTHLY;
+                        else if (strstr(tmp, "YEARLY"))
+                                calnote->recurrence = GN_CALNOTE_YEARLY;
+
+                        else if (strstr(tmp, "INTERVAL"))
+                                sscanf(tmp, "INTERVAL=%u", &interval);
+
+                        g_free(tmp);
+                }
+
+                // Nokia phones only support a interval of 2 for weeks
+                if (calnote->recurrence == GN_CALNOTE_WEEKLY && interval == 2)
+                        calnote->recurrence = GN_CALNOTE_2WEEKLY;
+        }
-
-        // check for type which fits for given data if no type was set
-        if (!calnote->type)
-                calnote->type = gnokii_util_calendar_type(calnote, alldayevent);
+
-
-        *free_input = TRUE;
@@ -534 +533 @@
-
-
-unsigned in
+size_
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %i)", __func__, input, inpsize);

plugins/gnokii-sync/src/gnokii_calendar_utils.c

@@ -30 +30 @@
- * Returns: seconds before event
- */
-onst c
+
-
-        osync_trace(TRACE_ENTRY, "%s(%s)", __func__, alarm);
@@ -240 +240 @@
-        date = gnokii_util_timestamp2tm(timestamp);
-        timet = mktime(date);
-        g_free(date);
-
-        osync_trace(TRACE_EXIT, "%s: %ul", __func__, timet);

plugins/gnokii-sync/src/gnokii_calendar_utils.h

@@ -26 +26 @@
-gn_timestamp gnokii_util_tm2timestamp(const struct tm *timetm);
-time_t gnokii_util_timestamp2unix(gn_timestamp *timestamp);
-onst c
+
-char *gnokii_util_secs2alarmevent(int secs_before_event); 
-onst c
+
-gn_calnote_type gnokii_util_calendar_type(gn_calnote *calnote, osync_bool alldayevent);
-

plugins/gnokii-sync/src/gnokii_config.c

@@ -21 +21 @@
-#include "gnokii_sync.h"
-
+/* Set connection types
+ */
+void parse_connection_type(char *str, gn_config *config) {
+
+        if (!strcasecmp(str, "bluetooth"))
+                config->connection_type = GN_CT_Bluetooth;
+        else if (!strcasecmp(str, "irda"))
+                config->connection_type = GN_CT_Irda;
+        else if (!strcasecmp(str, "dku2"))
+                config->connection_type = GN_CT_DKU2;
+        else if (!strcasecmp(str, "dau9p"))
+                config->connection_type = GN_CT_DAU9P;
+        else if (!strcasecmp(str, "dlr3p"))
+                config->connection_type = GN_CT_DLR3P;
+        else if (!strcasecmp(str, "serial"))
+                config->connection_type = GN_CT_Serial;
+        else if (!strcasecmp(str, "infrared"))
+                config->connection_type = GN_CT_Infrared;
+        else if (!strcasecmp(str, "tekram"))
+                config->connection_type = GN_CT_Tekram;
+        else if (!strcasecmp(str, "tcp"))
+                config->connection_type = GN_CT_TCP;
+        else if (!strcasecmp(str, "m2bus"))
+                config->connection_type = GN_CT_M2BUS;
+        else if (!strcasecmp(str, "dku2libusb"))
+                config->connection_type = GN_CT_DKU2LIBUSB;
+        else
+                config->connection_type = GN_CT_NONE;
+}
+
-/* Parse config file of gnokii plugin 
- *
@@ -27 +57 @@
- * ReturnVal: false     on error
- */
-struct gn_statemachine *state
+gn_config *config
-{
-
-
+
-        char *str = NULL;
-        char **lines = malloc(sizeof(char*) * 10);
-        memset(lines, 0, sizeof(char*) * 10);
-        xmlDocPtr doc;
-        xmlNodePtr cur;
@@ -63 +90 @@
-        cur = cur->xmlChildrenNode;
-
-        lines[i] = g_strdup("[global]");
-
-        while (cur != NULL) {
-                str = (char *) xmlNodeGetContent(cur);
@@ -70 +95 @@
-                if (str) {
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "model"))
-lines[++i] = g_strdup_printf("model = %s", str
+strncpy(config->model, str, strlen(str)
-        
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "port"))
-lines[++i] = g_strdup_printf("port = %s", str
+strncpy(config->port_device, str, strlen(str)
-
-
-
+
+
+
+
-
-                        // rfcomm channel
-
-
+
+
+
-
-                        // check for debug option of libgnokii
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "debug")) {
-lines[++i] = g_strdup("[logging]");
-lines[++i] = g_strdup_printf("debug = %s", str);
+if (!strcasecmp(str, "on"))
+       gn_log_debug_mask = GN_LOG_T_STDERR;    // debug output to stderr
-                        }
-                        g_free(str);
@@ -93 +121 @@
-        }
-
-        /* TODO: adapt error handling to return value of gn_cfg_phone_load()
-        if (!strlen(config->model)) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Model is not set in configuration");
@@ -111 +138 @@
-                return FALSE;
-        }
-        */
-
-        gn_cfg_memory_read(lines);
-        gn_cfg_phone_load(NULL, state); 
-
-        for (i=0; lines[i] != NULL; i++)
-                g_free(lines[i]);
-
-        g_free(lines);
-
-        xmlFreeDoc(doc);
@@ -126 +145 @@
-}
-
+/* Fill the statemachine struct for libgnokii with:
+ * model, port (serial connection) or MAC address (bluetooth) and connection type.
+ * This is required for the cellphone connection. 
+ *
+ */
+void gnokii_config_state(struct gn_statemachine *state, gn_config *config) {
+
+        /* model */
+        strncpy(state->config.model, config->model, GN_MODEL_MAX_LENGTH);
+
+        /* port (bluetooth: destination mac address) */
+        strncpy(state->config.port_device, config->port_device, GN_DEVICE_NAME_MAX_LENGTH);
+
+        /* connection type - gn_connection_type */
+        state->config.connection_type = config->connection_type; 
+
+        /* rfcomm channel */
+        state->config.rfcomm_cn = config->rfcomm_cn;
+        
+}
+

plugins/gnokii-sync/src/gnokii_config.h

@@ -21 +21 @@
-#include <gnokii.h>
-
-
+
+
-

plugins/gnokii-sync/src/gnokii_contact.c

@@ -158 +158 @@
-                        if (error == GN_ERR_EMPTYLOCATION) {
-                                osync_trace(TRACE_EXIT, "%s(): memorty_type: %i location: %i counter: %i", __func__, contact->memory_type, contact->location, i);
-                                g_free(data);
-                                return contact;
-                        }
@@ -167 +166 @@
-        }
-
-
-
+
-        osync_trace(TRACE_EXIT, "%s(): NO FREE LOCATION!", __func__);
-        return NULL;
@@ -361 +359 @@
-        gn_phonebook_entry *contact = NULL;
-        gn_memory_status memstat;
-
+
+
+
-
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
@@ -367 +367 @@
-        gnokii_sinkenv *sinkenv = osync_objtype_sink_get_userdata(sink);
-        gnokii_environment *env = (gnokii_environment *) plugindata;