[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rkward/development/plugin_management_to_loadlibs] rkward/settings: Ignore all.pluginmap, in case it
From:       Thomas Friedrichsmeier <thomas.friedrichsmeier () ruhr-uni-bochum ! de>
Date:       2014-12-31 15:30:37
Message-ID: E1Y6LEL-00034e-2P () scm ! kde ! org
[Download RAW message or body]

Git commit e19c1e972e4e548e925519f23fc82ddb07aa1b23 by Thomas Friedrichsmeier.
Committed on 31/12/2014 at 15:30.
Pushed by tfry into branch 'development/plugin_management_to_loadlibs'.

Ignore all.pluginmap, in case it is still present.

M  +3    -1    rkward/settings/rksettingsmoduleplugins.cpp

http://commits.kde.org/rkward/e19c1e972e4e548e925519f23fc82ddb07aa1b23

diff --git a/rkward/settings/rksettingsmoduleplugins.cpp \
b/rkward/settings/rksettingsmoduleplugins.cpp index 46397c7..f3720f4 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -339,10 +339,12 @@ void RKSettingsModulePlugins::registerPluginMaps (const \
QStringList &maps, bool  void RKSettingsModulePlugins::fixPluginMapLists () {
 	RK_TRACE (SETTINGS);
 
+	// Users who installed versions before 0.6.3, manually, are likely to have \
all.pluginmap left over. Let's handle this, on the fly. +	const QString obosolete_map \
= RKCommonFunctions::getRKWardDataDir () + "all.pluginmap";  for (int i = 0; i < \
known_plugin_maps.size (); ++i) {  PluginMapStoredInfo &inf = known_plugin_maps[i];
 		QFileInfo info (inf.filename);
-		if (!info.isReadable ()) {
+		if ((!info.isReadable ()) || (inf.filename == obosolete_map)) {
 			known_plugin_maps.removeAt (i);
 			--i;
 			continue;


[prev in list] [next in list] [prev in thread] [next in thread]