Summary: | filter menu in knode is empty | ||
---|---|---|---|
Product: | knode | Reporter: | Eggert Ehmke <eggert> |
Component: | general | Assignee: | kdepim bugs <kdepim-bugs> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Eggert Ehmke
2003-09-22 14:44:33 UTC
Subject: kdepim/knode CVS commit by maragato: Make knode load filters from the local datadir only if they exist there. CCMAIL: 64729-done@bugs.kde.org M +4 -2 knarticlefilter.cpp 1.27 M +4 -1 knfiltermanager.cpp 1.31 --- kdepim/knode/knarticlefilter.cpp #1.26:1.27 @@ -77,5 +77,6 @@ bool KNArticleFilter::loadInfo() { if (i_d!=-1) { - QString fname(locateLocal("data","knode/") + QString("filters/%1.fltr").arg(i_d)); + QString fname(locate("data",QString( "knode/filters/%1.fltr" ).arg(i_d) ) ); + if (fname.isNull()) return false; @@ -96,5 +97,6 @@ bool KNArticleFilter::loadInfo() void KNArticleFilter::load() { - QString fname(locateLocal("data","knode/") + QString("filters/%1.fltr").arg(i_d)); + QString fname(locate("data",QString( "knode/filters/%1.fltr").arg(i_d) ) ); + if (fname.isNull()) return; --- kdepim/knode/knfiltermanager.cpp #1.30:1.31 @@ -21,4 +21,5 @@ #include <kstandarddirs.h> #include <ksimpleconfig.h> +#include <kdebug.h> #include "utilities.h" @@ -109,5 +110,6 @@ void KNFilterManager::prepareShutdown() void KNFilterManager::loadFilters() { - QString fname(locateLocal("data","knode/")+"filters/filters.rc"); + QString fname(locate("data","knode/filters/filters.rc") ); + if (!fname.isNull()) { KSimpleConfig conf(fname,true); |