diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kontact/plugins/summary/kcmkontactsummary.cpp | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/plugins/summary/kcmkontactsummary.cpp')
-rw-r--r-- | kontact/plugins/summary/kcmkontactsummary.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index cf8154168..f21a2bb35 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -142,8 +142,10 @@ void KCMKontactSummary::load() mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" ); KPluginInfo::List::Iterator it; + KConfig *conf = new KConfig("kontactrc"); + KConfigGroup *cg = new KConfigGroup( conf, "Plugins" ); for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) { - (*it)->load(); + (*it)->load( cg ); if ( !(*it)->isPluginEnabled() ) continue; |