From kde-commits  Sat Dec 07 20:49:27 2002
From: Stephan Kulow <coolo () kde ! org>
Date: Sat, 07 Dec 2002 20:49:27 +0000
To: kde-commits
Subject: make_it_cool: kdenetwork/kmail
X-MARC-Message: https://marc.info/?l=kde-commits&m=103929420423161

CVS commit by coolo: 

changes found in HEAD


  A            subscription.cpp   1.1.2.1
  A            subscription.h   1.1.2.1
  M +5 -2      kmmessage.cpp   1.316.2.26
  M +1 -3      kmsender.cpp   1.162.2.9
  M +1 -1      kmversion.h   1.120.2.6


--- kdenetwork/kmail/kmmessage.cpp:1.316.2.25	Sun Dec  1 05:36:04 2002
@@ -2644,8 +2644,10 @@
   while (part)
   {
     //dive into multipart messages
-    while ( part && part->Headers().HasContentType() &&
-	    (mp == part->Headers().ContentType().TypeStr().c_str()) )
+    while (    part
+            && part->hasHeaders()
+            && part->Headers().HasContentType()
+            && (mp == part->Headers().ContentType().TypeStr().c_str()) )
     {
       parts.append( part );
       part = part->Body().FirstBodyPart();
@@ -2689,6 +2691,7 @@
   while (curpart && !idx) {
     //dive into multipart messages
     while(    curpart
+           && curpart->hasHeaders()
            && curpart->Headers().HasContentType()
            && (DwMime::kTypeMultipart == curpart->Headers().ContentType().Type()) )
     {
--- kdenetwork/kmail/kmsender.cpp:1.162.2.8	Sat Nov 30 16:24:33 2002
@@ -93,9 +93,7 @@
 {
   if (KMTransportInfo::availableTransports().isEmpty())
   {
-    KMessageBox::information(0,i18n("Please specify a send "
-				    "method in the settings "
-				    "and try again."));
+    KMessageBox::information(0,i18n("Please create an account for sending and try again."));
     return false;
   }
   if (!kernel->identityManager()->defaultIdentity().mailingAllowed())
--- kdenetwork/kmail/kmversion.h:1.120.2.5	Fri Nov 29 21:56:59 2002
@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "1.5"
+#define KMAIL_VERSION "1.5.9"
 
 #endif /*kmversion_h*/