Compile/link

svn path=/trunk/KDE/kdepim/; revision=489708

acljobs.cpp

@@ -243,7 +243,7 @@ void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
     KIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
-  subjobs.remove(job);
+  removeSubjob(job);
   const ACLListEntry& entry = *mACLListIterator;
   emit aclChanged( entry.userId, entry.permissions );
 

kmcomposewin.cpp

@@ -2989,8 +2989,7 @@ void KMComposeWin::compressAttach( int idx )
   }
 
   zip.setCompression( KZip::DeflateCompression );
-  if ( ! zip.writeFile( msgPart->name(), "", "", decoded.size(),
-           decoded.data() ) ) {
+  if ( ! zip.writeFile( msgPart->name(), "", "", decoded.data(),decoded.size())) {
     KMessageBox::sorry(0, i18n("KMail could not compress the file.") );
     static_cast<KMAtmListViewItem*>( mAtmItemList.at( i ) )->setCompress( false );
     return;