From 719fc3889cae214b0afe37868636b1cb1726e02c Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 9 Jun 2007 18:09:21 +0000
Subject: [PATCH] turn off BT; remove rc designation so can ship

---
 xwords4/palm/Makefile         |  2 +-
 xwords4/palm/connsdlg.c       | 13 -------------
 xwords4/palm/palmutil.c       |  2 ++
 xwords4/palm/xwords4defines.h |  2 +-
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/xwords4/palm/Makefile b/xwords4/palm/Makefile
index 6613f1bf4..0cfeeba92 100644
--- a/xwords4/palm/Makefile
+++ b/xwords4/palm/Makefile
@@ -116,7 +116,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/connsdlg.c b/xwords4/palm/connsdlg.c
index 03474138d..3d9f791d0 100644
--- a/xwords4/palm/connsdlg.c
+++ b/xwords4/palm/connsdlg.c
@@ -48,19 +48,6 @@ typedef struct ConnsDlgState {
     char btName[PALM_BT_NAME_LEN];
 } ConnsDlgState;
 
-static void
-strFromField( XP_U16 id, XP_UCHAR* buf, XP_U16 max )
-{
-    FieldPtr field = getActiveObjectPtr( id );
-    XP_UCHAR* str = FldGetTextPtr( field );
-    XP_U16 len = FldGetTextLength( field );
-    if ( len > max-1 ) {
-        len = max - 1;
-    }
-    XP_MEMCPY( buf, str, len );
-    buf[len] = '\0';
-} /* strFromField */
-
 static void
 ctlsFromState( PalmAppGlobals* XP_UNUSED_BT(globals), ConnsDlgState* state )
 {
diff --git a/xwords4/palm/palmutil.c b/xwords4/palm/palmutil.c
index 81d722c90..72c61b1ee 100644
--- a/xwords4/palm/palmutil.c
+++ b/xwords4/palm/palmutil.c
@@ -204,6 +204,7 @@ setFieldStr( XP_U16 id, const XP_UCHAR* buf )
     FldInsert( field, buf, XP_STRLEN(buf) );
 } /* setFieldStr */
 
+#ifdef XWFEATURE_RELAY
 void
 getFieldStr( XP_U16 id, XP_UCHAR* buf, XP_U16 max )
 {
@@ -216,6 +217,7 @@ getFieldStr( XP_U16 id, XP_UCHAR* buf, XP_U16 max )
     XP_MEMCPY( buf, str, len );
     buf[len] = '\0';
 } /* strFromField */
+#endif
 
 /*****************************************************************************
  * Set up to build the string and ptr-to-string lists needed for the
diff --git a/xwords4/palm/xwords4defines.h b/xwords4/palm/xwords4defines.h
index 2f55dfb4e..b061720e7 100644
--- a/xwords4/palm/xwords4defines.h
+++ b/xwords4/palm/xwords4defines.h
@@ -436,7 +436,7 @@
 #ifdef XWFEATURE_BLUETOOTH
 # define XW_PALM_VERSION_STRING "4.3a10"
 #else
-# define XW_PALM_VERSION_STRING "4.2rc3"
+# define XW_PALM_VERSION_STRING "4.2"
 #endif
 #define CUR_PREFS_VERS 0x0405