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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi/kmime
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2011-01-13 14:33:50
Message-ID: 20110113143350.EFFA4AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214209 by tokoe:

Do not intercept ManageLocalSubscriptions action

We can use the default implementation from StandardActionManager,
now that it uses the mime type filter for subscription dialog as well.
This will also bring back the dialog on WinCE.

BUG: 259976


 M  +0 -11     standardmailactionmanager.cpp  
 M  +0 -1      standardmailactionmanager.h  


--- trunk/KDE/kdepimlibs/akonadi/kmime/standardmailactionmanager.cpp #1214208:1214209
@@ -225,9 +225,6 @@
 
       mGenericManager->setMimeTypeFilter( QStringList() << \
                KMime::Message::mimeType() );
       mGenericManager->setCapabilityFilter( QStringList() << QLatin1String( \
                "Resource" ) );
-      mGenericManager->interceptAction( \
                Akonadi::StandardActionManager::ManageLocalSubscriptions );
-      connect( mGenericManager->action( \
                StandardActionManager::ManageLocalSubscriptions ), SIGNAL( triggered( \
                bool ) ),
-               mParent, SLOT( slotMailLocalSubscription() ) );
     }
 
     ~Private()
@@ -499,14 +496,6 @@
       command->execute();
     }
 
-    void slotMailLocalSubscription()
-    {
-#ifndef Q_OS_WINCE
-      SubscriptionDialog* dlg = new SubscriptionDialog( QStringList() << \
                KMime::Message::mimeType(), mParentWidget );
-      dlg->show();
-#endif
-    }
-
     KActionCollection *mActionCollection;
     QWidget *mParentWidget;
     StandardActionManager *mGenericManager;
--- trunk/KDE/kdepimlibs/akonadi/kmime/standardmailactionmanager.h #1214208:1214209
@@ -208,7 +208,6 @@
     Q_PRIVATE_SLOT( d, void slotRemoveDuplicates() )
     Q_PRIVATE_SLOT( d, void slotEmptyAllTrash() )
     Q_PRIVATE_SLOT( d, void slotEmptyTrash() )
-    Q_PRIVATE_SLOT( d, void slotMailLocalSubscription() )
     //@endcond
 };
 


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