mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-03-07 20:09:44 +01:00
parent c85016eb79 71ebf30e32
commit 499659677f
161 changed files with 707 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/plugins.cpp
View File

@@ -193,6 +193,8 @@ bool CPlugins::parseCfg(plugin *plugin_data)
plugin_data->index = sindex++;
plugin_data->key = CRCInput::RC_nokey;
plugin_data->name = "";
plugin_data->description = "";
#if 0
plugin_data->fb = false;
plugin_data->rc = false;
@@ -228,14 +230,24 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{
plugin_data->key = getPluginKey(parm);
}
else if (cmd == "name")
else if (cmd == "name." + g_settings.language)
{
plugin_data->name = parm;
}
else if (cmd == "desc")
else if (cmd == "name")
{
if (plugin_data->name.empty())
plugin_data->name = parm;
}
else if (cmd == "desc." + g_settings.language)
{
plugin_data->description = parm;
}
else if (cmd == "desc")
{
if (plugin_data->description.empty())
plugin_data->description = parm;
}
else if (cmd == "depend")
{
plugin_data->depend = parm;
@@ -295,6 +307,9 @@ bool CPlugins::parseCfg(plugin *plugin_data)
inFile.close();
if (plugin_data->name.empty())
plugin_data->name = plugin_data->filename;
_hintIcon = plugin_data->plugindir + "/" + plugin_data->hinticon + ".png";
if (access(_hintIcon.c_str(), F_OK) == 0)
plugin_data->hinticon = _hintIcon;