From 02ca3eb9d71c813e38f2df5de7b786651434f1bd Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 15 Dec 2007 18:55:32 +0000
Subject: [PATCH] Make initial value of confirmBTConnect true.

---
 xwords4/common/game.c   | 2 ++
 xwords4/palm/palmbt.c   | 3 +++
 xwords4/palm/palmmain.c | 1 +
 3 files changed, 6 insertions(+)

diff --git a/xwords4/common/game.c b/xwords4/common/game.c
index eb7e60af9..ce54ee424 100644
--- a/xwords4/common/game.c
+++ b/xwords4/common/game.c
@@ -266,6 +266,8 @@ gi_initPlayerInfo( MPFORMAL CurGameInfo* gi, const XP_UCHAR* nameTemplate )
     gi->boardSize = 15;
     gi->robotSmartness = SMART_ROBOT;
     gi->gameSeconds = 25 * 60;	/* 25 minute game is common? */
+    
+    gi->confirmBTConnect = XP_TRUE;
 
     for ( i = 0; i < MAX_NUM_PLAYERS; ++i ) {
         XP_UCHAR buf[20];
diff --git a/xwords4/palm/palmbt.c b/xwords4/palm/palmbt.c
index ac0365fe2..08f4edbca 100644
--- a/xwords4/palm/palmbt.c
+++ b/xwords4/palm/palmbt.c
@@ -1263,8 +1263,11 @@ socketCallback( BtLibSocketEventType* sEvent, UInt32 refCon )
         }
         break;
 
+#if defined BT_USE_L2CAP
     case btLibSocketEventSdpGetPsmByUuid:
+#elif defined BT_USE_RFCOMM
     case btLibSocketEventSdpGetServerChannelByUuid:
+#endif
         XP_ASSERT( sEvent->socket == btStuff->u.slave.sdpSocket );
         pbt_close_sdpsocket( btStuff );
         if ( sEvent->status == errNone ) {
diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c
index 6ddf224ef..92c1e2e87 100644
--- a/xwords4/palm/palmmain.c
+++ b/xwords4/palm/palmmain.c
@@ -694,6 +694,7 @@ palmInitPrefs( PalmAppGlobals* globals )
     globals->gState.showGrid = true;
     globals->gState.versionNum = CUR_PREFS_VERS;
     globals->gState.cp.showBoardArrow = XP_TRUE;
+    globals->gState.cp.showRobotScores = XP_TRUE;
 
 #ifdef SHOW_PROGRESS
     globals->gState.showProgress = true;