author | eilers <eilers> | 2004-11-19 11:05:19 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-11-19 11:05:19 (UTC) |
commit | 362e353e4ee43a5aa37fd4c264ad0b40bbd0098b (patch) (side-by-side diff) | |
tree | 52de09cbe81e5105cfdef9b606c10e4239cef814 /library | |
parent | 6b1a6e3bf5d012e517c9668501f030d8c660b537 (diff) | |
download | opie-362e353e4ee43a5aa37fd4c264ad0b40bbd0098b.zip opie-362e353e4ee43a5aa37fd4c264ad0b40bbd0098b.tar.gz opie-362e353e4ee43a5aa37fd4c264ad0b40bbd0098b.tar.bz2 |
Don't just allow "TYPE=<value>".. This makes the vcard import filter more
robust against unexpected typos..
-rw-r--r-- | library/backend/vobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp index 592d116..28b8bae 100644 --- a/library/backend/vobject.cpp +++ b/library/backend/vobject.cpp @@ -1310,55 +1310,57 @@ static void initVObjectEncoding() } else if ( enc == "B64" ) { vobj_enc = Base64; vobj_enc_s = VCBase64Prop; } else { vobj_enc = EightBit; vobj_enc_s = 0; } } void writeVObject(FILE *fp, VObject *o) { initVObjectEncoding(); OFile ofp; // ##### //_setmode(_fileno(fp), _O_BINARY); initOFile(&ofp,fp); writeVObject_(&ofp,o); } DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o) { QFileDirect f( fname); if ( !f.open( IO_WriteOnly ) ) { qWarning("Unable to open vobject write %s", fname); return; } writeVObject( f.directHandle(),o ); } DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list) { QFileDirect f( fname); if ( !f.open( IO_WriteOnly ) ) { qWarning("Unable to open vobject write %s", fname); return; } while (list) { writeVObject(f.directHandle(),list); list = nextVObjectInList(list); } } DLLEXPORT(const char *) vObjectTypeInfo(VObject *o) { const char *type = vObjectName( o ); - if ( strcmp( type, "TYPE" ) == 0 ) + if ( strcmp( type, "type" ) == 0 || + strcmp( type, "TYPE" ) == 0 || + strcmp( type, "Type" ) == 0 ) type = vObjectStringZValue( o ); return type; } // end of source file vobject.c |