mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 07:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev_loc

Browse source
This commit is contained in:
Sandrine Avakian 2017-03-22 14:23:59 +01:00
commit 56b66b5dd1
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/linphonecore_jni.cc
View file

@ -4560,7 +4560,7 @@ static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageS
LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
env->CallVoidMethod(listener, method, jmessage, env->CallStaticObjectMethod(ljb->chatMessageStateClass, ljb->chatMessageStateFromIntId, (jint)state));
if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
if (state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
env->DeleteGlobalRef(listener);
msg->message_state_changed_user_data = NULL;
}
@ -4723,7 +4723,7 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
jmessage,
env->CallStaticObjectMethod(ljb->chatMessageStateClass,ljb->chatMessageStateFromIntId,(jint)state));
if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
if (state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
env->DeleteGlobalRef(listener);
env->DeleteGlobalRef(jmessage);
linphone_chat_message_set_user_data(msg,NULL);

6
daemon/daemon.cc
View file

@ -679,7 +679,7 @@ string Daemon::readPipe() {
close(childfd);
} else {
mChildFd = (ortp_pipe_t)childfd;
return NULL;
return "";
}
}
}
@ -692,7 +692,7 @@ string Daemon::readPipe() {
ms_message("Client disconnected");
ortp_server_pipe_close_client(mChildFd);
mChildFd = (ortp_pipe_t)-1;
return NULL;
return "";
}
buffer[ret] = '\0';
return buffer;
@ -700,7 +700,7 @@ string Daemon::readPipe() {
}
}
#endif
return NULL;
return "";
}
void Daemon::dumpCommandsHelp() {

36
wrappers/cpp/CMakeLists.txt
View file

@ -1,4 +1,24 @@
configure_file(LinphoneCxxConfig.cmake.in LinphoneCxxConfig.cmake @ONLY)
############################################################################
# CMakeLists.txt
# Copyright (C) 2017 Belledonne Communications, Grenoble France
#
############################################################################
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
############################################################################
add_custom_command(OUTPUT include/linphone++/linphone.hh src/linphone++.cc
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/genwrapper.py" "${PROJECT_BINARY_DIR}/coreapi/help/doc/xml"
@ -44,8 +64,14 @@ write_basic_package_version_file(
export(EXPORT LinphoneCxxTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxTargets.cmake"
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake
${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxTargets.cmake
${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake
DESTINATION ${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake
configure_file(LinphoneCxxConfig.cmake.in LinphoneCxxConfig.cmake @ONLY)
install(EXPORT LinphoneCxxTargets
FILE LinphoneCxxTargets.cmake
DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake"
DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
)