Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/OpenPLi/enigma2
Browse files Browse the repository at this point in the history
Resolved Conflicts:
	lib/dvb/db.cpp
	po/fr.po
	po/lv.po
arn354 committed Jul 29, 2015
2 parents 9b73bc1 + aa6f644 commit b61d441
Showing 86 changed files with 15 additions and 5 deletions.
Empty file modified Makefile.am
100755 → 100644
Empty file.
Empty file modified data/skin_default/icons/Makefile.am
100755 → 100644
Empty file.
20 changes: 15 additions & 5 deletions lib/dvb/db.cpp
Original file line number Diff line number Diff line change
@@ -1081,7 +1081,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
Element *root = tree.getRoot();
if (!root)
{
eDebug("[eDVBDB] satellites.xml is maybe corrupted");
eDebug("[eDVBDB] couldn't open %s!!", satellitesFilename);
Py_INCREF(Py_False);
return Py_False;
}
@@ -1230,12 +1230,17 @@ PyObject *eDVBDB::readCables(ePyObject cab_list, ePyObject tp_dict)
return NULL;
}
XMLTree tree;
tree.setFilename("/etc/tuxbox/cables.xml");
const char* cablesFilename = "/etc/enigma2/cables.xml";
if (::access(cablesFilename, R_OK) < 0)
{
cablesFilename = "/etc/tuxbox/cables.xml";
}
tree.setFilename(cablesFilename);
tree.read();
Element *root = tree.getRoot();
if (!root)
{
eDebug("[eDVBDB] couldn't open /etc/tuxbox/cables.xml!!");
eDebug("[eDVBDB] couldn't open %s!!", cablesFilename);
Py_INCREF(Py_False);
return Py_False;
}
@@ -1350,12 +1355,17 @@ PyObject *eDVBDB::readTerrestrials(ePyObject ter_list, ePyObject tp_dict)
return NULL;
}
XMLTree tree;
tree.setFilename("/etc/tuxbox/terrestrial.xml");
const char* terrestrialFilename = "/etc/enigma2/terrestrial.xml";
if (::access(terrestrialFilename, R_OK) < 0)
{
terrestrialFilename = "/etc/tuxbox/terrestrial.xml";
}
tree.setFilename(terrestrialFilename);
tree.read();
Element *root = tree.getRoot();
if (!root)
{
eDebug("[eDVBDB] couldn't open /etc/tuxbox/terrestrial.xml!!");
eDebug("[eDVBDB] couldn't open %s!!", terrestrialFilename);
Py_INCREF(Py_False);
return Py_False;
}
Empty file modified lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/Extensions/DVDBurn/meta/dvdburn_de.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/Extensions/DVDBurn/meta/dvdburn_en.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
100755 → 100644
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified lib/python/Plugins/Extensions/Makefile.am
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
100755 → 100644
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
100755 → 100644
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
100755 → 100644
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/Makefile.am
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile.am
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am
100755 → 100644
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/Satfinder/meta/satfinder.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/VideoEnhancement/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified lib/python/Plugins/SystemPlugins/WirelessLan/Makefile.am
100755 → 100644
Empty file.
Empty file modified lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am
100755 → 100644
Empty file.
Empty file.
Empty file modified lib/python/Screens/Makefile.am
100755 → 100644
Empty file.

0 comments on commit b61d441

Please sign in to comment.