This commit is contained in:
B. Petersen 2016-11-22 02:14:45 +01:00
parent 09746d3f59
commit c00397319f
6 changed files with 5 additions and 8 deletions

5
.gitignore vendored
View file

@ -5,7 +5,4 @@ obj/
*.iml *.iml
local.properties local.properties
*.keystore *.keystore
libs/
MessengerProj/libs/

View file

@ -428,7 +428,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrChatGetName(JNIEnv *env, j
JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrChatGetSubtitle(JNIEnv *env, jclass c, jlong hChat) JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrChatGetSubtitle(JNIEnv *env, jclass c, jlong hChat)
{ {
const char* temp = mrchat_get_subtitle((mrchat_t*)hChat); /* mrchat_get_subtitle() checks for nullpointers */ const char* temp = mrchat_get_subtitle((mrchat_t*)hChat);
jstring ret = JSTRING_NEW(temp); jstring ret = JSTRING_NEW(temp);
free(temp); free(temp);
return ret; return ret;
@ -467,7 +467,7 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrChatGetTotalMsgCount(JNIEnv *
JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrChatGetUnseenCount(JNIEnv *env, jclass c, jlong hChat) JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrChatGetUnseenCount(JNIEnv *env, jclass c, jlong hChat)
{ {
return mrchat_get_unseen_count((mrchat_t*)hChat); /* mrchat_get_unseen_count() checks for nullpointers */ return mrchat_get_unseen_count((mrchat_t*)hChat);
} }
@ -549,7 +549,7 @@ JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_MrMailboxGetChatContacts(J
JNIEXPORT void Java_com_b44t_messenger_MrMailbox_MrMsglistUnref(JNIEnv *env, jclass c, jlong hMsglist) JNIEXPORT void Java_com_b44t_messenger_MrMailbox_MrMsglistUnref(JNIEnv *env, jclass c, jlong hMsglist)
{ {
mrmsglist_unref((mrmsglist_t*)hMsglist); /* mrmsglist_unref() checks for nullpointers */ mrmsglist_unref((mrmsglist_t*)hMsglist);
} }

View file

@ -21,7 +21,7 @@
* *
* File: MrMailbox.java * File: MrMailbox.java
* Authors: Björn Petersen * Authors: Björn Petersen
* Purpose: The Java part of the Java<->C Wrapper, see also mr_wrapper.c * Purpose: The Java part of the Java<->C Wrapper, see also mrwrapper.c
* *
******************************************************************************/ ******************************************************************************/