-rw-r--r-- | library/backend/vobject.cpp | 6 |
1 files changed, 4 insertions, 2 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() | |||
1310 | } else if ( enc == "B64" ) { | 1310 | } else if ( enc == "B64" ) { |
1311 | vobj_enc = Base64; | 1311 | vobj_enc = Base64; |
1312 | vobj_enc_s = VCBase64Prop; | 1312 | vobj_enc_s = VCBase64Prop; |
1313 | } else { | 1313 | } else { |
1314 | vobj_enc = EightBit; | 1314 | vobj_enc = EightBit; |
1315 | vobj_enc_s = 0; | 1315 | vobj_enc_s = 0; |
1316 | } | 1316 | } |
1317 | } | 1317 | } |
1318 | 1318 | ||
1319 | void writeVObject(FILE *fp, VObject *o) | 1319 | void writeVObject(FILE *fp, VObject *o) |
1320 | { | 1320 | { |
1321 | initVObjectEncoding(); | 1321 | initVObjectEncoding(); |
1322 | 1322 | ||
1323 | OFile ofp; | 1323 | OFile ofp; |
1324 | // ##### | 1324 | // ##### |
1325 | //_setmode(_fileno(fp), _O_BINARY); | 1325 | //_setmode(_fileno(fp), _O_BINARY); |
1326 | initOFile(&ofp,fp); | 1326 | initOFile(&ofp,fp); |
1327 | writeVObject_(&ofp,o); | 1327 | writeVObject_(&ofp,o); |
1328 | } | 1328 | } |
1329 | 1329 | ||
1330 | DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o) | 1330 | DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o) |
1331 | { | 1331 | { |
1332 | QFileDirect f( fname); | 1332 | QFileDirect f( fname); |
1333 | if ( !f.open( IO_WriteOnly ) ) { | 1333 | if ( !f.open( IO_WriteOnly ) ) { |
1334 | qWarning("Unable to open vobject write %s", fname); | 1334 | qWarning("Unable to open vobject write %s", fname); |
1335 | return; | 1335 | return; |
1336 | } | 1336 | } |
1337 | 1337 | ||
1338 | writeVObject( f.directHandle(),o ); | 1338 | writeVObject( f.directHandle(),o ); |
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list) | 1341 | DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list) |
1342 | { | 1342 | { |
1343 | QFileDirect f( fname); | 1343 | QFileDirect f( fname); |
1344 | if ( !f.open( IO_WriteOnly ) ) { | 1344 | if ( !f.open( IO_WriteOnly ) ) { |
1345 | qWarning("Unable to open vobject write %s", fname); | 1345 | qWarning("Unable to open vobject write %s", fname); |
1346 | return; | 1346 | return; |
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | while (list) { | 1349 | while (list) { |
1350 | writeVObject(f.directHandle(),list); | 1350 | writeVObject(f.directHandle(),list); |
1351 | list = nextVObjectInList(list); | 1351 | list = nextVObjectInList(list); |
1352 | } | 1352 | } |
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | DLLEXPORT(const char *) vObjectTypeInfo(VObject *o) | 1355 | DLLEXPORT(const char *) vObjectTypeInfo(VObject *o) |
1356 | { | 1356 | { |
1357 | const char *type = vObjectName( o ); | 1357 | const char *type = vObjectName( o ); |
1358 | if ( strcmp( type, "TYPE" ) == 0 ) | 1358 | if ( strcmp( type, "type" ) == 0 || |
1359 | type = vObjectStringZValue( o ); | 1359 | strcmp( type, "TYPE" ) == 0 || |
1360 | strcmp( type, "Type" ) == 0 ) | ||
1361 | type = vObjectStringZValue( o ); | ||
1360 | return type; | 1362 | return type; |
1361 | } | 1363 | } |
1362 | 1364 | ||
1363 | 1365 | ||
1364 | // end of source file vobject.c | 1366 | // end of source file vobject.c |