Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2011-12-15 08:24:30 -08:00
commit 02a85c5aa8
6 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/XWords4/res/values/strings.xml
View file

@ -1189,12 +1189,12 @@
substituted for "%1$s". (The funky \u003c and friends are
encodings for the greater-than and less-than symbols which
are not legal in xml strings.)-->
<string name="invite_htmf">\u003ca href=\"%1$s\"\u003ETap here to
accept\u003c/a\u003E my invitation and join this
<string name="invite_htmf">\u003ca href=\"%1$s\"\u003ETap
here\u003c/a\u003E (%1$s) to accept my invitation and join this
game.\u003cbr\u003E \u003ca
href=\"http://eehouse.org/market_redir.php\"\u003E
Tap here to install Crosswords\u003c/a\u003E if you haven\'t
already.</string>
href=\"http://eehouse.org/market_redir.php\"\u003E Tap
here\u003c/a\u003E (http://eehouse.org/market_redir.php) to
install Crosswords if you haven\'t already.</string>
<!-- This is the body of the text version of the invitation. A URL
is created with parameters describing the game and

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -685,7 +685,7 @@ public class GamesList extends XWListActivity
long rowid = DBUtils.getRowIDForOpen( this, info.room, info.lang,
info.nPlayers );
if ( -1 != rowid ) {
if ( -1 == rowid ) { // doesn't exist yet
rowid = GameUtils.makeNewNetGame( this, info );
GameUtils.launchGame( this, rowid, true );
} else {

60
xwords4/android/XWords4/src/org/eehouse/android/xw4/StatusReceiver.java
View file

@ -1,35 +1,35 @@
/* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
/*
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
* rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// /* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
// /*
// * Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
// * rights reserved.
// *
// * This program is free software; you can redistribute it and/or
// * modify it under the terms of the GNU General Public License as
// * published by the Free Software Foundation; either version 2 of the
// * License, or (at your option) any later version.
// *
// * This program is distributed in the hope that it will be useful, but
// * WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// * General Public License for more details.
// *
// * You should have received a copy of the GNU General Public License
// * along with this program; if not, write to the Free Software
// * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// */
package org.eehouse.android.xw4;
// package org.eehouse.android.xw4;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
// import android.content.BroadcastReceiver;
// import android.content.Context;
// import android.content.Intent;
public class StatusReceiver extends BroadcastReceiver {
// public class StatusReceiver extends BroadcastReceiver {
@Override
public void onReceive( Context context, Intent intent )
{
DbgUtils.logf( "StatusReceiver.onReceive called: %s", intent.toString() );
}
// @Override
// public void onReceive( Context context, Intent intent )
// {
// DbgUtils.logf( "StatusReceiver.onReceive called: %s", intent.toString() );
// }
}
// }

8
xwords4/android/scripts/install_all.sh Executable file
View file

@ -0,0 +1,8 @@
#!/bin/sh
for DEVICE in $(adb devices | grep '^emulator' | sed 's/device//'); do
adb -s $DEVICE install -r ./bin/XWords4-debug.apk
COUNT=$((COUNT+1))
done
echo "installed into $COUNT emulator instances"

4
xwords4/linux/linuxmain.c
View file

@ -913,7 +913,7 @@ tmp_noop_sigintterm( int XP_UNUSED(sig) )
#ifdef XWFEATURE_WALKDICT
//# define PRINT_ALL
static void
testGetNthWord( const DictionaryCtxt* dict, char** words,
testGetNthWord( const DictionaryCtxt* dict, char** XP_UNUSED_DBG(words),
XP_U16 depth, IndexData* data, XP_U16 min, XP_U16 max )
{
XP_UCHAR buf[64];
@ -950,7 +950,7 @@ testGetNthWord( const DictionaryCtxt* dict, char** words,
}
static void
walk_dict_test( const LaunchParams* params, const DictionaryCtxt* dict,
walk_dict_test( const LaunchParams* XP_UNUSED_DBG(params), const DictionaryCtxt* dict,
GSList* testPrefixes, const char* testMinMax )
{
/* This is just to test that the dict-iterating code works. The words are

1
xwords4/wince/.gitignore vendored
View file

@ -1,3 +1,4 @@
obj*/
Cross_dbg/
xwDbgLog.txt
*.xwd