Commit f48c6cb2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use pluginId it's better than name

parent 3ffb32a5
......@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(PIM_VERSION "5.3.50")
set(PIM_VERSION "5.3.51")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
......
......@@ -105,6 +105,7 @@ bool PluginEditorManagerPrivate::initializePlugins()
MessageComposer::PluginEditorManager::PluginEditorData pluginData;
pluginData.mDescription = info.metaData.description();
pluginData.mName = info.metaData.name();
pluginData.mIdentifier = info.metaData.pluginId();
pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
mPluginDataList.append(pluginData);
......
......@@ -39,6 +39,7 @@ public:
}
QString mDescription;
QString mIdentifier;
QString mName;
bool mEnableByDefault;
};
......
......@@ -134,11 +134,12 @@ bool ViewerPluginManagerPrivate::initializePluginList()
MessageViewer::ViewerPluginManager::ViewerPluginData pluginData;
pluginData.mDescription = info.metaData.description();
pluginData.mName = info.metaData.name();
pluginData.mIdentifier = info.metaData.pluginId();
pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
mPluginDataList.append(pluginData);
const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.name());
const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.name());
const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.pluginId());
const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.pluginId());
if ((info.metaData.isEnabledByDefault() && !pluginDisabledByUser)
|| (!info.metaData.isEnabledByDefault() && pluginEnabledByUser)) {
const QString version = info.metaData.version();
......
......@@ -41,6 +41,7 @@ public:
}
QString mDescription;
QString mName;
QString mIdentifier;
bool mEnableByDefault;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment