merge of '5052783f79bc86c62042f5d4a556a3573c4a3876'

and '8889afbf143b1653a2ac96bad029b4301fc1f146'

Monotone-Parent: 5052783f79bc86c62042f5d4a556a3573c4a3876
Monotone-Parent: 8889afbf143b1653a2ac96bad029b4301fc1f146
Monotone-Revision: fcece651323f876baef1d1d08bc52772b67ce6a4

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-09-28T15:07:20
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactFolderActions.m

@@ -207,24 +207,24 @@
 
 - (BOOL) importVcard: (NGVCard *) card
 {
-  NSString *uid, *name;
+  NSString *uid;
   SOGoContactGCSFolder *folder;
-  NSException *ex;
+  SOGoContactGCSEntry *contact;
   BOOL rc = NO;
 
   if (card)
     {
       folder = [self clientObject];
       uid = [folder globallyUniqueObjectId];
-      name = [NSString stringWithFormat: @"%@.vcf", uid];
+
       [card setUid: uid];
-      ex = [[folder ocsFolder] writeContent: [card versitString]
-                                     toName: name
-                                baseVersion: 0];
-      if (ex)
-        NSLog (@"write failed: %@", ex);
-      else
-        rc = YES;
+      contact = [SOGoContactGCSEntry objectWithName: uid
+                                        inContainer: folder];
+      [contact setIsNew: YES];
+      
+      [contact saveContentString: [card versitString]];
+      
+      rc = YES;
     }
 
   return rc;

UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox

@@ -1,17 +1,16 @@
 <?xml version="1.0" standalone="yes"?>
+<!DOCTYPE div>
 <div xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:var="http://www.skyrix.com/od/binding"
-     xmlns:const="http://www.skyrix.com/od/constant"
-     xmlns:rsrc="OGo:url"
-     xmlns:label="OGo:label"
->
-  <div>
-    <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
-      <div>
-        <var:component value="contentViewerComponent" 
-                       bodyInfo="childInfo"
-		       partPath="childPartPath" />
-      </div>
-    </var:foreach>
-  </div>
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  >
+  <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
+    <div>
+      <var:component value="contentViewerComponent" 
+	bodyInfo="childInfo"
+	partPath="childPartPath" />
+    </div>
+  </var:foreach>
 </div>

UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox

@@ -5,18 +5,15 @@
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
-  class="mailer_plaincontent signed"
+  class="signed"
   const:id="signedMessage"
   var:valid="validSignature"
-  var:error="validationMessage"
->
-  <div>
-    <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
-      <div>
-        <var:component value="contentViewerComponent" 
-                       bodyInfo="childInfo"
-		       partPath="childPartPath" />
-      </div>
-    </var:foreach>
-  </div>
+  var:error="validationMessage">
+  <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
+    <div>
+      <var:component value="contentViewerComponent" 
+	bodyInfo="childInfo"
+	partPath="childPartPath" />
+    </div>
+  </var:foreach>
 </div>