summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2011-01-26 01:29:01 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2011-01-26 01:29:01 +0100
commit00a2ae09ccd803c1a22251a5c895d5779352d617 (patch)
treef3feb59fbe1dfde439360341d14b4341bbf0cb16 /pages
parentcdc9262868dcd658ca1105f284d390a15fd33729 (diff)
downloadvdr-plugin-live-00a2ae09ccd803c1a22251a5c895d5779352d617.tar.gz
vdr-plugin-live-00a2ae09ccd803c1a22251a5c895d5779352d617.tar.bz2
Yet an other patch from Rolf Ahrenberg:
(live-git-20110126-remove-double-escape-and-compilation-warnings.patch.gz) Fixes a double HTML entities encoding error, omits some compiler warnings and updates the finish translations.
Diffstat (limited to 'pages')
-rw-r--r--pages/multischedule.ecpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index 39bf20a..f73bff6 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -167,7 +167,7 @@ pageTitle = tr("MultiSchedule");
}
}
- if ( channel >= channel_groups_numbers.size() )
+ if ( channel >= (int)channel_groups_numbers.size() )
channel = 0;
channel_group = channel;
{
@@ -282,7 +282,7 @@ pageTitle = tr("MultiSchedule");
std::list<SchedEntry> table[MAX_CHANNELS];
std::vector<std::string> channel_names(channel_groups_numbers[ channel ].size() );
std::vector<tChannelID> channel_IDs(channel_groups_numbers[ channel ].size() );
- if ( channel >= channel_groups_numbers.size() )
+ if ( channel >= (int)channel_groups_numbers.size() )
channel = channel_groups_numbers.size()-1;
//for ( int chan = 0; chan<MAX_CHANNELS; chan++)
for ( unsigned int j = 0; j<channel_groups_numbers[ channel ].size(); j++)
@@ -381,7 +381,7 @@ pageTitle = tr("MultiSchedule");
for ( unsigned int channel = 0; channel< channel_names.size() ; channel++)
{
</%cpp>
- <td> <div class="boxheader"> <div> <div><$ StringEscapeAndBreak(channel_names[channel]) $>
+ <td> <div class="boxheader"> <div> <div><$ channel_names[channel] $> <# reply.sout() automatically escapes special characters to html entities #>
<& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_IDs[channel]) image="zap.png" alt="" &>
<& pageelems.vlc_stream_channel channelId=(channel_IDs[channel]) &>
</div></div> </div></td>