Changeset 2146

Timestamp:

06/12/07 14:28:42 (1 year ago)

Author:

mjahn

Message:

revert bad commits 2145:2141 sorry for the noise

Files:

• plugins/gnokii-sync/SConstruct (modified) (1 diff)
• plugins/gnokii-sync/build/linux/osync_build.py (modified) (1 diff)
• plugins/gnokii-sync/src/SConscript (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_calendar.c (modified) (5 diffs)
• plugins/gnokii-sync/src/gnokii_calendar_format.c (modified) (9 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_contact.c (modified) (7 diffs)
• plugins/gnokii-sync/src/gnokii_contact_format.c (modified) (5 diffs)
• plugins/gnokii-sync/src/gnokii_contact_utils.c (modified) (3 diffs)
• plugins/gnokii-sync/src/gnokii_sync.c (modified) (3 diffs)
• plugins/gnokii-sync/src/gnokii_sync.h (modified) (1 diff)

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

@@ -50 +50 @@
-        
-        return testenv
-

plugins/gnokii-sync/src/SConscript

@@ -9 +9 @@
-
-# basic vformat plugins
-, LIBPATH = '$prefix/$libsuffix'
-], LIBS = ['opensync'], LIBPATH = '$prefix/$libsuffix'
-], LIBS = ['opensync'], LIBPATH = '$prefix/$libsuffix'
+
+, 'gnokii_calendar_utils.c'], LIBS = ['opensync']
+, 'gnokii_contact_utils.c'], LIBS = ['opensync']
-
-
-
+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;
-        }
@@ -208 +209 @@
-        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;
-        }
@@ -367 +369 @@
-                        break;
-
-                OSyncChange *change = osync_change_new(&error);
-
-                // prepare UID with gnokii-calendar-<memory location>
-                uid = g_strdup_printf ("gnokii-calendar-%i", calnote->location);
+                osync_hashtable_report(sinkenv->hashtable, uid);
+
+                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);
-
-                // get hash of calnote
-                hash = gnokii_calendar_hash(calnote);
-                osync_change_set_hash(change, hash);    
+                osync_change_set_changetype(change, type);
-
-                // set data
-
-
+
+
+
-                        osync_change_unref(change);
-                        osync_context_report_osyncwarning(ctx, error);
@@ -385 +400 @@
-                        g_free(hash);
-                        g_free(uid);
+                        g_free(calnote);
-                        continue;
-                }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-                g_free(hash);
@@ -560 +575 @@
-        }
-        
-        // 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
-y
+ies
-        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");
+
-
-
@@ -204 +211 @@
-
-        // Summary
-cal->text
+strlen(cal->text)
-                xmlfield = osync_xmlfield_new(xmlformat, "Summary", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->text);
@@ -210 +217 @@
-
-        // Phone Number
-cal->phone_number
+strlen(cal->phone_number)
-                xmlfield = osync_xmlfield_new(xmlformat, "Description", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->phone_number);
@@ -216 +223 @@
-
-        // mlocation
-cal->mlocation
+strlen(cal->mlocation)
-                xmlfield = osync_xmlfield_new(xmlformat, "Location", error);
-                osync_xmlfield_set_key_value(xmlfield, "Content", cal->mlocation);
@@ -289 +296 @@
-}
-
+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).
@@ -297 +473 @@
-                        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
@@ -519 +521 @@
-                calnote->type = gnokii_util_calendar_type(calnote, alldayevent);
-
-
-        *free_input = TRUE;
-        *output = (void *)calnote;
@@ -533 +534 @@
-
-
-size_
+unsigned in
-{
-        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_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;
-                        }
@@ -166 +167 @@
-        }
-
-
+
+
-        osync_trace(TRACE_EXIT, "%s(): NO FREE LOCATION!", __func__);
-        return NULL;
@@ -422 +424 @@
-                        // prepare UID with gnokii-contact-<memory type>-<memory location>
-                        uid = gnokii_contact_uid(contact);
+                        osync_hashtable_report(sinkenv->hashtable, uid);
-
-                        hash = gnokii_contact_hash(contact);
@@ -473 +476 @@
-        g_free(data);
-
-
-        /* FIXME: this is really really broken :( 
-        int i;
-
-        char **uids = osync_hashtable_get_deleted(sinkenv->hashtable);
-        for (i = 0; uids[i]; i++) {
@@ -511 +511 @@
-        }
-        g_free(uids);
-        */
-
-        osync_context_report_success(ctx);
@@ -528 +527 @@
-        OSyncError *error = NULL;
-        gn_phonebook_entry *contact = NULL;
+        char *buf;
-        char *uid = NULL;
-        char *hash = NULL;
@@ -536 +536 @@
-
-        // Get changed contact note
-
+
+
-
-        // Check for type of changes

plugins/gnokii-sync/src/gnokii_contact_format.c

