From 18e9301e87ad2a6fa5cd1eee865019377e4e993b Mon Sep 17 00:00:00 2001 From: ehouse Date: Mon, 14 Sep 2009 03:11:11 +0000 Subject: [PATCH] rename Cookie to Invite, a change that may change. Rename everywhere in clients but not in relay where cookie is too pervasive. (There are no code changes in this checkin.) --- xwords4/common/comms.c | 14 +++++++------- xwords4/common/comms.h | 2 +- xwords4/linux/cursesmain.c | 4 ++-- xwords4/linux/gtkconnsdlg.c | 18 +++++++++--------- xwords4/linux/gtkmain.c | 4 ++-- xwords4/linux/linuxmain.c | 10 +++++----- xwords4/linux/main.h | 2 +- xwords4/palm/connsdlg.c | 12 ++++++------ xwords4/palm/l10n/xwords4_en_US.rcp.pre | 4 ++-- xwords4/palm/l10n/xwords4_fr_FR.rcp.pre | 4 ++-- xwords4/palm/palmdbg.c | 4 ++-- xwords4/palm/xwords4defines.h | 4 ++-- xwords4/relay/cref.cpp | 2 +- xwords4/relay/xwrelay.cpp | 4 ++-- xwords4/relay/xwrelay.h | 2 +- xwords4/wince/cecondlg.c | 14 +++++++------- xwords4/wince/cesockwr.c | 4 ++-- xwords4/wince/l10n/xwords4_caps.rc | 6 +++--- xwords4/wince/l10n/xwords4_french.rc | 6 +++--- xwords4/wince/l10n/xwords4_polish.rc | 6 +++--- xwords4/wince/resource.h | 4 ++-- xwords4/wince/xwords4.rc | 8 ++++---- 22 files changed, 69 insertions(+), 69 deletions(-) diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c index d0fa64426..1e039d73e 100644 --- a/xwords4/common/comms.c +++ b/xwords4/common/comms.c @@ -401,8 +401,8 @@ addrFromStream( CommsAddrRec* addrP, XWStreamCtxt* stream ) addr.u.ip.port_ip = stream_getU16( stream ); break; case COMMS_CONN_RELAY: - stringFromStreamHere( stream, addr.u.ip_relay.cookie, - sizeof(addr.u.ip_relay.cookie) ); + stringFromStreamHere( stream, addr.u.ip_relay.invite, + sizeof(addr.u.ip_relay.invite) ); stringFromStreamHere( stream, addr.u.ip_relay.hostName, sizeof(addr.u.ip_relay.hostName) ); addr.u.ip_relay.ipAddr = stream_getU32( stream ); @@ -598,7 +598,7 @@ addrToStream( XWStreamCtxt* stream, const CommsAddrRec* addrP ) stream_putU16( stream, addr.u.ip.port_ip ); break; case COMMS_CONN_RELAY: - stringToStream( stream, addr.u.ip_relay.cookie ); + stringToStream( stream, addr.u.ip_relay.invite ); stringToStream( stream, addr.u.ip_relay.hostName ); stream_putU32( stream, addr.u.ip_relay.ipAddr ); stream_putU16( stream, addr.u.ip_relay.port ); @@ -706,7 +706,7 @@ comms_getInitialAddr( CommsAddrRec* addr ) char* name = RELAY_NAME_DEFAULT; XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 ); } - addr->u.ip_relay.cookie[0] = '\0'; + addr->u.ip_relay.invite[0] = '\0'; #elif defined PLATFORM_PALM /* default values; default is still IR where there's a choice, at least on Palm... */ @@ -1424,7 +1424,7 @@ comms_checkComplete( const CommsAddrRec* addr ) switch ( addr->conType ) { case COMMS_CONN_RELAY: - result = !!addr->u.ip_relay.cookie[0] + result = !!addr->u.ip_relay.invite[0] && !!addr->u.ip_relay.hostName[0] && !!addr->u.ip_relay.port > 0; break; @@ -1715,7 +1715,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID, break; case XWRELAY_GAME_CONNECT: stream_putU8( tmpStream, XWRELAY_PROTO_VERSION ); - stringToStream( tmpStream, addr.u.ip_relay.cookie ); + stringToStream( tmpStream, addr.u.ip_relay.invite ); stream_putU8( tmpStream, comms->r.myHostID ); stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( tmpStream, comms->r.nPlayersTotal ); @@ -1725,7 +1725,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID, case XWRELAY_GAME_RECONNECT: stream_putU8( tmpStream, XWRELAY_PROTO_VERSION ); - stringToStream( tmpStream, addr.u.ip_relay.cookie ); + stringToStream( tmpStream, addr.u.ip_relay.invite ); stream_putU8( tmpStream, comms->r.myHostID ); stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( tmpStream, comms->r.nPlayersTotal ); diff --git a/xwords4/common/comms.h b/xwords4/common/comms.h index 40763118d..c65fd07fe 100644 --- a/xwords4/common/comms.h +++ b/xwords4/common/comms.h @@ -84,7 +84,7 @@ typedef struct CommsAddrRec { XP_U16 port_ip; } ip; struct { - XP_UCHAR cookie[MAX_COOKIE_LEN + 1]; + XP_UCHAR invite[MAX_INVITE_LEN + 1]; XP_UCHAR hostName[MAX_HOSTNAME_LEN + 1]; XP_U32 ipAddr; /* looked up from above */ XP_U16 port; diff --git a/xwords4/linux/cursesmain.c b/xwords4/linux/cursesmain.c index 536ba83d4..071c76a99 100644 --- a/xwords4/linux/cursesmain.c +++ b/xwords4/linux/cursesmain.c @@ -1488,8 +1488,8 @@ cursesmain( XP_Bool isServer, LaunchParams* params ) addr.u.ip_relay.port = params->connInfo.relay.defaultSendPort; XP_STRNCPY( addr.u.ip_relay.hostName, params->connInfo.relay.relayName, sizeof(addr.u.ip_relay.hostName) - 1 ); - XP_STRNCPY( addr.u.ip_relay.cookie, params->connInfo.relay.cookie, - sizeof(addr.u.ip_relay.cookie) - 1 ); + XP_STRNCPY( addr.u.ip_relay.invite, params->connInfo.relay.invite, + sizeof(addr.u.ip_relay.invite) - 1 ); # endif # ifdef XWFEATURE_SMS } else if ( params->conType == COMMS_CONN_SMS ) { diff --git a/xwords4/linux/gtkconnsdlg.c b/xwords4/linux/gtkconnsdlg.c index 5deb656d6..8be6c4f6b 100644 --- a/xwords4/linux/gtkconnsdlg.c +++ b/xwords4/linux/gtkconnsdlg.c @@ -27,7 +27,7 @@ typedef struct _GtkConnsState { GtkAppGlobals* globals; CommsAddrRec* addr; - GtkWidget* cookie; + GtkWidget* invite; GtkWidget* hostName; GtkWidget* port; GtkWidget* bthost; @@ -77,9 +77,9 @@ handle_ok( GtkWidget* XP_UNUSED(widget), gpointer closure ) case COMMS_CONN_IP_DIRECT: #ifdef XWFEATURE_RELAY case COMMS_CONN_RELAY: - txt = gtk_entry_get_text( GTK_ENTRY(state->cookie) ); - XP_STRNCPY( state->addr->u.ip_relay.cookie, txt, - sizeof(state->addr->u.ip_relay.cookie) ); + txt = gtk_entry_get_text( GTK_ENTRY(state->invite) ); + XP_STRNCPY( state->addr->u.ip_relay.invite, txt, + sizeof(state->addr->u.ip_relay.invite) ); txt = gtk_entry_get_text( GTK_ENTRY(state->hostName) ); XP_STRNCPY( state->addr->u.ip_relay.hostName, txt, sizeof(state->addr->u.ip_relay.hostName) ); @@ -115,7 +115,7 @@ handle_cancel( GtkWidget* XP_UNUSED(widget), void* closure ) } /* - * Cookie: _____ + * Invite: _____ * Relay: _____ * Port: _____ * Cancel OK @@ -126,11 +126,11 @@ makeRelayPage( GtkConnsState* state ) { GtkWidget* vbox = gtk_vbox_new( FALSE, 0 ); - GtkWidget* hbox = makeLabeledField( "Cookie", &state->cookie ); - gtk_entry_set_text( GTK_ENTRY(state->cookie), - state->addr->u.ip_relay.cookie ); + GtkWidget* hbox = makeLabeledField( "Invite", &state->invite ); + gtk_entry_set_text( GTK_ENTRY(state->invite), + state->addr->u.ip_relay.invite ); gtk_box_pack_start( GTK_BOX(vbox), hbox, FALSE, TRUE, 0 ); - gtk_widget_set_sensitive( state->cookie, !state->readOnly ); + gtk_widget_set_sensitive( state->invite, !state->readOnly ); hbox = makeLabeledField( "Relay address", &state->hostName ); gtk_entry_set_text( GTK_ENTRY(state->hostName), diff --git a/xwords4/linux/gtkmain.c b/xwords4/linux/gtkmain.c index 3c862b296..6e23d2b5e 100644 --- a/xwords4/linux/gtkmain.c +++ b/xwords4/linux/gtkmain.c @@ -365,8 +365,8 @@ createOrLoadObjects( GtkAppGlobals* globals ) addr.u.ip_relay.port = params->connInfo.relay.defaultSendPort; XP_STRNCPY( addr.u.ip_relay.hostName, params->connInfo.relay.relayName, sizeof(addr.u.ip_relay.hostName) - 1 ); - XP_STRNCPY( addr.u.ip_relay.cookie, params->connInfo.relay.cookie, - sizeof(addr.u.ip_relay.cookie) - 1 ); + XP_STRNCPY( addr.u.ip_relay.invite, params->connInfo.relay.invite, + sizeof(addr.u.ip_relay.invite) - 1 ); #endif #ifdef XWFEATURE_BLUETOOTH } else if ( addr.conType == COMMS_CONN_BT ) { diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c index 85725eb6a..9ee369932 100644 --- a/xwords4/linux/linuxmain.c +++ b/xwords4/linux/linuxmain.c @@ -213,7 +213,7 @@ usage( char* appName, char* msg ) "\t [-l] # disallow hints\n" "\t [-P] # pick tiles face up\n" "\t [-c] # explain robot scores after each move\n" - "\t [-C COOKIE] # cookie used to groups games on relay\n" + "\t [-C INVITE] # invite used to groups games on relay\n" "\t\t # (max of four players total, local and remote)\n" "\t [-b boardSize] # number of columns and rows\n" "\t [-e random_seed] \n" @@ -245,8 +245,8 @@ usage( char* appName, char* msg ) /* "\t [-p client_port] # must != server's port if on same device" */ #ifdef XWFEATURE_RELAY "\nrelay example: \n" - "\t host: ./xwords -d dict.xwd -r Eric -s -N -a localhost -p 10999 -C COOKIE\n" - "\tguest: ./xwords -d dict.xwd -r Kati -a localhost -p 10999 -C COOKIE" + "\t host: ./xwords -d dict.xwd -r Eric -s -N -a localhost -p 10999 -C INVITE\n" + "\tguest: ./xwords -d dict.xwd -r Kati -a localhost -p 10999 -C INVITE" #endif #ifdef XWFEATURE_SMS "\nsms example: \n" @@ -743,7 +743,7 @@ main( int argc, char** argv ) /* defaults */ #ifdef XWFEATURE_RELAY mainParams.connInfo.relay.defaultSendPort = DEFAULT_PORT; - mainParams.connInfo.relay.cookie = "COOKIE"; + mainParams.connInfo.relay.invite = "INVITE"; #endif #ifdef XWFEATURE_IP_DIRECT mainParams.connInfo.ip.port = DEFAULT_PORT; @@ -811,7 +811,7 @@ main( int argc, char** argv ) case 'C': XP_ASSERT( conType == COMMS_CONN_NONE || conType == COMMS_CONN_RELAY ); - mainParams.connInfo.relay.cookie = optarg; + mainParams.connInfo.relay.invite = optarg; conType = COMMS_CONN_RELAY; break; #endif diff --git a/xwords4/linux/main.h b/xwords4/linux/main.h index 26bb4b269..c12414d0c 100644 --- a/xwords4/linux/main.h +++ b/xwords4/linux/main.h @@ -78,7 +78,7 @@ typedef struct LaunchParams { #ifdef XWFEATURE_RELAY struct { char* relayName; - char* cookie; + char* invite; short defaultSendPort; } relay; #endif diff --git a/xwords4/palm/connsdlg.c b/xwords4/palm/connsdlg.c index 19124a455..f22d6c01a 100644 --- a/xwords4/palm/connsdlg.c +++ b/xwords4/palm/connsdlg.c @@ -79,8 +79,8 @@ ctlsFromState( PalmAppGlobals* globals ) setFieldStr( XW_CONNS_PORT_FIELD_ID, buf ); setFieldEditable( XW_CONNS_PORT_FIELD_ID, isNewGame ); - setFieldStr( XW_CONNS_COOKIE_FIELD_ID, addr->u.ip_relay.cookie ); - setFieldEditable( XW_CONNS_COOKIE_FIELD_ID, isNewGame ); + setFieldStr( XW_CONNS_INVITE_FIELD_ID, addr->u.ip_relay.invite ); + setFieldEditable( XW_CONNS_INVITE_FIELD_ID, isNewGame ); #endif #ifdef XWFEATURE_BLUETOOTH } else if ( addr->conType == COMMS_CONN_BT @@ -136,8 +136,8 @@ stateFromCtls( PalmAppGlobals* globals, XP_Bool* prefsChanged ) getFieldStr( XW_CONNS_PORT_FIELD_ID, buf, sizeof(buf) ); addr.u.ip_relay.port = StrAToI( buf ); - getFieldStr( XW_CONNS_COOKIE_FIELD_ID, addr.u.ip_relay.cookie, - sizeof(addr.u.ip_relay.cookie) ); + getFieldStr( XW_CONNS_INVITE_FIELD_ID, addr.u.ip_relay.invite, + sizeof(addr.u.ip_relay.invite) ); #endif #ifdef XWFEATURE_BLUETOOTH } else if ( addr.conType == COMMS_CONN_BT @@ -178,8 +178,8 @@ updateFormCtls( FormPtr form, ConnsDlgState* state ) XW_CONNS_RELAY_FIELD_ID, XW_CONNS_PORT_LABEL_ID, XW_CONNS_PORT_FIELD_ID, - XW_CONNS_COOKIE_LABEL_ID, - XW_CONNS_COOKIE_FIELD_ID, + XW_CONNS_INVITE_LABEL_ID, + XW_CONNS_INVITE_FIELD_ID, #endif 0 }; diff --git a/xwords4/palm/l10n/xwords4_en_US.rcp.pre b/xwords4/palm/l10n/xwords4_en_US.rcp.pre index 6aff8c4f1..131d2a618 100644 --- a/xwords4/palm/l10n/xwords4_en_US.rcp.pre +++ b/xwords4/palm/l10n/xwords4_en_US.rcp.pre @@ -322,9 +322,9 @@ BEGIN FIELD XW_CONNS_PORT_FIELD_ID CONNS_FIELD_LEFT PREVTOP 30 AUTO \ EDITABLE SINGLELINE UNDERLINED NUMERIC MAXCHARS 5 - LABEL "Cookie:" XW_CONNS_COOKIE_LABEL_ID + LABEL "Invite:" XW_CONNS_INVITE_LABEL_ID AT ( LEFTCOL+10 PREVBOTTOM + 2 ) - FIELD XW_CONNS_COOKIE_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \ + FIELD XW_CONNS_INVITE_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \ SINGLELINE EDITABLE UNDERLINED MAXCHARS 32 #endif diff --git a/xwords4/palm/l10n/xwords4_fr_FR.rcp.pre b/xwords4/palm/l10n/xwords4_fr_FR.rcp.pre index 80fb1ead2..a000e39b5 100644 --- a/xwords4/palm/l10n/xwords4_fr_FR.rcp.pre +++ b/xwords4/palm/l10n/xwords4_fr_FR.rcp.pre @@ -325,9 +325,9 @@ BEGIN FIELD XW_CONNS_PORT_FIELD_ID CONNS_FIELD_LEFT PREVTOP 30 AUTO \ EDITABLE SINGLELINE UNDERLINED NUMERIC MAXCHARS 5 - LABEL "Cookie:" XW_CONNS_COOKIE_LABEL_ID + LABEL "Invite:" XW_CONNS_INVITE_LABEL_ID AT ( LEFTCOL+10 PREVBOTTOM + 2 ) - FIELD XW_CONNS_COOKIE_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \ + FIELD XW_CONNS_INVITE_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \ SINGLELINE EDITABLE UNDERLINED MAXCHARS 32 #endif diff --git a/xwords4/palm/palmdbg.c b/xwords4/palm/palmdbg.c index c709fa263..567b2e897 100644 --- a/xwords4/palm/palmdbg.c +++ b/xwords4/palm/palmdbg.c @@ -196,8 +196,8 @@ frmObjId_2str( XP_U16 id ) CASESTR( XW_CONNS_TYPE_LIST_ID ); #ifdef XWFEATURE_RELAY CASESTR( XW_CONNS_RELAY_LABEL_ID ); - CASESTR( XW_CONNS_COOKIE_FIELD_ID ); - CASESTR( XW_CONNS_COOKIE_LABEL_ID ); + CASESTR( XW_CONNS_INVITE_FIELD_ID ); + CASESTR( XW_CONNS_INVITE_LABEL_ID ); CASESTR( XW_CONNS_PORT_LABEL_ID ); CASESTR( XW_CONNS_RELAY_FIELD_ID ); CASESTR( XW_CONNS_PORT_FIELD_ID ); diff --git a/xwords4/palm/xwords4defines.h b/xwords4/palm/xwords4defines.h index d6be6f131..fb0761d9e 100644 --- a/xwords4/palm/xwords4defines.h +++ b/xwords4/palm/xwords4defines.h @@ -351,8 +351,8 @@ #define XW_CONNS_TYPE_LIST_ID 2903 #ifdef XWFEATURE_RELAY # define XW_CONNS_RELAY_LABEL_ID 2904 -# define XW_CONNS_COOKIE_FIELD_ID 2905 -# define XW_CONNS_COOKIE_LABEL_ID 2906 +# define XW_CONNS_INVITE_FIELD_ID 2905 +# define XW_CONNS_INVITE_LABEL_ID 2906 # define XW_CONNS_PORT_LABEL_ID 2907 # define XW_CONNS_RELAY_FIELD_ID 2908 # define XW_CONNS_PORT_FIELD_ID 2909 diff --git a/xwords4/relay/cref.cpp b/xwords4/relay/cref.cpp index a86a60214..5ecbfbcff 100644 --- a/xwords4/relay/cref.cpp +++ b/xwords4/relay/cref.cpp @@ -956,7 +956,7 @@ CookieRef::_PrintCookieInfo( string& out ) out += Cookie(); out += "\n"; out += "connName="; - char buf[MAX_CONNNAME_LEN+MAX_COOKIE_LEN]; + char buf[MAX_CONNNAME_LEN+MAX_INVITE_LEN]; snprintf( buf, sizeof(buf), "%s\n", ConnName() ); out += buf; diff --git a/xwords4/relay/xwrelay.cpp b/xwords4/relay/xwrelay.cpp index 86e438288..5418225a8 100644 --- a/xwords4/relay/xwrelay.cpp +++ b/xwords4/relay/xwrelay.cpp @@ -280,7 +280,7 @@ send_with_length_unsafe( int socket, unsigned char* buf, int bufLen ) static bool processConnect( unsigned char* bufp, int bufLen, int socket ) { - char cookie[MAX_COOKIE_LEN+1]; + char cookie[MAX_INVITE_LEN+1]; unsigned char* end = bufp + bufLen; bool success = false; @@ -330,7 +330,7 @@ processReconnect( unsigned char* bufp, int bufLen, int socket ) if ( err != XWRELAY_ERROR_NONE ) { denyConnection( socket, err ); } else { - char cookie[MAX_COOKIE_LEN+1]; + char cookie[MAX_INVITE_LEN+1]; char connName[MAX_CONNNAME_LEN+1]; HostID srcID; unsigned char nPlayersH; diff --git a/xwords4/relay/xwrelay.h b/xwords4/relay/xwrelay.h index 6bb2a1dbc..9eeb10bd6 100644 --- a/xwords4/relay/xwrelay.h +++ b/xwords4/relay/xwrelay.h @@ -99,7 +99,7 @@ typedef unsigned char XWRELAY_Cmd; #define HOST_ID_NONE 0 #define HOST_ID_SERVER 1 -#define MAX_COOKIE_LEN 15 +#define MAX_INVITE_LEN 15 #define MAX_MSG_LEN 256 /* 100 is more like it */ #define MAX_CONNNAME_LEN 35 /* host id plus a small integer, typically */ diff --git a/xwords4/wince/cecondlg.c b/xwords4/wince/cecondlg.c index a0f0f40a4..79d81e5f7 100755 --- a/xwords4/wince/cecondlg.c +++ b/xwords4/wince/cecondlg.c @@ -55,8 +55,8 @@ ceControlsToAddrRec( HWND hDlg, CeConnDlgState* state ) state->addrRec.u.ip_relay.hostName, &len ); state->addrRec.u.ip_relay.port = (XP_U16)ceGetDlgItemNum( hDlg, RELAYPORT_EDIT ); - len = sizeof(state->addrRec.u.ip_relay.cookie); - ceGetDlgItemText( hDlg, COOKIE_EDIT, state->addrRec.u.ip_relay.cookie, + len = sizeof(state->addrRec.u.ip_relay.invite); + ceGetDlgItemText( hDlg, INVITE_EDIT, state->addrRec.u.ip_relay.invite, &len ); #endif } else if ( state->addrRec.conType == COMMS_CONN_IP_DIRECT ) { @@ -113,9 +113,9 @@ static void adjustForConnType( HWND hDlg, CeConnDlgState* state, XP_Bool useFromState ) { XP_U16 relayIds[] = { - IDC_COOKIE_LAB, + IDC_INVITE_LAB, #ifdef XWFEATURE_RELAY - COOKIE_EDIT,IDC_CRELAYHINT_LAB,IDC_CRELAYNAME_LAB,RELAYNAME_EDIT, + INVITE_EDIT,IDC_CRELAYHINT_LAB,IDC_CRELAYNAME_LAB,RELAYNAME_EDIT, IDC_CRELAYPORT_LAB, RELAYPORT_EDIT, #endif 0 }; @@ -218,9 +218,9 @@ ceControlsFromAddrRec( HWND hDlg, const CeConnDlgState* state ) ceSetDlgItemNum( hDlg, RELAYPORT_EDIT, state->addrRec.u.ip_relay.port ); ids[nIds++] = RELAYPORT_EDIT; - ceSetDlgItemText( hDlg, COOKIE_EDIT, - state->addrRec.u.ip_relay.cookie ); - ids[nIds++] = COOKIE_EDIT; + ceSetDlgItemText( hDlg, INVITE_EDIT, + state->addrRec.u.ip_relay.invite ); + ids[nIds++] = INVITE_EDIT; #endif } else if ( state->addrRec.conType == COMMS_CONN_IP_DIRECT ) { #ifdef XWFEATURE_IP_DIRECT diff --git a/xwords4/wince/cesockwr.c b/xwords4/wince/cesockwr.c index 4c8d9bce7..1c7cf9755 100755 --- a/xwords4/wince/cesockwr.c +++ b/xwords4/wince/cesockwr.c @@ -464,8 +464,8 @@ ce_sockwrap_send( CeSocketWrapper* self, const XP_U8* buf, XP_U16 len, XP_ASSERT( addr->conType == COMMS_CONN_RELAY ); if ( 0 != XP_STRCMP( addr->u.ip_relay.hostName, self->addrRec.u.ip_relay.hostName ) - || 0 != XP_STRCMP( addr->u.ip_relay.cookie, - self->addrRec.u.ip_relay.cookie ) + || 0 != XP_STRCMP( addr->u.ip_relay.invite, + self->addrRec.u.ip_relay.invite ) || addr->u.ip_relay.port != self->addrRec.u.ip_relay.port ) { closeConnection( self ); XP_MEMCPY( &self->addrRec, addr, sizeof(self->addrRec) ); diff --git a/xwords4/wince/l10n/xwords4_caps.rc b/xwords4/wince/l10n/xwords4_caps.rc index 6f893f769..2deedfb8f 100644 --- a/xwords4/wince/l10n/xwords4_caps.rc +++ b/xwords4/wince/l10n/xwords4_caps.rc @@ -604,8 +604,8 @@ BEGIN #endif #ifdef XWFEATURE_RELAY - LTEXT "COOKIE:",IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT // <- translate COOKIE: - EDITTEXT COOKIE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, + LTEXT "INVITE:",IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT // <- translate INVITE: + EDITTEXT INVITE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL LTEXT "RELAY NAME (RARELY CHANGES):",IDC_CRELAYNAME_LAB, // <- translate RELAY NAME (RARELY CHANGES): @@ -617,7 +617,7 @@ BEGIN EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER #else - LTEXT "RELAY CONNECTION NOT SUPPORTED.",IDC_COOKIE_LAB, // <- translate RELAY CONNECTION NOT SUPPORTED + LTEXT "RELAY CONNECTION NOT SUPPORTED.",IDC_INVITE_LAB, // <- translate RELAY CONNECTION NOT SUPPORTED LAB_COL,CONN_ROW_3,40,40 #endif diff --git a/xwords4/wince/l10n/xwords4_french.rc b/xwords4/wince/l10n/xwords4_french.rc index e715b7c60..a43556ac8 100644 --- a/xwords4/wince/l10n/xwords4_french.rc +++ b/xwords4/wince/l10n/xwords4_french.rc @@ -612,8 +612,8 @@ BEGIN XWCOMBO(IDC_CONNECT_COMBO, CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,ROW_HEIGHT,0,58,0) #endif #ifdef XWFEATURE_RELAY - LTEXT "Cookie:",IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT - EDITTEXT COOKIE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, + LTEXT "Invite:",IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT + EDITTEXT INVITE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL LTEXT "Nom du relai (change rarement):",IDC_CRELAYNAME_LAB, @@ -625,7 +625,7 @@ BEGIN EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER #else - LTEXT "Connexion non supportée.",IDC_COOKIE_LAB, + LTEXT "Connexion non supportée.",IDC_INVITE_LAB, LAB_COL,CONN_ROW_3,40,40 #endif diff --git a/xwords4/wince/l10n/xwords4_polish.rc b/xwords4/wince/l10n/xwords4_polish.rc index b0e9032de..5e430e481 100644 --- a/xwords4/wince/l10n/xwords4_polish.rc +++ b/xwords4/wince/l10n/xwords4_polish.rc @@ -618,8 +618,8 @@ BEGIN #endif #ifdef XWFEATURE_RELAY - LTEXT "Ciasteczko:",IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT - EDITTEXT COOKIE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, + LTEXT "Ciasteczko:",IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT + EDITTEXT INVITE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL LTEXT "Nazwa proxy (raczej niezmienna):",IDC_CRELAYNAME_LAB, @@ -631,7 +631,7 @@ BEGIN EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER #else - LTEXT "PoÅ‚Ä…czenie przez proxy niedostÄ™pne.",IDC_COOKIE_LAB, + LTEXT "PoÅ‚Ä…czenie przez proxy niedostÄ™pne.",IDC_INVITE_LAB, LAB_COL,CONN_ROW_3,40,40 #endif diff --git a/xwords4/wince/resource.h b/xwords4/wince/resource.h index be95c6fde..ea0d1da98 100755 --- a/xwords4/wince/resource.h +++ b/xwords4/wince/resource.h @@ -183,7 +183,7 @@ # define IDC_CCONVIA_LAB 1106 #endif -#define IDC_COOKIE_LAB 1107 +#define IDC_INVITE_LAB 1107 #ifdef XWFEATURE_RELAY # define IDC_CRELAYNAME_LAB 1108 # define IDC_CRELAYPORT_LAB 1109 @@ -192,7 +192,7 @@ /* # define IDC_CONNECTCOMBO 1111 */ # define RELAYNAME_EDIT 1112 # define RELAYPORT_EDIT 1113 -# define COOKIE_EDIT 1114 +# define INVITE_EDIT 1114 #endif diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc index e80f315ef..f31ddcc6f 100755 --- a/xwords4/wince/xwords4.rc +++ b/xwords4/wince/xwords4.rc @@ -621,9 +621,9 @@ BEGIN XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,ROW_HEIGHT,0,58,0) #endif #ifdef XWFEATURE_RELAY - LTEXT "Cookie (must match other devices in the game):", - IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,100,(ROW_HEIGHT*2) - EDITTEXT COOKIE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, + LTEXT "Invite (must match other devices in the game):", + IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,100,(ROW_HEIGHT*2) + EDITTEXT INVITE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL LTEXT "Relay name (rarely changes):",IDC_CRELAYNAME_LAB,LAB_COL,CONN_ROW_5,120,ROW_HEIGHT @@ -633,7 +633,7 @@ BEGIN EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER #else - LTEXT "Relay connection not supported.",IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,40,40 + LTEXT "Relay connection not supported.",IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,40,40 #endif #ifdef XWFEATURE_IP_DIRECT