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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2004-10-01 6:39:58
Message-ID: 20041001063958.CF3EC996F () office ! kde ! org
[Download RAW message or body]

CVS commit by djarvie: 

Prevent blind copy to self of email alarms via KMail when bcc is deselected


  M +3 -1      Changelog   1.73.2.9
  M +4 -4      kamail.cpp   1.22.2.2


--- kdepim/kalarm/Changelog  #1.73.2.8:1.73.2.9
@@ -1,6 +1,8 @@
 KAlarm
 
-=== Version 1.1.6 --- 19 September 2004 ===
+=== Version 1.1.6 --- 30 September 2004 ===
 Prevent crash if kalarmui.rc is missing.
+Unsuppress Quit warning message box if default answer is Cancel quit.
+Prevent blind copy to self of email alarms via KMail when bcc is deselected.
 
 === Version 1.1.5 --- 1 September 2004 ===

--- kdepim/kalarm/kamail.cpp  #1.22.2.1:1.22.2.2
@@ -87,5 +87,5 @@ QString KAMail::send(const KAEvent& even
                        : i18n("No 'From' email address is configured.\nPlease set it \
in the %1 Preferences dialog.").arg(kapp->aboutData()->programName());  }
-        QString bcc  = preferences->emailBccAddress();
+        QString bcc = event.emailBcc() ? preferences->emailBccAddress() : \
                QString::null;
         kdDebug(5950) << "KAlarmApp::sendEmail(): To: " << event.emailAddresses(", \
")  << "\nSubject: " << event.emailSubject() << endl;
@@ -110,5 +110,5 @@ QString KAMail::send(const KAEvent& even
                         command += KShellProcess::quote(event.emailSubject());
 
-                        if (event.emailBcc()  &&  !bcc.isEmpty())
+                        if (!bcc.isEmpty())
                         {
                                 command += QString::fromLatin1(" -b ");
@@ -249,5 +249,5 @@ QString KAMail::sendKMail(const KAEvent&
                      << "--subject" << event.emailSubject().local8Bit()
                      << "--body" << event.message().local8Bit();
-                if (event.emailBcc()  &&  !bcc.isEmpty())
+                if (!bcc.isEmpty())
                         proc << "--bcc" << bcc.local8Bit();
                 QStringList attachments = event.emailAttachments();
@@ -287,5 +287,5 @@ QString KAMail::initHeaders(const KAEven
         message += QString::fromLatin1("From: ") + from;
         message += QString::fromLatin1("\nTo: ") + event.emailAddresses(", ");
-        if (event.emailBcc()  &&  !bcc.isEmpty())
+        if (!bcc.isEmpty())
                 message += QString::fromLatin1("\nBcc: ") + bcc;
         message += QString::fromLatin1("\nSubject: ") + event.emailSubject();


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