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

Merge branch 'android_branch' into android_invite

Browse source
This commit is contained in:
eehouse@eehouse.org 2011-07-21 05:09:58 -07:00 committed by Andy2
commit 86138ec139
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/XWords4/jni/utilwrapper.c
View file

@ -249,7 +249,8 @@ utilTimerFired( XW_UtilCtxt* uc, XWTimerReason why, int handle )
AndUtil* util = (AndUtil*)uc; AndUtil* util = (AndUtil*)uc;
TimerStorage* timerStorage = &util->timerStorage[why]; TimerStorage* timerStorage = &util->timerStorage[why];
XP_ASSERT( handle == (int)timerStorage ); XP_ASSERT( handle == (int)timerStorage );
return (*timerStorage->proc)( timerStorage->closure, why ); return (handle == (int)timerStorage)
&& (*timerStorage->proc)( timerStorage->closure, why );
} }
static void static void

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

@ -209,6 +209,7 @@ public class GamesList extends XWListActivity
setContentView(R.layout.game_list); setContentView(R.layout.game_list);
registerForContextMenu( getListView() ); registerForContextMenu( getListView() );
DBUtils.setDBChangeListener( this );
boolean isUpgrade = FirstRunDialog.show( this, false ); boolean isUpgrade = FirstRunDialog.show( this, false );
PreferenceManager.setDefaultValues( this, R.xml.xwprefs, isUpgrade ); PreferenceManager.setDefaultValues( this, R.xml.xwprefs, isUpgrade );
@ -233,9 +234,9 @@ public class GamesList extends XWListActivity
Intent intent = getIntent(); Intent intent = getIntent();
startFirstHasDict( intent ); startFirstHasDict( intent );
askDefaultNameIf(); startNewNetGame( intent );
DBUtils.setDBChangeListener( this ); askDefaultNameIf();
} // onCreate } // onCreate
@Override @Override