From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Mon, 24 Dec 2007 21:29:17 +0000 (+1300)
Subject: Conflicts should show the channel name as well.
X-Git-Tag: 0.6.2~7
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5ef45cd770a053153661506e4923c95a900aacb;p=mythtv-status.git

Conflicts should show the channel name as well.
---

diff --git a/ChangeLog b/ChangeLog
index 0111f76..20d13aa 100644
--- 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 9149acd..5079a9f 100755
--- 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);