[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kresources/groupwise/soap
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2005-07-25 13:40:20
Message-ID: 1122298820.628703.17052.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 438599 by wstephens:

Fix crash bug when contacts do not have a fullName structure

 M  +15 -13    contactconverter.cpp  


--- trunk/KDE/kdepim/kresources/groupwise/soap/contactconverter.cpp #438598:438599
@@ -224,23 +224,25 @@
   // Name parts
   ngwt__FullName* fullName = contact->fullName;
 
-  if ( fullName->displayName )
-    addr.setFormattedName( stringToQString( fullName->displayName ) );
+  if ( fullName ) {
+    if ( fullName->displayName )
+      addr.setFormattedName( stringToQString( fullName->displayName ) );
 
-  if ( fullName->namePrefix )
-    addr.setPrefix( stringToQString( fullName->namePrefix ) );
+    if ( fullName->namePrefix )
+      addr.setPrefix( stringToQString( fullName->namePrefix ) );
 
-  if ( fullName->firstName )
-    addr.setGivenName( stringToQString( fullName->firstName ) );
+    if ( fullName->firstName )
+      addr.setGivenName( stringToQString( fullName->firstName ) );
 
-  if ( fullName->middleName )
-    addr.setAdditionalName( stringToQString( fullName->middleName ) );
+    if ( fullName->middleName )
+      addr.setAdditionalName( stringToQString( fullName->middleName ) );
 
-  if ( fullName->lastName )
-    addr.setFamilyName( stringToQString( fullName->lastName ) );
+    if ( fullName->lastName )
+      addr.setFamilyName( stringToQString( fullName->lastName ) );
 
-  if ( fullName->nameSuffix )
-    addr.setSuffix( stringToQString( fullName->nameSuffix ) );
+    if ( fullName->nameSuffix )
+      addr.setSuffix( stringToQString( fullName->nameSuffix ) );
+  }
 
   // Emails
   if ( contact->emailList ) {
@@ -347,7 +349,7 @@
                           addresses.join( QChar( 0xE000 ) ) );
     }
   }
-  
+
   // addressbook delta sync info
   if ( contact->sync )
   {
[prev in list] [next in list] [prev in thread] [next in thread]