From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * 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 --- kontact/plugins/summary/summaryview_plugin.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'kontact/plugins/summary/summaryview_plugin.cpp') diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 9f9073808..555d79544 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -39,8 +39,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL { setInstance( SummaryViewFactory::instance() ); - mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, this, - TQT_SLOT( doSync() ), actionCollection(), + mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0, + 0, actionCollection(), "kontact_summary_sync" ); connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) ); @@ -68,9 +68,12 @@ void SummaryView::fillSyncActionSubEntries() void SummaryView::syncAccount( const TQString& account ) { - const TQString acc = account == i18n("All") ? TQString() : account; - DCOPRef ref( "kmail", "KMailIface" ); - ref.send( "checkAccount", acc ); + if ( account == i18n("All") ) { + doSync(); + } else { + DCOPRef ref( "kmail", "KMailIface" ); + ref.send( "checkAccount", account ); + } fillSyncActionSubEntries(); } -- cgit v1.2.1