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

List:       kde-commits
Subject:    branches/KDE/4.2/kdepim/kaddressbook/xxport
From:       Allen Winter <winter () kde ! org>
Date:       2009-05-14 12:39:08
Message-ID: 1242304748.197590.3443.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967933 by winterz:

backport SVN commit 967932 by winterz:

Fix kaddressbook export for GMX.
Patch from Urs. Thanks!

http://reviewboard.kde.org/r/693/


 M  +6 -6      gmx_xxport.cpp  


--- branches/KDE/4.2/kdepim/kaddressbook/xxport/gmx_xxport.cpp #967932:967933
@@ -295,8 +295,8 @@
 	KABC::Address address;
   	KABC::PhoneNumber phone, fax, cell;
 
-
-        if (record_id == 0) {
+	/* record ID == 1: Work address */
+        if (record_id == 1) {
 		address = addr->address(KABC::Address::Work);
 		phone = addr->phoneNumber(KABC::PhoneNumber::Work);
 		fax   = addr->phoneNumber(KABC::PhoneNumber::Fax);
@@ -322,13 +322,13 @@
 	  << cell.number() << DELIM		// Mobile
 	  << ((cell.type()&KABC::PhoneNumber::Pref)?-1:0) << DELIM // Mobile_type
 	  << email << DELIM			// Email
-	  << ((record_id==0)?addr->url().url():QString()) << DELIM // Homepage
-	  << ((record_id==0)?addr->role():QString()) << DELIM	// Position
+	  << ((record_id==1)?addr->url().url():QString()) << DELIM // Homepage
+	  << ((record_id==1)?addr->role():QString()) << DELIM	// Position
 	  << DELIM				// Comments
 	  << record_id << DELIM			// Record_type_id (0,1,2) - see above
 	  << DELIM				// Record_type (name of this additional record entry)
-	  << ((record_id==0)?addr->organization():QString()) << DELIM // Company
-	  << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):QString()) << DELIM // Department
+	  << ((record_id==1)?addr->organization():QString()) << DELIM // Company
+	  << ((record_id==1)?addr->custom("KADDRESSBOOK", "X-Department"):QString()) << DELIM // Department
 	  << dateString(addr->revision()) << DELIM	// Change_date
 	  << 5 << DELIM				// Preferred
 	  << 1 << endl;				// Status (should always be "1")
[prev in list] [next in list] [prev in thread] [next in thread]