Don't just allow "TYPE=<value>".. This makes the vcard import filter more

robust against unexpected typos..

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()
     } 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 )
-	type = vObjectStringZValue( o );
+    if ( strcmp( type, "type" ) == 0 || 
+	 strcmp( type, "TYPE" ) == 0 ||
+	 strcmp( type, "Type" ) == 0 )
+	    type = vObjectStringZValue( o );
     return type;
 }
 
 
 // end of source file vobject.c