Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 3 insertions, 1 deletions

diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index a0d921e..0d0a2a8 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -74,6 +74,8 @@ which accompanied this distribution.
 

 */

 

+// No tr() anywhere in this file
+
 

 #ifndef __VOBJECT_H__

 #define __VOBJECT_H__ 1

@@ -142,7 +144,7 @@ For example:
         #define VCCategoriesProp        "CATEGORIES"

         #define VCCellularProp          "CELL"

         #define VCCGMProp                       "CGM"

-        #define VCCharSetProp           "CS"

+        #define VCCharSetProp           "CHARSET"
         #define VCCIDProp                       "CID"

         #define VCCISProp                       "CIS"

         #define VCCityProp                      "L"