From 3e04e8980308808927c69e88362d2b6f56ee2d3b Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Mon, 7 Jan 2008 13:36:00 +0000
Subject: [PATCH] remove newly-added palm_bt_nameForAddr

---
 xwords4/palm/connsdlg.c |  9 ++-------
 xwords4/palm/palmbt.c   | 13 -------------
 xwords4/palm/palmbt.h   |  5 -----
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/xwords4/palm/connsdlg.c b/xwords4/palm/connsdlg.c
index d2bbb02b7..a5e224b03 100644
--- a/xwords4/palm/connsdlg.c
+++ b/xwords4/palm/connsdlg.c
@@ -82,7 +82,8 @@ ctlsFromState( PalmAppGlobals* globals )
 #endif
 #ifdef XWFEATURE_BLUETOOTH
     } else if ( addr->conType == COMMS_CONN_BT 
-                && state->serverRole == SERVER_ISCLIENT ) {
+                /* It's ok to load the controls even if we won't use them */
+                /* && state->serverRole == SERVER_ISCLIENT */ ) {
         ControlPtr ctrl = getActiveObjectPtr( XW_CONNS_BT_HOSTTRIGGER_ID );
 
         XP_MEMCPY( &state->btAddr, &state->addr->u.bt.btAddr,
@@ -90,12 +91,6 @@ ctlsFromState( PalmAppGlobals* globals )
         XP_MEMCPY( &state->hostName, &state->addr->u.bt.hostName,
                    sizeof(state->hostName) );
 
-        /* Try forcing a name here!  But BtLib may not be initialized.  So
-           just reset the addr so it'll force user to browse */ 
-        if ( '\0' == state->hostName[0] ) {
-            (void)palm_bt_nameForAddr( globals, &state->btAddr,
-                                       state->hostName, sizeof(state->hostName) );
-        }
         if ( '\0' != addr->u.bt.hostName[0] ) {
             CtlSetLabel( ctrl, state->hostName );
         }
diff --git a/xwords4/palm/palmbt.c b/xwords4/palm/palmbt.c
index 5253435e9..93e99abd0 100644
--- a/xwords4/palm/palmbt.c
+++ b/xwords4/palm/palmbt.c
@@ -360,19 +360,6 @@ palm_bt_browse_device( PalmAppGlobals* globals, XP_BtAddr* btAddr,
     return success;
 } /* palm_bt_browse_device */
 
-Err
-palm_bt_nameForAddr( PalmAppGlobals* globals, const XP_BtAddr* addr,
-                     char* const out, XP_U16 outlen )
-{
-    PalmBTStuff* btStuff = globals->btStuff;
-    Err err = 1;                /* whatever */
-    if ( !!btStuff ) {
-        err = pbt_nameForAddr( btStuff, (BtLibDeviceAddressType*)addr->bits,
-                               out, outlen );
-    }
-    return err;
-}
-
 #ifdef DEBUG
 void
 palm_bt_getStats( PalmAppGlobals* globals, XWStreamCtxt* stream )
diff --git a/xwords4/palm/palmbt.h b/xwords4/palm/palmbt.h
index afd0ebb3e..0c6e0a395 100644
--- a/xwords4/palm/palmbt.h
+++ b/xwords4/palm/palmbt.h
@@ -81,11 +81,6 @@ XP_S16 palm_bt_send( const XP_U8* buf, XP_U16 len, const CommsAddrRec* addr,
 XP_Bool palm_bt_browse_device( PalmAppGlobals* globals, XP_BtAddr* btAddr,
                                XP_UCHAR* out, XP_U16 len );
 
-/* It's ok to call palm_bt_nameForAddr when BT is not initialized.  It will
-   simply fail. */
-Err palm_bt_nameForAddr( PalmAppGlobals* globals, const XP_BtAddr* addr,
-                         char* const out, XP_U16 outlen );
-
 #ifdef DEBUG
 void palm_bt_getStats( PalmAppGlobals* globals, XWStreamCtxt* stream );
 #endif