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

List:       kde-commits
Subject:    branches/kdepim/proko2/kdepim/libkcal
From:       Till Adam <adam () kde ! org>
Date:       2006-10-16 19:33:47
Message-ID: 1161027227.595963.2915.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 596133 by tilladam:

Make sure CN's are quoted for attendees and organizers.


 M  +3 -3      icalformatimpl.cpp  
 M  +15 -11    person.cpp  
 M  +2 -0      person.h  


--- branches/kdepim/proko2/kdepim/libkcal/icalformatimpl.cpp #596132:596133
@@ -752,7 +752,7 @@
   icalproperty *p = icalproperty_new_organizer("MAILTO:" + organizer.email().utf8());
 
   if (!organizer.name().isEmpty()) {
-    icalproperty_add_parameter( p, icalparameter_new_cn(organizer.name().utf8()) );
+    icalproperty_add_parameter( p, icalparameter_new_cn(organizer.quotedName().utf8()) );
   }
   // TODO: Write dir, senty-by and language
 
@@ -762,10 +762,10 @@
 
 icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee)
 {
-  icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8());
+  icalproperty *p = icalproperty_new_attendee("MAILTO:" + attendee->email().utf8());
 
   if (!attendee->name().isEmpty()) {
-    icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8()));
+    icalproperty_add_parameter(p,icalparameter_new_cn(attendee->quotedName().utf8()));
   }
 
 
--- branches/kdepim/proko2/kdepim/libkcal/person.cpp #596132:596133
@@ -206,6 +206,20 @@
              p1.email() == p2.email() );
 }
 
+// Taken from KABC::Addressee::fullEmail
+QString Person::quotedName() const
+{
+  QString name = mName;
+  QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
+  bool weNeedToQuote = name.find( needQuotes ) != -1;
+  if ( weNeedToQuote ) {
+    if ( name[0] != '"' )
+      name.prepend( '"' );
+    if ( name[ name.length()-1 ] != '"' )
+      name.append( '"' );
+  }
+  return name;
+}
 
 QString Person::fullName() const
 {
@@ -215,17 +229,7 @@
     if( mEmail.isEmpty() )
       return mName;
     else {
-      // Taken from KABC::Addressee::fullEmail
-      QString name = mName;
-      QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
-      bool weNeedToQuote = name.find( needQuotes ) != -1;
-      if ( weNeedToQuote ) {
-          if ( name[0] != '"' )
-              name.prepend( '"' );
-          if ( name[ name.length()-1 ] != '"' )
-              name.append( '"' );
-      }
-      return name + " <" + mEmail + ">";
+      return quotedName() + " <" + mEmail + ">";
     }
   }
 }
--- branches/kdepim/proko2/kdepim/libkcal/person.h #596132:596133
@@ -38,6 +38,8 @@
 
     QString fullName( ) const;
 
+    QString quotedName() const;
+
     void setName(const QString &);
     QString name() const { return mName; }
     
[prev in list] [next in list] [prev in thread] [next in thread]