From 485a9d4462f44d1b9d840d145fd232c7c8b8332e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 19 Feb 2016 16:09:08 -0500
Subject: [PATCH] Fix import of cn from SQL source

---
 SoObjects/Contacts/NGVCard+SOGo.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 123a56323..48c0196c1 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -248,16 +248,20 @@ convention:
   CardElement *element;
   NSCalendarDate *now;
   NSArray *units;
-  NSString *ou;
+  NSString *fn, *ou;
   id o;
 
   [self setNWithFamily: [ldifRecord objectForKey: @"sn"]
                  given: [ldifRecord objectForKey: @"givenname"]
             additional: nil prefixes: nil suffixes: nil];
   [self setNickname: [ldifRecord objectForKey: @"mozillanickname"]];
-  [self setFn: [ldifRecord objectForKey: @"displayname"]];
   [self setTitle: [ldifRecord objectForKey: @"title"]];  
 
+  fn = [ldifRecord objectForKey: @"displayname"];
+  if (!fn)
+    fn = [ldifRecord objectForKey: @"cn"];
+  [self setFn: fn];
+
   element = [self elementWithTag: @"adr" ofType: @"home"];
   [element setSingleValue: [ldifRecord objectForKey: @"mozillahomestreet2"]
                   atIndex: 1 forKey: @""];