diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
| commit | ed2b6731ab373ac335fde87af177351facbd2f15 (patch) | |
| tree | 81cc3d45c8c30aceadb4f597be819dc2863a3a3a /opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff | |
| parent | 021036598a306d8cf7204d6d62ff090278f7ecf1 (diff) | |
| parent | 5f93960dbb108c2c6d09964d1ee0d2e390b1498c (diff) | |
| download | tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.tar.gz tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff')
| -rw-r--r-- | opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff b/opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff new file mode 100644 index 000000000..e63e26ff7 --- /dev/null +++ b/opensuse/core/tdebase/khelpcenter-use-suseconfig-indexer.diff @@ -0,0 +1,25 @@ +Index: khelpcenter/navigator.cpp +=================================================================== +--- khelpcenter/navigator.cpp.orig ++++ khelpcenter/navigator.cpp +@@ -654,10 +654,16 @@ void Navigator::hideSearch() + + bool Navigator::checkSearchIndex() + { +- KConfig *cfg = KGlobal::config(); +- cfg->setGroup( "Search" ); +- if ( cfg->readBoolEntry( "IndexExists", false ) ) return true; +- ++ // just check that the index dir contains something ++ QDir indexDir( Prefs::indexDirectory() ); ++ QStringList dirEntries = indexDir.entryList(); ++ QStringList::Iterator it = dirEntries.begin(); ++ const QStringList::Iterator end = dirEntries.end(); ++ for ( ; it != end; ++it ) ++ { ++ if ( *it != "." && *it != ".." ) ++ return true; ++ } + if ( mIndexDialog && mIndexDialog->isShown() ) return true; + + QString text = i18n( "A search index does not yet exist. Do you want " |