mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-04 12:18:27 +02:00
overload access(2)
Conflicts:
src/driver/pictureviewer/pictureviewer.cpp
src/gui/components/cc_item_picture.cpp
src/gui/movieplayer.cpp
src/gui/osdlang_setup.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.h
src/system/setting_helpers.cpp
Origin commit data
------------------
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)
This commit is contained in:
@@ -46,6 +46,7 @@
|
||||
#include <driver/screen_max.h>
|
||||
|
||||
#include <xmlinterface.h>
|
||||
#include <system/helpers.h>
|
||||
#include <system/debug.h>
|
||||
|
||||
#include <algorithm>
|
||||
@@ -145,10 +146,15 @@ CMenuOptionStringChooser* COsdLangSetup::getTzItems()
|
||||
if (!strcmp(xmlGetName(search), "zone"))
|
||||
{
|
||||
std::string name = xmlGetAttribute(search, "name");
|
||||
// std::string zone = xmlGetAttribute(search, "zone");
|
||||
std::string zone = xmlGetAttribute(search, "zone");
|
||||
//printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str());
|
||||
tzSelect->addOption(name.c_str());
|
||||
found = true;
|
||||
if (access("/usr/share/zoneinfo/" + zone, R_OK))
|
||||
printf("[neutrino] timezone file '%s' not installed\n", zone.c_str());
|
||||
else
|
||||
{
|
||||
tzSelect->addOption(name);
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
search = search->xmlNextNode;
|
||||
}
|
||||
|
Reference in New Issue
Block a user