mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:19:49 +02:00
parent 6e4cd9f08c 586a1b5a49
commit 463700033b
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/timerlist.cpp
View File

@@ -739,7 +739,7 @@ bool CTimerList::RemoteBoxChanExists(t_channel_id channel_id)
r_url += string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id);
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {
@@ -796,7 +796,7 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist)
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
//printf("[remotetimer] timers:%s\n",r_url.c_str());
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {
@@ -1292,7 +1292,7 @@ void CTimerList::paintItem(int pos)
r_url += string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer.channel_id);
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {