[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/pim/mailody/src
From: Tom Albers <toma () kde ! org>
Date: 2009-10-18 8:44:56
Message-ID: 1255855496.638026.29272.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1036915 by toma:
Fix the build. Also complete the manual expunge code. It requires a change \
in the imap resource, but after that, it should magically start working.
M +7 -7 mainwindow.cpp
M +1 -0 mainwindow.h
--- trunk/extragear/pim/mailody/src/mainwindow.cpp #1036914:1036915
@@ -42,7 +42,7 @@
#include <akonadi/favoritecollectionsmodel.h>
#include <akonadi/entitylistview.h>
#include <akonadi/itemfetchscope.h>
-#include <akonadi/mimetypefilterproxymodel.h>
+#include <akonadi/entitymimetypefiltermodel.h>
#include <akonadi/session.h>
#include <akonadi/statisticsproxymodel.h>
#include <akonadi/statisticstooltipproxymodel.h>
@@ -289,13 +289,14 @@
Akonadi::EntityTreeModel* collectionModel = new EntityTreeModel( \
session, monitor, this );
collectionModel->setItemPopulationStrategy( \
EntityTreeModel::LazyPopulation );
- MimeTypeFilterProxyModel *collectionFilter = new \
MimeTypeFilterProxyModel( this ); + EntityMimeTypeFilterModel \
*collectionFilter = new EntityMimeTypeFilterModel( this ); \
collectionFilter->setSourceModel( collectionModel );
collectionFilter->addMimeTypeInclusionFilter( Collection::mimeType() \
);
collectionFilter->setHeaderGroup( \
EntityTreeModel::CollectionTreeHeaders );
StatisticsProxyModel *statisticsProxyModel = new StatisticsProxyModel( \
this ); statisticsProxyModel->setToolTipEnabled( true );
+ statisticsProxyModel->setExtraColumnsEnabled( true ); // TODO: make a \
delegate. statisticsProxyModel->setSourceModel( collectionFilter );
QSortFilterProxyModel *sortModel = new QSortFilterProxyModel( this );
@@ -1345,14 +1346,13 @@
{
// use dbus to call the resource asking to slotPurge() the collection.
kDebug() << "CollectionResource " << m_currentCollection.resource()
- << m_currentCollection.remoteId();
+ << m_currentCollection.id();
QString dbusstr = "org.freedesktop.Akonadi.Resource.";
dbusstr.append( m_currentCollection.resource() );
- QDBusInterface dbus( dbusstr, "/Settings" );
- dbus.call( QLatin1String( "org.freedesktop.DBus.Properties.Set" ),
- QLatin1String( "expungeRequested" ),
- m_currentCollection.remoteId() );
+ QDBusInterface dbus( dbusstr, "/" );
+ dbus.call( QLatin1String( "requestManualExpunge" ),
+ m_currentCollection.id() );
}
--- trunk/extragear/pim/mailody/src/mainwindow.h #1036914:1036915
@@ -237,6 +237,7 @@
void slotReplyMessage();
void slotPurge();
void slotSyncAllFolderLists();
+ void slotInstanceAdded (const Akonadi::AgentInstance &instance);
void slotSyncFolderList();
void slotShowMessage( const Akonadi::Item& );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic