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 --- korganizer/kocorehelper.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'korganizer/kocorehelper.cpp') 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; -- cgit v1.2.1