summaryrefslogtreecommitdiffstats
path: root/korganizer/kocorehelper.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/kocorehelper.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-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 'korganizer/kocorehelper.cpp')
-rw-r--r--korganizer/kocorehelper.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/kocorehelper.cpp b/korganizer/kocorehelper.cpp
index 374c7107b..5538d9c33 100644
--- a/korganizer/kocorehelper.cpp
+++ b/korganizer/kocorehelper.cpp
@@ -26,13 +26,17 @@
#include "koglobals.h"
-TQColor KOCoreHelper::categoryColor( const TQStringList &categories )
+TQColor KOCoreHelper::categoryColor( const TQStringList &categories )
{
+ if ( categories.isEmpty() ) {
+ return KOPrefs::instance()->unsetCategoryColor();
+ }
+
// FIXME: Correctly treat events with multiple categories
TQString cat = categories.first();
TQColor bgColor;
if (cat.isEmpty())
- bgColor = defaultEventColor();
+ bgColor = KOPrefs::instance()->unsetCategoryColor();
else
bgColor = *( KOPrefs::instance()->categoryColor( cat ) );
return bgColor;