From 71cfbeaf5e3e0f10fd07771279f6f6e94b7e9ce8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 26 Nov 2007 14:30:02 +0000
Subject: [PATCH] Monotone-Parent: 6de7608d4605876bb174df7847a81f7e1cfb7c04
 Monotone-Revision: e2d85b05fa8aa8da95376091156223f1648f9677

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-26T14:30:02
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/ChangeLog      |  9 +++++++++
 SOPE/NGCards/NGVCard.m      | 16 ++++++----------
 SOPE/NGCards/iCalCalendar.m |  6 ++++++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 75c6d547e..e13917d67 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* iCalCalendar.m ([iCalCalendar -versitString]): same as below,
+	with "2.0" as value.
+
+	* NGVCard.m ([NGVCard -versitString]): overriden method by forcing
+	version to "3.0" since it's the format we comply with.
+	
+
 2007-11-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalEntityObject.m ([iCalEntityObject -compare:otherObject]):
diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m
index faf7eaa53..381ac1dbb 100644
--- a/SOPE/NGCards/NGVCard.m
+++ b/SOPE/NGCards/NGVCard.m
@@ -29,16 +29,6 @@
 
 @implementation NGVCard
 
-+ (id) parseSingleFromSource: (id) source
-{
-  NGVCard *newCard;
-
-  newCard = [super parseSingleFromSource: source];
-  [newCard setVersion: @"3.0"];
-
-  return newCard;
-}
-
 + (id) cardWithUid: (NSString *) _uid
 {
   NGVCard *newCard;
@@ -483,6 +473,12 @@
   return [self _preferredElementWithTag: @"adr"];
 }
 
+- (NSString *) versitString
+{
+  [self setVersion: @"3.0"];
+  return [self versitString];
+}
+
 /* description */
 
 - (void) appendAttributesToDescription: (NSMutableString *) _ms
diff --git a/SOPE/NGCards/iCalCalendar.m b/SOPE/NGCards/iCalCalendar.m
index b478b7f91..f0783c6f8 100644
--- a/SOPE/NGCards/iCalCalendar.m
+++ b/SOPE/NGCards/iCalCalendar.m
@@ -200,6 +200,12 @@
   return ma;
 }
 
+- (NSString *) versitString
+{
+  [self setVersion: @"2.0"];
+  return [self versitString];
+}
+
 /* ical typing */
 
 - (NSString *) entityName