diff --git a/xwords4/palm/Makefile b/xwords4/palm/Makefile index 201b295a3..d93384234 100644 --- a/xwords4/palm/Makefile +++ b/xwords4/palm/Makefile @@ -117,7 +117,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/l10n/StrRes_en_US.pre b/xwords4/palm/l10n/StrRes_en_US.pre index 79e53fdde..9113d83d6 100644 --- a/xwords4/palm/l10n/StrRes_en_US.pre +++ b/xwords4/palm/l10n/StrRes_en_US.pre @@ -124,7 +124,7 @@ { "STR_LOCALPLAYERS", "Local players" }, { "STR_TOTALPLAYERS", "Total players" }, -#ifdef BEYOND_IR +#ifdef XWFEATURE_RELAY { "STR_RELAY_TIMEOUT", "Relay error: Other devices failed to " "connect." }, { "STR_RELAY_LOST_OTHER", "Relay error: another device has lost its " @@ -132,6 +132,13 @@ { "STR_RELAY_GENERIC", "Relay error: something's wrong." }, #endif { "STR_ABOUT_CONTENT", +#if 1 + "THANKS FOR LOOKING at this alpha version of " + "Crosswords. Please see the notes and caveats at " + "xwords.sf.net/bt_palm.php. Please report bugs to " + "ehouse@users.sf.net. Enjoy!\n\n" + +#endif "Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \ "Copyright 1998-2006 by Eric House. "\ "Released under the GNU Public License.\n\n"\ diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c index fcb4f6624..d746b6a8b 100644 --- a/xwords4/palm/palmmain.c +++ b/xwords4/palm/palmmain.c @@ -1073,6 +1073,11 @@ startApplication( PalmAppGlobals** globalsP ) getResString, &globals->drawingPrefs ); + if ( !globals->gState.reserved1 ) { + palmaskFromStrId( globals, STR_ABOUT_CONTENT, STR_ABOUT_TITLE ); + globals->gState.reserved1 = XP_TRUE; + } + FrmGotoForm( XW_MAIN_FORM ); /* do this first so players who don't exist have default names */ @@ -1466,7 +1471,9 @@ static void showBTState( PalmAppGlobals* globals ) { char ch[] = { ' ', ' ' }; - if ( COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) { + CommsCtxt* comms = globals->game.comms; + if ( (comms != NULL) + && COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) { switch( globals->btUIState ) { case BTUI_NONE: ch[0] = 'x'; break;