branches/KDE/4.3/kdepim/kmail (merge)

SVN commit 1005088 by tmcguire:

Backport r1004681 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1001563,1004554 via svnmerge from 
svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001563 | tmcguire | 2009-07-23 18:33:11 +0200 (Thu, 23 Jul 2009) | 10 lines
  
  Merged revisions 1001562 via svnmerge from 
  svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1001562 | tmcguire | 2009-07-23 18:28:14 +0200 (Thu, 23 Jul 2009) | 3 lines
    
    Don't show a folder content type combo box for online IMAP folders, because 
that is not supported.
    Fixes kolab/issue3742
  ........
................
  r1004554 | winterz | 2009-07-30 15:29:00 +0200 (Thu, 30 Jul 2009) | 11 lines
  
  Merged revisions 1004535 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1004535 | tmcguire | 2009-07-30 08:51:43 -0400 (Thu, 30 Jul 2009) | 4 lines
    
    Fix silly crash when creating a folder.
    
    kolab/issue3777
  ........
................



 M  +1 -0      kmfolderdialog.cpp  
 M  +3 -2      newfolderdialog.cpp  


--- branches/KDE/4.3/kdepim/kmail/kmfolderdialog.cpp #1005087:1005088
@@ -539,6 +539,7 @@
 
   // folder contents
   if ( ( !mIsLocalSystemFolder || mIsResourceFolder ) &&
+       mDlg->folder() && mDlg->folder()->folderType() == 
KMFolderTypeCachedImap &&
        kmkernel->iCalIface().isEnabled() ) {
     // Only do make this settable, if the IMAP resource is enabled
     // and it's not the personal folders (those must not be changed)
--- branches/KDE/4.3/kdepim/kmail/newfolderdialog.cpp #1005087:1005088
@@ -55,7 +55,7 @@
 using namespace KMail;
 
 NewFolderDialog::NewFolderDialog( QWidget* parent, KMFolder *folder )
-  : KDialog( parent ), mFolder( folder )
+  : KDialog( parent ), mContentsComboBox( 0 ), mFolder( folder )
 {
   setCaption( i18n( "New Folder" ) );
   setButtons( Ok | Cancel );
@@ -129,7 +129,8 @@
   }
 
   // --- contents -----
-  if ( kmkernel->iCalIface().isEnabled() ) {
+  if ( kmkernel->iCalIface().isEnabled() &&
+       mFolder && mFolder->folderType() == KMFolderTypeCachedImap ) {
     mContentsHBox = new QHBoxLayout();
     mContentsHBox->setSpacing( 6 );
     mContentsHBox->setMargin( 0 );