From c4059d9df2139e0c7a0e6949228b4e6945294081 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 3 Oct 2006 22:08:33 +0000
Subject: [PATCH] Monotone-Parent: bfdd8e3da1b7d0def1bb4ca50f7ac922cea2323a
 Monotone-Revision: 181cfcbcae699933e92b20839d62aaa10870077f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-03T22:08:33
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Contacts/SOGoContactGCSEntry.m  | 11 +++--------
 SoObjects/Contacts/SOGoContactLDAPEntry.m |  3 +--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index 5520f0102..1dde518e9 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -55,15 +55,10 @@
     {
       contentStr = [self contentAsString];
       if ([contentStr hasPrefix:@"BEGIN:VCARD"])
-        {
-          card = [NGVCard parseSingleFromSource: contentStr];
-          [card retain];
-        }
+        card = [NGVCard parseSingleFromSource: contentStr];
       else
-        {
-          card = [NGVCard new];
-          [card setTag: @"vcard"];
-        }
+        card = [NGVCard cardWithUid: [self nameInContainer]];
+      [card retain];
     }
 
   return card;
diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m
index 53e1037a1..3f968aaf8 100644
--- a/SoObjects/Contacts/SOGoContactLDAPEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m
@@ -138,8 +138,7 @@
 
   if (!vcard)
     {
-      vcard = [[NGVCard alloc] initWithUid: [self nameInContainer]
-                               version: @"3.0"];
+      vcard = [[NGVCard alloc] initWithUid: [self nameInContainer]];
       [vcard setVClass: @"PUBLIC"];
       [vcard setProdID: @"-//OpenGroupware.org//SOGo"];
       [vcard setProfile: @"vCard"];