Index: mythtv/programs/mythfrontend/viewscheduled.cpp
===================================================================
--- mythtv/programs/mythfrontend/viewscheduled.cpp	2006-09-30 23:31:14.000000000 -0500
+++ mythtv/programs/mythfrontend/viewscheduled.cpp	2007-02-21 01:43:31.000000000 -0600
@@ -416,13 +416,27 @@
     LayerSet *container = theme->GetSet("conflict_info");
     if (container)
     {
-        UITextType *type = (UITextType *)container->GetType("status");
-        if (type)
+        UITextType *wtype = (UITextType *)container->GetType("warning");
+        UITextType *stype = (UITextType *)container->GetType("status");
+
+        /* if wtype doesn't exist in the theme, use stype instead */
+        if (! wtype)
+        {
+            wtype = stype;
+        }
+
+        if (stype)
         {
             if (conflictBool)
-                type->SetText(tr("Time Conflict"));
+            {
+                stype->SetText(tr(""));
+                wtype->SetText(tr("Time Conflict"));
+            }
             else
-                type->SetText(tr("No Conflicts"));
+            {
+                wtype->SetText(tr(""));
+                stype->SetText(tr("No Conflicts"));
+            }
         }
     }