Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into send_in_background

Browse source
This commit is contained in:
Eric House 2011-10-10 22:42:28 -07:00
commit 861a24dfeb
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/res/raw/changes
View file

@ -6,8 +6,8 @@
</head> </head>
<body> <body>
<b>Crosswords 4.4 beta 35 release</b> <b>Crosswords 4.4 beta 36 release</b>
<p><em>(There was no beta 35)</em></p>
<ul> <ul>
<li>Add ability to look up words played by opponents via online <li>Add ability to look up words played by opponents via online

2
xwords4/android/XWords4/res/values/common_rsrc.xml
View file

@ -3,7 +3,7 @@
<!-- Resources in this file do not require localization --> <!-- Resources in this file do not require localization -->
<resources> <resources>
<string name="app_version">4.4 beta 35</string> <string name="app_version">4.4 beta 36</string>
<!-- prefs keys --> <!-- prefs keys -->
<string name="key_color_tiles">key_color_tiles</string> <string name="key_color_tiles">key_color_tiles</string>

4
xwords4/common/server.c
View file

@ -313,7 +313,7 @@ readStreamIf( ServerCtxt* server, XWStreamCtxt* in )
XP_U16 len = stream_getU16( in ); XP_U16 len = stream_getU16( in );
if ( 0 < len ) { if ( 0 < len ) {
result = mkServerStream( server ); result = mkServerStream( server );
stream_copyFromStream( in, result, len ); stream_copyFromStream( result, in, len );
} }
return result; return result;
} }
@ -323,8 +323,10 @@ writeStreamIf( XWStreamCtxt* dest, XWStreamCtxt* src )
{ {
XP_U16 len = !!src ? stream_getSize( src ) : 0; XP_U16 len = !!src ? stream_getSize( src ) : 0;
stream_putU16( dest, len ); stream_putU16( dest, len );
if ( 0 < len ) {
stream_copyFromStream( dest, src, len ); stream_copyFromStream( dest, src, len );
} }
}
ServerCtxt* ServerCtxt*
server_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model, server_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,