9 files changed, 29 insertions, 4 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index d484073..6b282e2 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -475,16 +475,20 @@ QString Addressee::isdnLabel()
 }
 
 
 QString Addressee::pagerLabel()
 {
   return i18n("Pager");
 }
 
+QString Addressee::sipLabel()
+{
+  return i18n("SIP");
+}
 
 QString Addressee::emailLabel()
 {
   return i18n("Email Address");
 }
 
 
 void Addressee::setMailer( const QString &mailer )
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 393d1cc..27782f9 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -328,16 +328,21 @@ class Addressee
     static QString isdnLabel();
 
     /**
       Return translated label for pager field.
      */
     static QString pagerLabel();
 
     /**
+      Return translated label for sip field.
+     */
+    static QString sipLabel();
+
+    /**
       Return translated label for email field.
      */
     static QString emailLabel();
 
     /**
       Set mail client.
      */
     void setMailer( const QString &mailer );
diff --git a/kabc/field.cpp b/kabc/field.cpp
index e27970e..d95cd19 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -79,17 +79,18 @@ class Field::FieldImpl
       Pager,
       Email,
       Mailer,
       Title,
       Role,
       Organization,
       Note,
       Url,
-      Resource
+      Resource,
+      Sip
     };
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
     
     QString label() { return mLabel; }
     QString key() { return mKey; }
     QString app() { return mApp; }
@@ -189,16 +190,18 @@ QString Field::label()
     case FieldImpl::Organization:
       return Addressee::organizationLabel();
     case FieldImpl::Note:
       return Addressee::noteLabel();
     case FieldImpl::Url:
       return Addressee::urlLabel();
     case FieldImpl::Resource:
       return Addressee::resourceLabel();
+    case FieldImpl::Sip:
+      return Addressee::sipLabel();
     case FieldImpl::CustomField:
       return mImpl->label();
     default:
       return i18n("Unknown Field");
   }
 }
 
 int Field::category()
@@ -285,16 +288,18 @@ QString Field::value( const KABC::Addressee &a )
     case FieldImpl::BusinessFax:
       return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
     case FieldImpl::CarPhone:
       return a.phoneNumber( PhoneNumber::Car ).number();
     case FieldImpl::Isdn:
       return a.phoneNumber( PhoneNumber::Isdn ).number();
     case FieldImpl::Pager:
       return a.phoneNumber( PhoneNumber::Pager ).number();
