--- filldata.cpp.daan	2005-03-01 13:58:18.126743664 +0100
+++ filldata.cpp	2005-03-01 13:58:54.365234576 +0100
@@ -52,7 +52,6 @@
 bool dddataretrieved = false;
 bool mark_repeats = true;
 bool channel_updates = false;
-bool skip_channels_with_no_freqid = false;
 
 QString lastdduserid;
 DataDirectProcessor ddprocessor;
@@ -2196,9 +2195,8 @@
             continue;
 
         int chanid = 0;
-		QString channelFrequency = "";
 
-        query.prepare("SELECT chanid, freqid FROM channel WHERE sourceid = :ID AND "
+        query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
                       "xmltvid = :XMLTVID;"); 
         query.bindValue(":ID", id);
         query.bindValue(":XMLTVID", mapiter.key());
@@ -2209,7 +2207,6 @@
         {
             query.next();
             chanid = query.value(0).toInt();
-			channelFrequency = query.value(1).toString().local8Bit();
         }
 
         if (chanid == 0)
@@ -2219,13 +2216,6 @@
             continue;
         }
 
-		if (channelFrequency == "" && skip_channels_with_no_freqid)
-		{
-			cerr << "The channel with xmltv channel identifier: " << mapiter.key()
-				 << " has no frequency!" << endl << "Skipping channel.\n";
-			continue;
-		}
-
         QValueList<ProgInfo> *sortlist = &((*proglist)[mapiter.key()]);
 
         fixProgramList(sortlist);
@@ -3270,10 +3260,6 @@
         {
             channel_updates = true;
         }
-		else if (!strcmp(a.argv()[argpos], "--skip_channels_with_no_freqid"))
-		{
-			skip_channels_with_no_freqid = true;
-		}
         else if (!strcmp(a.argv()[argpos], "--graboptions"))
         {
             if (((argpos + 1) >= a.argc()))
@@ -3432,10 +3418,6 @@
             cout << "   override custom channel names, which is why it is\n";
             cout << "   off by default.\n";
             cout << "\n";
-			cout << "--skip_channels_without_freqid\n";
-			cout << "   When a channel in the database has an empty freqid,\n";
-			cout << "   do not insert any data into the database for that channel.\n";
-			cout << "\n";
             cout << "--graboptions <\"options\">\n";
             cout << "   Pass options to grabber\n";
             cout << "\n";