---
 libs/libmythtv/tv_play.cpp               |    7 	2 +	5 -	0 !
 libs/libmythtv/tv_play.h                 |    1 	0 +	1 -	0 !
 programs/mythfrontend/globalsettings.cpp |   12 	0 +	12 -	0 !
 3 files changed, 2 insertions(+), 18 deletions(-)

Index: mythtv/libs/libmythtv/tv_play.cpp
===================================================================
--- mythtv.orig/libs/libmythtv/tv_play.cpp	2010-07-19 13:55:32.000000000 -0400
+++ mythtv/libs/libmythtv/tv_play.cpp	2010-07-19 16:10:01.000000000 -0400
@@ -861,7 +861,6 @@
       db_use_fixed_size(true),      db_browse_always(false),
       db_browse_all_tuners(false),
 
-      smartChannelChange(false),
       arrowAccel(false),
       tryUnflaggedSkip(false),
       smartForward(false),
@@ -976,7 +975,6 @@
     kv["ChannelFormat"]            = "<num> <sign>";
     kv["TimeFormat"]               = "h:mm AP";
     kv["ShortDateFormat"]          = "M/d";
-    kv["SmartChannelChange"]       = "0";
 
     kv["UseArrowAccels"]           = "1";
     kv["TryUnflaggedSkip"]         = "0";
@@ -1020,7 +1018,6 @@
     db_channel_format      = kv["ChannelFormat"];
     db_time_format         = kv["TimeFormat"];
     db_short_date_format   = kv["ShortDateFormat"];
-    smartChannelChange     = kv["SmartChannelChange"].toInt();
     arrowAccel             = kv["UseArrowAccels"].toInt();
     tryUnflaggedSkip       = kv["TryUnflaggedSkip"].toInt();
     channel_group_id       = kv["ChannelGroupDefault"].toInt();
@@ -6457,11 +6454,11 @@
     bool commitSmart = false;
     QString inputStr = GetQueuedInput();
 
-    // Always use smartChannelChange when channel numbers are entered
+    // Always use immediate channel change when channel numbers are entered
     // in browse mode because in browse mode space/enter exit browse
     // mode and change to the currently browsed channel.
     if (StateIsLiveTV(GetState(ctx)) && !ccInputMode && !asInputMode &&
-        (smartChannelChange || browsemode))
+        browsemode)
     {
         commitSmart = ProcessSmartChannel(ctx, inputStr);
     }
Index: mythtv/libs/libmythtv/tv_play.h
===================================================================
--- mythtv.orig/libs/libmythtv/tv_play.h	2010-07-19 13:55:32.000000000 -0400
+++ mythtv/libs/libmythtv/tv_play.h	2010-07-19 16:08:00.000000000 -0400
@@ -681,7 +681,6 @@
     bool    db_browse_all_tuners;
     DBChanList db_browse_all_channels;
 
-    bool    smartChannelChange;
     bool    arrowAccel;
 
     CommSkipMode autoCommercialSkip;
Index: mythtv/programs/mythfrontend/globalsettings.cpp
===================================================================
--- mythtv.orig/programs/mythfrontend/globalsettings.cpp	2010-07-19 13:55:32.000000000 -0400
+++ mythtv/programs/mythfrontend/globalsettings.cpp	2010-07-19 16:05:45.000000000 -0400
@@ -3014,17 +3014,6 @@
     return gc;
 }
 
-static HostCheckBox *SmartChannelChange()
-{
-    HostCheckBox *gc = new HostCheckBox("SmartChannelChange");
-    gc->setLabel(QObject::tr("Change channels immediately without select"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("When a complete channel number is entered "
-                    "MythTV will switch to that channel immediately without "
-                    "requiring you to hit the select button."));
-    return gc;
-}
-
 static GlobalCheckBox *LastFreeCard()
 {
     GlobalCheckBox *bc = new GlobalCheckBox("LastFreeCard");
@@ -4398,7 +4387,6 @@
     general->addChild(ChannelOrdering());
     general->addChild(ChannelFormat());
     general->addChild(LongChannelFormat());
-    general->addChild(SmartChannelChange());
     general->addChild(LastFreeCard());
     general->addChild(LiveTVPriority());
     addChild(general);