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

List:       kde-commits
Subject:    KDE/kdepim
From:       Leo Franchi <lfranchi () kde ! org>
Date:       2010-05-31 21:09:42
Message-ID: 20100531210942.312C8AC8C6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1132998 by lfranchi:

Finish fixing MDN options. Should behave correctly in all cases now.

BUG: 238107


 M  +2 -0      kmail/mdnadvicedialog.cpp  
 M  +1 -1      messagecomposer/messagefactory.cpp  


--- trunk/KDE/kdepim/kmail/mdnadvicedialog.cpp #1132997:1132998
@@ -147,6 +147,8 @@
       mode = requestAdviceOnMDN( "mdnNormalAsk" );
       s = KMime::MDN::SentManually; // asked user
     }
+  } else { // if message doesn't have a disposition header, never send anything.
+    mode = 0;
   }
 
   if( mode == 0 ) // ignore
--- trunk/KDE/kdepim/messagecomposer/messagefactory.cpp #1132997:1132998
@@ -548,7 +548,7 @@
 
   // extract where to send to:
   QString receiptTo = m_origMsg->headerByType("Disposition-Notification-To") ? \
m_origMsg->headerByType("Disposition-Notification-To")->asUnicodeString() : \
                QString::fromLatin1("");
-  if ( receiptTo.trimmed().isEmpty() ) receiptTo = \
m_origMsg->from()->asUnicodeString(); +  if( receiptTo.trimmed().isEmpty() ) return \
KMime::Message::Ptr( new KMime::Message );  receiptTo.remove( QChar::fromLatin1('\n') \
);  
 


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