@@ -53 +53 @@
-
-        // Name
-contact->name
+strlen(contact->name)
-
-                xmlfield = osync_xmlfield_new(xmlformat, "FormattedName", error);
@@ -59 +59 @@
-
-                // FIXME: evo2 workaround - evo2 requires a Name / N filed :(
+                /*
-                xmlfield = osync_xmlfield_new(xmlformat, "Name", error);
-                osync_xmlfield_set_key_value(xmlfield, "FirstName", contact->name);
+                */
-        }
-
@@ -216 +218 @@
-}
-
+static void _xmlfield_formattedname(gn_phonebook_entry *contact, OSyncXMLField *xmlfield)
+{
+        const char *name = osync_xmlfield_get_key_value(xmlfield, "Content");
+        strncpy(contact->name, name, GN_PHONEBOOK_NAME_MAX_LENGTH);
+}
+
+static void _xmlfield_telephone(gn_phonebook_entry *contact, OSyncXMLField *xmlfield, int *subcount)
+{
+        const char *tele = osync_xmlfield_get_key_value(xmlfield, "Content");
+
+        char *number = gnokii_contact_util_cleannumber(tele);
+        strncpy(contact->subentries[*subcount].data.number, number, GN_PHONEBOOK_NAME_MAX_LENGTH);
+        g_free(number);
+
+        contact->subentries[*subcount].entry_type = GN_PHONEBOOK_ENTRY_Number;
+
+        const char *type = osync_xmlfield_get_attr(xmlfield, "Type");
+        const char *location = osync_xmlfield_get_attr(xmlfield, "Location");
+
+        if (location && !strcasecmp(location, "Work"))
+                contact->subentries[*subcount].number_type = GN_PHONEBOOK_NUMBER_Work; 
+        else if (location && !strcasecmp(location, "Home"))
+                contact->subentries[*subcount].number_type = GN_PHONEBOOK_NUMBER_Home; 
+        else if (type && !strcasecmp(type, "Fax"))
+                contact->subentries[*subcount].number_type = GN_PHONEBOOK_NUMBER_Fax; 
+        else if (type && !strcasecmp(type, "Cellular"))
+                contact->subentries[*subcount].number_type = GN_PHONEBOOK_NUMBER_Mobile; 
+        else
+                contact->subentries[*subcount].number_type = GN_PHONEBOOK_NUMBER_General;
+
+        (*subcount)++;
+}
+
+static void _xmlfield_url(gn_phonebook_entry *contact, OSyncXMLField *xmlfield, int *subcount)
+{
+        const char *url = osync_xmlfield_get_key_value(xmlfield, "Content");
+
+        contact->subentries[*subcount].entry_type = GN_PHONEBOOK_ENTRY_URL;
+        strncpy(contact->subentries[*subcount].data.number, url, GN_PHONEBOOK_NAME_MAX_LENGTH);
+        (*subcount)++;
+}
+
+static void _xmlfield_email(gn_phonebook_entry *contact, OSyncXMLField *xmlfield, int *subcount)
+{
+        const char *email = osync_xmlfield_get_key_value(xmlfield, "Content");
+        contact->subentries[*subcount].entry_type = GN_PHONEBOOK_ENTRY_Email;
+        strncpy(contact->subentries[*subcount].data.number, email, GN_PHONEBOOK_NAME_MAX_LENGTH);
+
+        (*subcount)++;
+}
+
+static void _xmlfield_note(gn_phonebook_entry *contact, OSyncXMLField *xmlfield, int *subcount)
+{
+        const char *note = osync_xmlfield_get_key_value(xmlfield, "Content");
+
+        contact->subentries[*subcount].entry_type = GN_PHONEBOOK_ENTRY_Note;
+        strncpy(contact->subentries[*subcount].data.number, note, GN_PHONEBOOK_NAME_MAX_LENGTH);
+        (*subcount)++;
+}
+
+static void _xmlfield_addresslabel(gn_phonebook_entry *contact, OSyncXMLField *xmlfield, int *subcount)
+{
+        const char *label = osync_xmlfield_get_key_value(xmlfield, "Content");
+        contact->subentries[*subcount].entry_type = GN_PHONEBOOK_ENTRY_Postal;
+        strncpy(contact->subentries[*subcount].data.number, label, GN_PHONEBOOK_NAME_MAX_LENGTH); 
+        (*subcount)++;
+}
+
+static void _xmlfield_category(gn_phonebook_entry *contact, OSyncXMLField *xmlfield)
+{
+        contact->caller_group = GN_PHONEBOOK_GROUP_None; 
+
+        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, "FAMILY")) {
+                        contact->caller_group = GN_PHONEBOOK_GROUP_Family; 
+                } else if (!strcasecmp(category, "VIPS") || !strcasecmp(category, "VIP")) { // FIXME: evo2-sync workaround fix that in vformat plugin
+                        contact->caller_group = GN_PHONEBOOK_GROUP_Vips;
+                } else if (!strcasecmp(category, "FRIENDS")) {
+                        contact->caller_group = GN_PHONEBOOK_GROUP_Friends;
+                } else if (!strcasecmp(category, "WORK")) {
+                        contact->caller_group = GN_PHONEBOOK_GROUP_Work;
+                } else if (!strcasecmp(category, "OTHERS")) {
+                        contact->caller_group = GN_PHONEBOOK_GROUP_Others;
+                }
+
+        }
+}
+
+
+
-/* 
- * Converts from XML to the gnokii contact object type (gn_phonebook_entry).
@@ -224 +320 @@
-                        output, outpsize, free_input, config, error);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        int subcount = 0;
-
-
-
-
-
+
+
+
+
+
+
-                goto error;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-