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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2008-09-30 20:06:19
Message-ID: 1222805179.402041.3884.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866421 by tmcguire:

Merged revisions 864002 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r864002 | vkrause | 2008-09-23 19:51:21 +0200 (Tue, 23 Sep 2008) | 13 lines
  
  Merged revisions 861999 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r861999 | vkrause | 2008-09-17 20:42:27 +0200 (Wed, 17 Sep 2008) | 6 lines
    
    Extend the openComposer() DCOP method by an identity parameter and use
    that in KOrganizer to send invitations from the identity that was used
    as organizer instead of the default identity.
    
    Kolab issue 2830
  ........
................


 _M            . (directory)  
 M  +3 -1      kmail/kmkernel.cpp  
 M  +2 -1      kmail/kmkernel.h  
 M  +5 -1      korganizer/komailclient.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970 \
/branches/kdepim/kmail-so  c:1-809833,812465,826213-826424
   + /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002 \
/branches/kdepim/k  mail-soc:1-809833,812465,826213-826424
--- trunk/KDE/kdepim/kmail/kmkernel.cpp #866420:866421
@@ -471,7 +471,8 @@
                             const QByteArray &attachParamAttr,
                             const QString &attachParamValue,
                             const QByteArray &attachContDisp,
-                            const QByteArray &attachCharset )
+                            const QByteArray &attachCharset,
+                            unsigned int identity )
 {
   kDebug(5006);
 
@@ -483,6 +484,7 @@
   if ( !bcc.isEmpty() ) msg->setBcc(bcc);
   if ( !subject.isEmpty() ) msg->setSubject(subject);
   if ( !to.isEmpty() ) msg->setTo(to);
+  if ( identity > 0 ) msg->setHeaderField( "X-KMail-Identity", QString::number( \
identity ) );  if ( !body.isEmpty() ) {
     msg->setBody(body.toUtf8());
   } else {
--- trunk/KDE/kdepim/kmail/kmkernel.h #866420:866421
@@ -198,7 +198,8 @@
                                  const QByteArray & attachParamAttr,
                                  const QString & attachParamValue,
                                  const QByteArray & attachContDisp,
-                                 const QByteArray & attachCharset );
+                                 const QByteArray & attachCharset,
+                                 unsigned int identity );
 
   Q_SCRIPTABLE QDBusObjectPath openComposer( const QString & to,
                                              const QString & cc,
--- trunk/KDE/kdepim/korganizer/komailclient.cpp #866420:866421
@@ -32,6 +32,9 @@
 #include <kcal/todo.h>
 #include <kcal/incidenceformatter.h>
 
+#include <kpimidentities/identity.h>
+#include <kpimidentities/identitymanager.h>
+
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -46,6 +49,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
+#include "kocore.h"
 
 KOMailClient::KOMailClient()
 {
@@ -211,7 +215,7 @@
       return kmail.openComposer
           (to,"",bcc ? from : "",subject,body,false,"cal.ics","7bit",
            attachment.toUtf8(),"text","calendar","method",meth,"attachment",
-           "utf-8").isValid();
+           "utf-8", KOCore::self()->identityManager()->identityForAddress( from \
).uoid()).isValid();  }
   }
   return true;


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

Configure | About | News | Add a list | Sponsored by KoreLogic