From 14d394e6c107b037a09a31a92605034fe50f7813 Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Fri, 08 Aug 2003 14:45:49 +0000
Subject: Merged branches from BRANCH_1_0

---
(limited to 'library/backend')

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 94a8fea..4c79368 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -1033,8 +1033,10 @@ static int yylex() {
 	    if (lexWithinMode(L_BASE64)) {
 		/* get each char and convert to bin on the fly... */
 		p = lexGetDataFromBase64();
+#if 0		
 		yylval.str = p;
 		return STRING;
+#endif		
 		}
 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
 		p = lexGetQuotedPrintable();
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 5649522..5f53aef 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -1053,8 +1053,10 @@ static int yylex() {
 	    if (lexWithinMode(L_BASE64)) {
 		/* get each char and convert to bin on the fly... */
 		p = lexGetDataFromBase64();
+#if 0
 		yylval.str = p;
 		return STRING;
+#endif		
 		}
 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
 		p = lexGetQuotedPrintable();
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index b6d17dc..4c8de70 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -757,6 +757,7 @@ static struct PreDefProp propNames[] = {
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCQPProp, VCBase64Prop, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
--
cgit v0.9.0.2