Merged revisions 813689 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r813689 | vkrause | 2008-05-28 15:52:32 +0200 (Wed, 28 May 2008) | 12 lines
  
  Merged revisions 767769 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r767769 | vkrause | 2008-01-28 19:50:05 +0100 (Mon, 28 Jan 2008) | 5 lines
    
    Add account name to the resource name in case there are multiple DIMAP
    accounts.
    
    Kolab issue 2319
  ........
................

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

kmailicalifaceimpl.cpp

@@ -649,6 +649,19 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
   }
 }
 
+static int dimapAccountCount()
+{
+  KMail::AccountManager *mgr = kmkernel->acctMgr();
+  KMAccount *account = mgr->first();
+  int count = 0;
+  while ( account ) {
+    if ( dynamic_cast<KMAcctCachedImap*>( account ) )
+      ++count;
+    account = mgr->next();
+  }
+  return count;
+}
+
 static QString subresourceLabelForPresentation( const KMFolder * folder )
 {
   QString label = folder->prettyUrl();
@@ -672,7 +685,12 @@ static QString subresourceLabelForPresentation( const KMFolder * folder )
       QStringList remainder(parts);
       remainder.pop_front();
       remainder.pop_front();
-      label = i18n("My %1", remainder.join( QString::fromLatin1("/") ) );
+      if ( dimapAccountCount() > 1 ) {
+        label = i18n( "My %1 (%2)", remainder.join( QString::fromLatin1("/") ),
+                      static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
+      } else {
+        label = i18n("My %1", remainder.join( QString::fromLatin1("/") ) );
+      }
       break;
     }
   }