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

List:       kde-commits
Subject:    [kdepim] kmail: Minor optimization when nepomuk is down
From:       Montel Laurent <montel () kde ! org>
Date:       2011-10-31 18:46:51
Message-ID: 20111031184651.D1885A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 0f3c03984d009a52188af51237d334924ee31b2f by Montel Laurent.
Committed on 31/10/2011 at 19:46.
Pushed by mlaurent into branch 'master'.

Minor optimization when nepomuk is down

M  +9    -3    kmail/messageactions.cpp

http://commits.kde.org/kdepim/0f3c03984d009a52188af51237d334924ee31b2f

diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index b949cea..0768807 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -280,8 +280,15 @@ void MessageActions::updateActions()
   mReplyListAction->setEnabled( hasPayload );
   mNoQuoteReplyAction->setEnabled( hasPayload );
 
-  mAnnotateAction->setEnabled( singleMsg && \
                Nepomuk::ResourceManager::instance()->initialized() );
-  mAsynNepomukRetriever->requestResource( mCurrentItem.url(), QVector<QUrl>() << \
Nepomuk::Resource::descriptionUri() << Nepomuk::Resource::annotationUri() ); +  if ( \
Nepomuk::ResourceManager::instance()->initialized() ) +  {
+    mAnnotateAction->setEnabled( singleMsg );
+    mAsynNepomukRetriever->requestResource( mCurrentItem.url(), QVector<QUrl>() << \
Nepomuk::Resource::descriptionUri() << Nepomuk::Resource::annotationUri() ); +  }
+  else
+  {
+    mAnnotateAction->setEnabled( false );
+  }
 
   mStatusMenu->setEnabled( multiVisible );
 
@@ -308,7 +315,6 @@ void MessageActions::slotUpdateActionsFetchDone(KJob* job)
   Akonadi::ItemFetchJob *fetchJob = static_cast<Akonadi::ItemFetchJob*>( job );
   if ( fetchJob->items().isEmpty() )
     return;
-
   Akonadi::Item  messageItem = fetchJob->items().first();
   if ( messageItem == mCurrentItem ) {
     mCurrentItem = messageItem;


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