added fields to kapi

1 files changed, 5 insertions, 6 deletions

diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 041effc..4c6231d 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -148,73 +148,72 @@ QString PhoneNumber::typeLabel() const
       if ( first )
         first = false;
     }
   }
 
   return label;
 }
 
 QString PhoneNumber::label() const
 {
   return typeLabel( type() );
 }
 
 PhoneNumber::TypeList PhoneNumber::typeList()
 {
   TypeList list;
   
   list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video
        << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
 
 QString PhoneNumber::typeLabel( int type )
 {
   QString typeString;
   
-  if ((type & Home) == Home)
-    typeString += i18n("Home");
-  else if ((type & Work) == Work)
-    typeString += i18n("Work");
    
-  if (!typeString.isEmpty())
-    typeString += " ";
   if ((type & Cell) == Cell)
     typeString += i18n("Mobile") +" ";
+  if ((type & Home) == Home)
+    typeString += i18n("Home")+" ";
+  else if ((type & Work) == Work)
+    typeString += i18n("Work")+" ";
+   
   if ((type & Sip) == Sip)
     typeString += i18n("SIP")+" ";
   if ((type & Car) == Car)
     typeString += i18n("Car")+" ";
 
   if ((type & Fax) == Fax)
     typeString += i18n("Fax");
   else if ((type & Msg) == Msg)
     typeString += i18n("Messenger");
   else if ((type & Video) == Video)
     typeString += i18n("Video");
   else if ((type & Bbs) == Bbs)
     typeString += i18n("Mailbox");
   else if ((type & Modem) == Modem)
     typeString += i18n("Modem");
   else if ((type & Isdn) == Isdn)
     typeString += i18n("ISDN");
   else if ((type & Pcs) == Pcs)
     typeString += i18n("PCS");
   else if ((type & Pager) == Pager)
     typeString += i18n("Pager");
   // add the prefered flag    
   /*
   if ((type & Pref) == Pref)
     typeString += i18n("(p)");
   */
   //if we still have no match, return "other"        
   if (typeString.isEmpty()) {
       if ((type & Voice) == Voice)
           return i18n("Voice");
       else
           return i18n("Other");