Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ead49488a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-05 (Sat, 05 May 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-05-05 17:35:51 +04:00
2 changed files with 7 additions and 13 deletions

View File

@@ -421,12 +421,12 @@ static void write_indexxml_footer(FILE *fd)
fprintf(fd, "</dvbepgfiles>\n");
}
void cp(char * from, char * to)
{
char cmd[256];
snprintf(cmd, 256, "cp -f %s %s", from, to);
system(cmd);
}
// void cp(char * from, char * to)
// {
// char cmd[256];
// snprintf(cmd, 256, "cp -f %s %s", from, to);
// system(cmd);
// }
void writeEventsToFile(char *epgdir)
{
@@ -484,7 +484,7 @@ _done:
sprintf(filename, "%s/index.xml", epgdir);
cp(tmpname, filename);
rename(tmpname, filename);
unlink(tmpname);
return ;

View File

@@ -719,16 +719,10 @@ void CPersonalizeGui::addSeparator(const int& widget_id, const neutrino_locale_t
//expands with parameter within you can show or hide this item in personalize options
void CPersonalizeGui::addSeparator(CMenuWidget &widget, const neutrino_locale_t locale_text, const int& item_mode)
{
#if 0
menu_item_t to_add_sep[2] = { {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL},
{&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL}};
#endif
if (locale_text == NONEXISTANT_LOCALE) {
//v_item.push_back(to_add_sep[0]);
menu_item_t to_add_sep = {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL};
v_item.push_back(to_add_sep);
} else {
//v_item.push_back(to_add_sep[1]);
menu_item_t to_add_sep = {&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL};
v_item.push_back(to_add_sep);
}