From 385423f695d69497fa92e2634a8b4ac0cb7d5a5b Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 9 Dec 2007 23:37:47 +0000 Subject: [PATCH] Add non-sf.net contact options; make params const. --- palm/connsdlg.c | 1 + palm/l10n/StrRes_en_US.pre | 5 +++-- palm/l10n/StrRes_fr_FR.pre | 4 ++-- palm/palmbt.c | 2 +- palm/palmbt.h | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/palm/connsdlg.c b/palm/connsdlg.c index bd182e277..72b74a8cb 100644 --- a/palm/connsdlg.c +++ b/palm/connsdlg.c @@ -84,6 +84,7 @@ ctlsFromState( PalmAppGlobals* XP_UNUSED_BT(globals), ConnsDlgState* state ) } else if ( addr->conType == COMMS_CONN_BT && state->serverRole == SERVER_ISCLIENT ) { ControlPtr ctrl = getActiveObjectPtr( XW_CONNS_BT_HOSTTRIGGER_ID ); + /* Settle for the colon-separated "name" if hostname not known */ if ( '\0' == addr->u.bt.hostName[0] ) { palm_bt_addrString( globals, &addr->u.bt.btAddr, &state->tmp ); CtlSetLabel( ctrl, state->tmp.chars ); diff --git a/palm/l10n/StrRes_en_US.pre b/palm/l10n/StrRes_en_US.pre index fcf578927..da788e8c0 100644 --- a/palm/l10n/StrRes_en_US.pre +++ b/palm/l10n/StrRes_en_US.pre @@ -150,13 +150,14 @@ "THANKS FOR DOWNLOADING this beta 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" + "xwords@eehouse.org. Enjoy!\n\n" #endif "Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \ "Copyright 1998-2007 by Eric House. "\ "Released under the GNU Public License.\n\n"\ - "See the manual at xwords.sourceforge.net\n\n" \ + "See the manual at xwords.sf.net or " + "eehouse.org/xwords/.\n\n" \ "This program is postcardware. If you like it " \ "please mail a postcard to:\n" \ diff --git a/palm/l10n/StrRes_fr_FR.pre b/palm/l10n/StrRes_fr_FR.pre index fe5f86881..cb0cdf4ee 100644 --- a/palm/l10n/StrRes_fr_FR.pre +++ b/palm/l10n/StrRes_fr_FR.pre @@ -157,13 +157,13 @@ "MERCI DE VOTRE ATTENTION pour cette version beta de " "Crosswords. Svp, regardez les notes et avertissements sur " "xwords.sf.net/bt_palm.php. Svp, signalez les bugs à " - "ehouse@users.sf.net. Au plaisir !\n\n" + "xwords@eehouse.org. Au plaisir !\n\n" #endif "Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \ "Copyright 1998-2007 par Eric House. "\ "Réalisé sous GNU Public License.\n\n"\ - "Voir le manuel sur xwords.sourceforge.net\n\n" \ + "Voir le manuel sur xwords.sf.net ou eehouse.org/xwords/.\n\n" \ "Ce programme est 'postcardware'. Si vous l'appréciez, " \ "svp, envoyez une carte postale à :\n" \ diff --git a/palm/palmbt.c b/palm/palmbt.c index 055a6a02a..99d88ff37 100644 --- a/palm/palmbt.c +++ b/palm/palmbt.c @@ -311,7 +311,7 @@ palm_bt_doWork( PalmAppGlobals* globals, BtCbEvtProc proc, BtUIState* btUIStateP } /* palm_bt_doWork */ void -palm_bt_addrString( PalmAppGlobals* globals, XP_BtAddr* btAddr, +palm_bt_addrString( PalmAppGlobals* globals, const XP_BtAddr* btAddr, XP_BtAddrStr* str ) { PalmBTStuff* btStuff = pbt_checkInit( globals, NULL ); diff --git a/palm/palmbt.h b/palm/palmbt.h index 9e67d2895..2457690eb 100644 --- a/palm/palmbt.h +++ b/palm/palmbt.h @@ -66,7 +66,7 @@ typedef struct BtCbEvtInfo { typedef void (*BtCbEvtProc)( PalmAppGlobals* globals, const BtCbEvtInfo* evt ); XP_Bool palm_bt_doWork( PalmAppGlobals* globals, BtCbEvtProc proc, BtUIState* btState ); -void palm_bt_addrString( PalmAppGlobals* globals, XP_BtAddr* btAddr, +void palm_bt_addrString( PalmAppGlobals* globals, const XP_BtAddr* btAddr, XP_BtAddrStr* str ); XP_S16 palm_bt_send( const XP_U8* buf, XP_U16 len, const CommsAddrRec* addr,