diff -cr mythtv.pre/programs/mythfilldatabase/filldata.cpp mythtv/programs/mythfilldatabase/filldata.cpp
*** mythtv.pre/programs/mythfilldatabase/filldata.cpp	2005-11-24 11:43:18.000000000 -0800
--- mythtv/programs/mythfilldatabase/filldata.cpp	2005-11-24 11:47:37.000000000 -0800
***************
*** 986,992 ****
                      "hdtv, closecaptioned, partnumber, parttotal, seriesid, "
                      "originalairdate, colorcode, syndicatedepisodenumber, "
                      "programid) "
!                     "SELECT chanid, starttime, endtime, "
                      "title, subtitle, description, "
                      "showtype, dd_genre.class, category_type, "
                      "airdate, stars, previouslyshown, stereo, subtitled, "
--- 986,994 ----
                      "hdtv, closecaptioned, partnumber, parttotal, seriesid, "
                      "originalairdate, colorcode, syndicatedepisodenumber, "
                      "programid) "
!                     "SELECT chanid,"
!                     "DATE_ADD(starttime, INTERVAL (SELECT tmoffset from channel where dd_v_program.chanid = channel.chanid) SECOND), "
!                     "DATE_ADD(endtime, INTERVAL (SELECT tmoffset from channel where dd_v_program.chanid = channel.chanid) SECOND), "
                      "title, subtitle, description, "
                      "showtype, dd_genre.class, category_type, "
                      "airdate, stars, previouslyshown, stereo, subtitled, "
***************
*** 2247,2253 ****
          int chanid = 0;
  
          query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
!                       "xmltvid = :XMLTVID;"); 
          query.bindValue(":ID", id);
          query.bindValue(":XMLTVID", mapiter.key());
  
--- 2249,2255 ----
          int chanid = 0;
  
          query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
!                       "xmltvid = :XMLTVID;");
          query.bindValue(":ID", id);
          query.bindValue(":XMLTVID", mapiter.key());