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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim
From:       Pradeepto Bhattacharya <pradeepto () kde ! org>
Date:       2008-02-28 4:57:15
Message-ID: 1204174635.563293.28296.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780140 by pradeepto:

Merged revisions 768738 via svnmerge from 
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r768738 | tilladam | 2008-01-30 20:37:37 +0530 (Wed, 30 Jan 2008) | 3 lines
  
  More guards against not yet set accounts.
  kolab/issue2387
........


 _M            . (directory)  
 M  +4 -2      kmail/newfolderdialog.cpp  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-768737,768739-768898,768900-768902,768904-768928,768930-769032,769034,7690 \
36-769040,769043-769044,769046,769048-769050,769052-769057,769059-769139,769142-769318 \
,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-768898,768900-768902,768904-768928,768930-769032,769034,769036-769040,76904 \
3-769044,769046,769048-769050,769052-769057,769059-769139,769142-769318,769320-769354, \
769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
                
--- branches/KDE/3.5/kdepim/kmail/newfolderdialog.cpp #780139:780140
@@ -212,10 +212,12 @@
     QString delimiter;
     if ( mFolder->folderType() == KMFolderTypeImap ) {
       KMAcctImap* ai = static_cast<KMFolderImap*>( mFolder->storage() )->account();
-      delimiter = ai->delimiterForFolder( mFolder->storage() );
+      if ( ai )
+        delimiter = ai->delimiterForFolder( mFolder->storage() );
     } else {
       KMAcctCachedImap* ai = static_cast<KMFolderCachedImap*>( mFolder->storage() \
                )->account();
-      delimiter = ai->delimiterForFolder( mFolder->storage() );
+      if ( ai )
+        delimiter = ai->delimiterForFolder( mFolder->storage() );
     }
     if ( !delimiter.isEmpty() && fldName.find( delimiter ) != -1 ) {
       KMessageBox::error( this, i18n( "Your IMAP server does not allow the character \
'%1'; please choose another folder name." ).arg( delimiter ) );


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