+    case FieldImpl::Sip:
+      return a.phoneNumber( PhoneNumber::Sip ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
       return a.address( Address::Home ).region();
     case FieldImpl::HomeAddressPostalCode:
       return a.address( Address::Home ).postalCode();
@@ -413,16 +418,17 @@ Field::List Field::allFields()
     createField( FieldImpl::Email, Email|Frequent );
     createField( FieldImpl::Mailer, Email );
     createField( FieldImpl::Title, Organization );
     createField( FieldImpl::Role, Organization );
     createField( FieldImpl::Organization, Organization );
     createField( FieldImpl::Note );
     createField( FieldImpl::Url );
     createField( FieldImpl::Resource );
+    createField( FieldImpl::Sip );
   }
 
   return mAllFields;
 }
 
 Field::List Field::defaultFields()
 {
   if ( mDefaultFields.isEmpty() ) {
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 4ad608d..7aeb2ee 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -120,17 +120,17 @@ 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;
+       << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
@@ -166,16 +166,18 @@ QString PhoneNumber::typeLabel( int type )
   else if ((type & Car) == Car)
     typeString += i18n("Car");
   else if ((type & Isdn) == Isdn)
     typeString += i18n("ISDN");
   else if ((type & Pcs) == Pcs)
     typeString += i18n("PCS");
   else if ((type & Pager) == Pager)
     typeString += i18n("Pager");
+  else if ((type & Sip) == Sip)
+    typeString += i18n("SIP");
     
   // add the prefered flag    
   if (!typeString.isEmpty())
     typeString += " ";
 
   if ((type & Pref) == Pref)
     typeString += i18n("(p)");
 
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index 6a9c8cb..1df344f 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -59,20 +59,21 @@ class PhoneNumber
       @li @p Cell -  Cell phone
       @li @p Video - Video phone
       @li @p Bbs -   Mailbox
       @li @p Modem - Modem
       @li @p Car -   Car phone
       @li @p Isdn -  ISDN connection
       @li @p Pcs -   Personal Communication Service
       @li @p Pager - Pager
+      @li @p SIP   - VoIP
     */
     enum Types { Home = 1, Work = 2, Msg = 4, Pref = 8, Voice = 16, Fax = 32,
            Cell = 64, Video = 128, Bbs = 256, Modem = 512, Car = 1024,
-           Isdn = 2048, Pcs = 4096, Pager = 8192 };
+           Isdn = 2048, Pcs = 4096, Pager = 8192, Sip = 16384 };
 
     /**
       Create an empty phone number object.
     */  
     PhoneNumber();
 
     /**
       Create a phonenumber object.
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index b02aac4..277de22 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -165,17 +165,18 @@ bool VCardLineX::isValid() const
                     qualifiers.contains(VCARD_TEL_MSG)   ||
                     qualifiers.contains(VCARD_TEL_CELL)  ||
                     qualifiers.contains(VCARD_TEL_PAGER) ||
                     qualifiers.contains(VCARD_TEL_BBS)   ||
                     qualifiers.contains(VCARD_TEL_MODEM) ||
                     qualifiers.contains(VCARD_TEL_CAR)   ||
                     qualifiers.contains(VCARD_TEL_ISDN)  ||
                     qualifiers.contains(VCARD_TEL_VIDEO) ||
-                    qualifiers.contains(VCARD_TEL_PCS)
+                    qualifiers.contains(VCARD_TEL_PCS)   ||
+                    qualifiers.contains(VCARD_TEL_SIP)
          ) )
         return true;
       if ( name == VCARD_TZ )
         return true;
       if ( name == VCARD_TITLE )
         return true;
       break;
 
@@ -296,16 +297,18 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
         if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
           type |= PhoneNumber::Car;
         if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
           type |= PhoneNumber::Isdn;
         if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
           type |= PhoneNumber::Video;
         if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
           type |= PhoneNumber::Pcs;
+        if ( (*i).qualifiers.contains( VCARD_TEL_SIP ) )
+          type |= PhoneNumber::Sip;
       }
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
     }
   }
 
   //set the addressee's addresses
   for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_ADR ) {
diff --git a/kabc/vcard21parser.h b/kabc/vcard21parser.h
index 24b0eb2..77e69b6 100644
--- a/kabc/vcard21parser.h
+++ b/kabc/vcard21parser.h
@@ -87,16 +87,17 @@ $Id$
 #define VCARD_TEL_CELL     "cell"
 #define VCARD_TEL_PAGER    "pager"
 #define VCARD_TEL_BBS      "bbs"
 #define VCARD_TEL_MODEM    "modem"
 #define VCARD_TEL_CAR      "car"
 #define VCARD_TEL_ISDN     "isdn"
 #define VCARD_TEL_VIDEO    "video"
 #define VCARD_TEL_PCS      "pcs"
+#define VCARD_TEL_SIP      "sip"
 #define VCARD_EMAIL        "email"
 // types
 #define VCARD_EMAIL_PREF    "pref"
 #define VCARD_EMAIL_INTERNET "internet"
 #define VCARD_EMAIL_X400   "x400"
 #define VCARD_TZ             "tz"
 #define VCARD_GEO            "geo"
 #define VCARD_MAILER         "mailer"
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index bffaa64..2d6eb3d 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -586,16 +586,17 @@ void VCardFormatImpl::addTelephoneValue( VCard *v, const PhoneNumber &p )
   if( p.type() & PhoneNumber::Cell ) params.append( new Param( "TYPE", "cell" ) );
   if( p.type() & PhoneNumber::Video ) params.append( new Param( "TYPE", "video" ) );
   if( p.type() & PhoneNumber::Bbs ) params.append( new Param( "TYPE", "bbs" ) );
   if( p.type() & PhoneNumber::Modem ) params.append( new Param( "TYPE", "modem" ) );
   if( p.type() & PhoneNumber::Car ) params.append( new Param( "TYPE", "car" ) );
   if( p.type() & PhoneNumber::Isdn ) params.append( new Param( "TYPE", "isdn" ) );
   if( p.type() & PhoneNumber::Pcs ) params.append( new Param( "TYPE", "pcs" ) );
   if( p.type() & PhoneNumber::Pager ) params.append( new Param( "TYPE", "pager" ) );
+  if( p.type() & PhoneNumber::Sip ) params.append( new Param( "TYPE", "sip" ) );
   cl.setParamList( params );
 
   v->add(cl);
 }
 
 PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
 {
   PhoneNumber p;
@@ -618,16 +619,17 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
       else if ( tmpStr == "cell" ) type |= PhoneNumber::Cell;
       else if ( tmpStr == "video" ) type |= PhoneNumber::Video;
       else if ( tmpStr == "bbs" ) type |= PhoneNumber::Bbs;
       else if ( tmpStr == "modem" ) type |= PhoneNumber::Modem;
       else if ( tmpStr == "car" ) type |= PhoneNumber::Car;
       else if ( tmpStr == "isdn" ) type |= PhoneNumber::Isdn;
       else if ( tmpStr == "pcs" ) type |= PhoneNumber::Pcs;
       else if ( tmpStr == "pager" ) type |= PhoneNumber::Pager;
+      else if ( tmpStr == "sip" ) type |= PhoneNumber::Sip;
     }
   }
   p.setType( type );
 
   return p;
 }
 
 QString VCardFormatImpl::readTextValue( ContentLine *cl )
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 71f29d7..3fb212e 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -52,16 +52,17 @@ VCardTool::VCardTool()
   mPhoneTypeMap.insert( "CELL", PhoneNumber::Cell );
   mPhoneTypeMap.insert( "VIDEO", PhoneNumber::Video );
   mPhoneTypeMap.insert( "BBS", PhoneNumber::Bbs );
   mPhoneTypeMap.insert( "MODEM", PhoneNumber::Modem );
   mPhoneTypeMap.insert( "CAR", PhoneNumber::Car );
   mPhoneTypeMap.insert( "ISDN", PhoneNumber::Isdn );
   mPhoneTypeMap.insert( "PCS", PhoneNumber::Pcs );
   mPhoneTypeMap.insert( "PAGER", PhoneNumber::Pager );
+  mPhoneTypeMap.insert( "SIP", PhoneNumber::Sip );
 }
 
 VCardTool::~VCardTool()
 {
 }
 
 QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
 {