Conflicts should show the channel name as well.

diff --git a/ChangeLog b/ChangeLog
index 0111f769b8d7fa2b8d0685d660343301b6661994..20d13aa55190ffb10fdc295b14c5810324c4d42e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2007-12-13     Andre Ruthven
+2007-12-25     Andrew Ruthven
+       Conflicts should show the channel name as well.
+
+2007-12-13     Andrew Ruthven
        Warn if there isn't enough guide data present.
        Show the channel name next to program details.
        Release version 0.6.1

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 9149acd1927ff7b78e48a3a39b60a40b40e411ac..5079a9fb71ec3fb61d2cc6b8b88af80ccd7180f2 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -609,7 +609,8 @@ sub process_conflicts {
         'title'     => $show->{'title'},
         'startTime' => strftime("%FT%T", localtime($show->{'starttime'})),
         'NODE_TEXT' => $show->{'description'},
-        'subTitle'  => $show->{'subtitle'}
+        'subTitle'  => $show->{'subtitle'},
+       'channelName' => $show->{'channame'},
        );
 
       my $str = substitute_vars($block, \%vars);