From e8f2215221cefa0439dbd8b608dad78e2d7f5107 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 3 Feb 2007 20:36:22 +0000
Subject: [PATCH] Turn on BT so 4.3a4 can have a non-M rev number; up version
 for 4.2.

---
 xwords4/palm/Makefile         |  2 +-
 xwords4/palm/palmbt.c         | 12 ------------
 xwords4/palm/xwords4defines.h |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/xwords4/palm/Makefile b/xwords4/palm/Makefile
index 2784b8324..06f6e0256 100644
--- a/xwords4/palm/Makefile
+++ b/xwords4/palm/Makefile
@@ -119,7 +119,7 @@ MYDEFS_COMMON += -DXWFEATURE_SEARCHLIMIT
 # MYDEFS_COMMON += -DXWFEATURE_RELAY
 
 # turn on bluetooth comms option for 68K and ARM -- which won't work yet
-#BLUETOOTH = -DXWFEATURE_BLUETOOTH
+BLUETOOTH = -DXWFEATURE_BLUETOOTH
 #MYDEFS_COMMON += $(BLUETOOTH)
 
 # Add menu allowing to choose to run 68K or ARM
diff --git a/xwords4/palm/palmbt.c b/xwords4/palm/palmbt.c
index d5181da50..12a9612b2 100644
--- a/xwords4/palm/palmbt.c
+++ b/xwords4/palm/palmbt.c
@@ -230,12 +230,6 @@ palm_bt_amendWaitTicks( PalmAppGlobals* globals, Int32* result )
     PalmBTStuff* btStuff = globals->btStuff;
     if ( !!btStuff && HASWORK(btStuff) ) {
         *result = 0;
-    } else {
-        XP_ASSERT( (btStuff == NULL)
-                   || (btStuff->vol.out.lens[0] == 0)
-                   || btStuff->vol.sendInProgress 
-                   || (SOCK_INVAL == btStuff->dataSocket)
-                   || (btStuff->p_connState != PBTST_L2C_CONNECTED) );
     }
 }
 
@@ -244,12 +238,6 @@ palm_bt_doWork( PalmAppGlobals* globals, BtUIState* btUIStateP )
 {
     PalmBTStuff* btStuff = globals->btStuff;
     XP_Bool haveWork = !!btStuff && HASWORK(btStuff);
-    
-    XP_ASSERT( !btStuff || haveWork
-               || (btStuff->vol.out.lens[0] == 0 )
-               || btStuff->vol.sendInProgress 
-               || (SOCK_INVAL == btStuff->dataSocket)
-               || (btStuff->p_connState != PBTST_L2C_CONNECTED) );
 
     if ( haveWork ) {
         pbt_do_work( btStuff );
diff --git a/xwords4/palm/xwords4defines.h b/xwords4/palm/xwords4defines.h
index e90cdf1fb..35461c567 100644
--- a/xwords4/palm/xwords4defines.h
+++ b/xwords4/palm/xwords4defines.h
@@ -425,7 +425,7 @@
 #ifdef XWFEATURE_BLUETOOTH
 # define XW_PALM_VERSION_STRING "4.3a4"
 #else
-# define XW_PALM_VERSION_STRING "4.2b4"
+# define XW_PALM_VERSION_STRING "4.2b5"
 #endif
 #define CUR_PREFS_VERS 0x0405