Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-11-16 07:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove newly-added palm_bt_nameForAddr

Browse source
This commit is contained in:
ehouse 2008-01-07 13:36:00 +00:00
parent 7153bbb574
commit 3e04e89803
3 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/palm/connsdlg.c
View file

@ -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 );
}

13
xwords4/palm/palmbt.c
View file

@ -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 )

5
xwords4/palm/palmbt.h
View file

@ -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