author | zecke <zecke> | 2004-09-12 23:18:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-12 23:18:37 (UTC) |
commit | f05a19bd1e248ea8cea29d361a1a8085ca145c6a (patch) (side-by-side diff) | |
tree | ae7204968f4e8841232a976eb9cc341db65dca50 | |
parent | 8123b75c55cb5140ae5b0c5aeddb4644a0a8ffbb (diff) | |
download | opie-f05a19bd1e248ea8cea29d361a1a8085ca145c6a.zip opie-f05a19bd1e248ea8cea29d361a1a8085ca145c6a.tar.gz opie-f05a19bd1e248ea8cea29d361a1a8085ca145c6a.tar.bz2 |
If there is no 'excluded' plugin the excluded-list wasn't made
empty and the old/prior setting still was used.
This fix makes sure that an empty string is written if no plugin
is excluded
-rw-r--r-- | libopie2/opiecore/opluginloader.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp index 1edf3a1..b8b6b79 100644 --- a/libopie2/opiecore/opluginloader.cpp +++ b/libopie2/opiecore/opluginloader.cpp @@ -558,10 +558,13 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte if ( sorted ) { QStringList pos = cfg.readListEntry( "Positions", '.' ); QStringList::Iterator it = pos.begin(); - while ( it != pos.end() ) - positionMap.insert( *it++, (*it++).toInt() ); + QString tmp; int i; + while ( it != pos.end() ) { + tmp = *it++; i = (*it++).toInt(); + positionMap.insert( tmp, i ); + } } @@ -584,8 +587,9 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte continue; else if ( sorted ) item.setPosition( positionMap[str] ); + lst.append( item ); } return lst; @@ -833,8 +837,11 @@ void OPluginManager::save() { } if ( !item.isEnabled() ) excluded[path].append( item.name() ); + if ( !excluded.contains( path ) ) + excluded[path] = QString::null; + } /* * The code below wouldn't work because we can't delete groups/keys from the config |