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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2010-10-18 15:14:05
Message-ID: 20101018151405.A6FA6AC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187183 by winterz:

give the organizer the opportunity to email an updated invitation showing
the new attendee list, if the attendee list is the only thing that changed.
kolab/issue4262
MERGE: trunk,e35tag


 M  +13 -3     kogroupware.cpp  


--- branches/kdepim/enterprise/kdepim/korganizer/kogroupware.cpp #1187182:1187183
@@ -439,15 +439,16 @@
         }
 
         // For existing attendees, skip the update if there are no other changes except attendees
-        if ( sendUpdate && ( sameAtts.count() > 0 ) ) {
+        if ( sameAtts.count() > 0 ) {
           QStringList attStrList;
           Attendee::List::ConstIterator it;
           for ( it = sameAtts.begin(); it != sameAtts.end(); ++it ) {
             attStrList << (*it)->fullName();
           }
           const QString recipients = attStrList.join( "," );
-
-          int newMail = KMessageBox::questionYesNoList(
+          int newMail;
+          if ( sendUpdate ) {
+            newMail = KMessageBox::questionYesNoList(
             parent,
             i18n( "You changed the invitation \"%1\".\n"
                   "Do you want to email an updated invitation to these attendees?" ).
@@ -455,6 +456,15 @@
             attStrList,
             i18n( "Send Invitation Update" ),
             KGuiItem( i18n( "Send Email" ) ), KGuiItem( i18n( "Do Not Send" ) ) );
+          } else {
+            newMail = KMessageBox::questionYesNoList(
+              parent,
+              i18n( "You changed the invitation attendee list only.\n"
+                    "Do you want to email an updated invitation showing the new attendees?" ),
+              attStrList,
+              i18n( "Send Invitation Update" ),
+              KGuiItem( i18n( "Send Email" ) ), KGuiItem( i18n( "Do Not Send" ) ) );
+          }
           if ( newMail == KMessageBox::Yes ) {
             KCal::MailScheduler scheduler( mCalendar );
             scheduler.performTransaction( incidence, Scheduler::Request, recipients );
[prev in list] [next in list] [prev in thread] [next in thread]