Fix:android:Small cleanup

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4766 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android.c b/navit/navit/android.c
index eef4963..64405f3 100644 (file)
--- a/navit/navit/android.c
+++ b/navit/navit/android.c
@@ -24,7 +24,6 @@
 
 JNIEnv *jnienv;
 jobject *android_activity;
-struct callback_list *android_activity_cbl;
 int android_version;
 
 int
@@ -58,7 +57,6 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject
        const char *displaydensitystr;
        android_version=version;
        __android_log_print(ANDROID_LOG_ERROR,"test","called");
-       android_activity_cbl=callback_list_new();
        jnienv=env;
        android_activity=activity;
        (*jnienv)->NewGlobalRef(jnienv, activity);
@@ -85,15 +83,6 @@ Java_org_navitproject_navit_Navit_NavitDestroy( JNIEnv* env)
 }
 
 JNIEXPORT void JNICALL
-Java_org_navitproject_navit_Navit_NavitActivity( JNIEnv* env, jobject thiz, int param)
-{
-       dbg(0,"enter %d\n",param);
-       callback_list_call_1(android_activity_cbl, param);
-       if (param == -3)
-               exit(0);
-}
-
-JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitGraphics_SizeChangedCallback( JNIEnv* env, jobject thiz, int id, int w, int h)
 {
        dbg(0,"enter %p %d %d\n",(struct callback *)id,w,h);

diff --git a/navit/navit/android.h b/navit/navit/android.h
index d26602e..84643e7 100644 (file)
--- a/navit/navit/android.h
+++ b/navit/navit/android.h
@@ -3,7 +3,6 @@
 #include <jni.h>
 extern JNIEnv *jnienv;
 extern jobject *android_activity;
-extern struct callback_list *android_activity_cbl;
 extern int android_version;
 int android_find_class_global(char *name, jclass *ret);
 int android_find_method(jclass class, char *name, char *args, jmethodID *ret);