Changeset 3658

Show
Ignore:
Timestamp:
09/22/08 17:39:08 (2 months ago)
Author:
bricks
Message:

Fixed two bugs: Sorting XMLFormat and wrong XML Namespace

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • format-plugins/tomboy-note/src/tomboy_note.c

    r3621 r3658  
    2323 
    2424#include <string.h> 
    25 #include <assert.h> 
    26  
    27 #define osync_assert(x) assert(x) 
    2825 
    2926osync_bool tomboynote_validate(xmlDocPtr doc) { 
    … …  
    252249        char *cstr; 
    253250        osync_xmlformat_assemble(xmlformat, &cstr, &size); 
     251        //TODO xmlformat should be sorted automatically 
     252        osync_xmlformat_sort(xmlformat); 
    254253        osync_trace(TRACE_SENSITIVE, "... Output XMLFormat is: \n%s", cstr); 
    255254        g_free(cstr); 
    … …  
    285284         
    286285        doc = xmlNewDoc(BAD_CAST "1.0"); 
    287         ns = xmlNewNs(NULL, NULL, BAD_CAST "http://beatniksoftware.com/tomboy"); 
     286        ns = xmlNewNs(NULL, BAD_CAST "http://beatniksoftware.com/tomboy", NULL); 
    288287         
    289288        note = xmlNewNode(ns, BAD_CAST "note"); 
    … …  
    455454} 
    456455 
     456/* 
    457457static OSyncConvCmpResult compare_tomboynote(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize) { 
    458458        //TODO 
    459459        return OSYNC_CONV_DATA_MISMATCH; 
    460 } 
     460}  
     461*/ 
    461462 
    462463osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error)