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

Merge branch '3.8.x'

Browse source
This commit is contained in:
François Grisez 2015-07-02 16:47:56 +02:00
commit d8e8f4488d
6 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -26,7 +26,7 @@ project(LINPHONE C CXX)
set(LINPHONE_MAJOR_VERSION "3")
set(LINPHONE_MINOR_VERSION "8")
set(LINPHONE_MICRO_VERSION "4")
set(LINPHONE_MICRO_VERSION "5")
set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}")
set(LINPHONE_SO_VERSION "7")
@ -53,6 +53,7 @@ option(ENABLE_UPNP "Build with uPnP support." YES)
option(ENABLE_VIDEO "Build with video support." YES)
cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO)
option(ENABLE_DEBUG_LOGS "Turn on or off debug level logs." NO)
option(ENABLE_NLS "Build with internationalisation support" YES)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@ -136,6 +137,10 @@ if(ENABLE_ASSISTANT)
set(BUILD_WIZARD 1)
endif()
find_package(Gettext)
if(ENABLE_NLS)
find_package(Gettext REQUIRED)
find_package(Intl REQUIRED)
endif()
include_directories(
@ -167,6 +172,7 @@ endif()
if(INTL_FOUND)
set(HAVE_GETTEXT 1)
add_definitions("-DENABLE_NLS")
include_directories(${INTL_INCLUDE_DIRECTORIES})
endif()
add_definitions("-DIN_LINPHONE")

10
NEWS
View file

@ -1,3 +1,13 @@
linphone-3.8.5 -- June 30th, 2015
* Fix bug about status icon on MacOSX. Attention request worked only once
* Fix crash at the end of the audio assistant
* Fix crash when configuring a remote provisioning
* Fix regression in the codec view. Codec which are not usable because
bandwidth limits are to low were not greyed anymore
* Fix language selection on Windows and MacOSX
* Add translation for 'Arabic' and 'Turkish' items in the language selection
list
linphone-3.8.4 -- June 9th, 2015
* Add a built-in XMLRPC client. Linphone does not depend on libsoup anymore

2
configure.ac
View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([linphone],[3.8.4],[linphone-developers@nongnu.org])
AC_INIT([linphone],[3.8.5],[linphone-developers@nongnu.org])
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([coreapi/linphonecore.c])

2
coreapi/CMakeLists.txt
View file

@ -144,7 +144,7 @@ endif()
if(WIN32 AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
list(APPEND LIBS shlwapi)
endif()
if(GETTEXT_FOUND)
if(INTL_FOUND)
list(APPEND LIBS ${INTL_LIBRARIES})
endif()

3
gtk/CMakeLists.txt
View file

@ -80,9 +80,10 @@ endif()
set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone LINKER_LANGUAGE CXX)
target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS} ${INTL_INCLUDE_DIRS})
target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES})
if(INTL_LIBRARIES)
if(INTL_FOUND)
target_link_libraries(linphone-gtk ${INTL_LIBRARIES})
endif()
if(WIN32)
target_link_libraries(linphone-gtk Wininet)
endif()

9
gtk/audio_assistant.c
View file

@ -57,6 +57,11 @@ static void activate_play_button(gboolean is_active){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(play_button),is_active);
}
static gboolean deactivate_play_button(void){
activate_play_button(FALSE);
return FALSE;
}
static gchar *get_record_file(){
char filename[256]={0};
char date[64]={0};
@ -239,7 +244,9 @@ static void endoffile_cb(void *ud, MSFilter *f, unsigned int ev,void * arg){
switch (ev) {
case MS_PLAYER_EOF: {
ms_message("EndOfFile received");
activate_play_button(FALSE);
/*workaround for a mediastreamer2 bug. Don't deactivate the play button, because it will stop the graph from the end of file callback,
* which is sometimes crashing. On master branch it is fixed in mediastreamer2, the workaround is only valid in 3.8.x branch*/
g_timeout_add(0, (GSourceFunc)deactivate_play_button, NULL);
break;
}
break;