diff options
Diffstat (limited to 'bindings/java-jni/jni')
| -rw-r--r-- | bindings/java-jni/jni/swordstub.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bindings/java-jni/jni/swordstub.cpp b/bindings/java-jni/jni/swordstub.cpp index a8ddb16..435a3f1 100644 --- a/bindings/java-jni/jni/swordstub.cpp +++ b/bindings/java-jni/jni/swordstub.cpp @@ -2,7 +2,7 @@ * * swordstub.cpp - JNI bindings * - * $Id: swordstub.cpp 2894 2013-07-16 04:38:43Z scribe $ + * $Id: swordstub.cpp 3184 2014-04-17 04:30:54Z greg.hellings $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -1132,6 +1132,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search SWModule *module = getModule(env, me); + // TODO: remove this from the stack struct pu peeuuu(env, progressReporter); if (module) { @@ -1245,11 +1246,11 @@ SWLog::getSystemLog()->logDebug("uninstallModule %s\n", modName); return -2; } module = it->second; - installMgr->removeModule(mgr, module->getName()); + int retVal = installMgr->removeModule(mgr, module->getName()); env->ReleaseStringUTFChars(modNameJS, modName); - return 0; + return retVal; } @@ -1350,9 +1351,9 @@ SWLog::getSystemLog()->logDebug("remoteListModules returning %d length array\n", SWBuf version = module->getConfigEntry("Version"); SWBuf statusString = " "; - if (it->second & InstallMgr::MODSTAT_NEW) statusString = "*"; - if (it->second & InstallMgr::MODSTAT_OLDER) statusString = "-"; - if (it->second & InstallMgr::MODSTAT_UPDATED) statusString = "+"; + if (status & InstallMgr::MODSTAT_NEW) statusString = "*"; + if (status & InstallMgr::MODSTAT_OLDER) statusString = "-"; + if (status & InstallMgr::MODSTAT_UPDATED) statusString = "+"; SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); |