From 4025c376049fcf3d96c4eb0de3eb64aa2cf17c1b Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Mon, 9 Nov 2009 00:03:43 +0000
Subject: [PATCH] Make "Room 1" the default room name.

---
 xwords4/common/comms.c    | 3 ++-
 xwords4/common/comtypes.h | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index 88ec31628..ea2420ff9 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -719,8 +719,9 @@ comms_getInitialAddr( CommsAddrRec* addr )
     {
         char* name = RELAY_NAME_DEFAULT;
         XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 );
+        char* room = RELAY_ROOM_DEFAULT;
+        XP_MEMCPY( addr->u.ip_relay.invite, room, XP_STRLEN(room)+1 );
     }
-    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... */
diff --git a/xwords4/common/comtypes.h b/xwords4/common/comtypes.h
index 76bbf1b74..9f60edfbf 100644
--- a/xwords4/common/comtypes.h
+++ b/xwords4/common/comtypes.h
@@ -168,6 +168,9 @@ typedef struct CommonPrefs {
 #ifndef RELAY_NAME_DEFAULT
 # define RELAY_NAME_DEFAULT "eehouse.org"
 #endif
+#ifndef RELAY_ROOM_DEFAULT
+# define RELAY_ROOM_DEFAULT "Room 1"
+#endif
 
 #ifdef MEM_DEBUG
 # define XP_MALLOC(pool,nbytes) \