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

List:       kde-commits
Subject:    [kdepim/KDE/4.8] mailcommon: in setCollectionFullPath(), don't try to get the fullCollectionPath
From:       Allen Winter <winter () kde ! org>
Date:       2012-01-31 23:03:25
Message-ID: 20120131230325.7D12AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 54d1ac4fb1d45a155a5dc3750cc2e5815843b659 by Allen Winter.
Committed on 01/02/2012 at 00:01.
Pushed by winterz into branch 'KDE/4.8'.

in setCollectionFullPath(), don't try to get the fullCollectionPath
from the Akonadi::Collection specified unless we have collectionModel
in the kernel.

BUG: 292617
MERGE: 4.8
FIXED-IN: 4.8.1
(cherry picked from commit 85d050bf2bd1bbe8e73ee2775a6b0248cdc746dc)

M  +4    -2    mailcommon/folderrequester.cpp

http://commits.kde.org/kdepim/54d1ac4fb1d45a155a5dc3750cc2e5815843b659

diff --git a/mailcommon/folderrequester.cpp b/mailcommon/folderrequester.cpp
index 01c84a6..57c8c9d 100644
--- a/mailcommon/folderrequester.cpp
+++ b/mailcommon/folderrequester.cpp
@@ -104,9 +104,11 @@ Akonadi::Collection FolderRequester::collection() const
   return mCollection;
 }
 =

-void FolderRequester::setCollectionFullPath( const Akonadi::Collection&col=
 )
+void FolderRequester::setCollectionFullPath( const Akonadi::Collection &co=
l )
 {
-  edit->setText( Util::fullCollectionPath( col ) );
+  if ( KernelIf->collectionModel() ) {
+    edit->setText( Util::fullCollectionPath( col ) );
+  }
 }
 =

 //------------------------------------------------------------------------=
-----
[prev in list] [next in list] [prev in thread] [next in thread]