Commit 9af805f0 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Merge branch '3.9.x'

Conflicts:
	gtk/main.c
	mediastreamer2
	po/POTFILES.in
parents e6505067 52be142a
......@@ -26,7 +26,7 @@ project(LINPHONE C CXX)
set(LINPHONE_MAJOR_VERSION "3")
set(LINPHONE_MINOR_VERSION "9")
set(LINPHONE_MICRO_VERSION "0")
set(LINPHONE_MICRO_VERSION "1")
set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}")
set(LINPHONE_SO_VERSION "8")
......
linphone-3.9.1 -- November 16th, 2015
* Fix crash when recording video calls with the VP8 codec
* Fix H.264 codec support in Mac OS X package
* Fix translation of account assistant
* Bug fixes
linphone-3.9.0 -- November 2nd, 2015
* Video recording of calls in MKV format
* Clickable URLs in chat view
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([linphone],[3.9.0],[linphone-developers@nongnu.org])
AC_INIT([linphone],[3.9.1],[linphone-developers@nongnu.org])
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
......
......@@ -24,27 +24,27 @@ set(UI_FILES
about.ui
audio_assistant.ui
buddylookup.ui
callee_frame.ui
call_logs.ui
call_statistics.ui
chatroom_frame.ui
conf_frame.ui
config-uri.ui
contact.ui
dscp_settings.ui
in_call_frame.ui
keypad.ui
ldap.ui
login_frame.ui
log.ui
main.ui
parameters.ui
password.ui
provisioning-fetch.ui
setup_wizard.ui
sip_account.ui
tunnel_config.ui
waiting.ui
chatroom_frame.ui
in_call_frame.ui
conf_frame.ui
callee_frame.ui
login_frame.ui
setup_wizard.ui
)
set(PIXMAPS stock_people.png)
......
......@@ -620,7 +620,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
#else
if ( !gtk_window_is_active ( GTK_WINDOW ( main_window ) ) ) {
if ( !GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( w ),"is_notified" ) ) ) {
linphone_gtk_notify ( NULL,linphone_chat_message_get_text ( msg ) );
linphone_gtk_notify ( NULL, msg, NULL );
g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( TRUE ) );
} else {
g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( FALSE ) );
......
......@@ -146,7 +146,7 @@ LINPHONE_PUBLIC void linphone_gtk_terminate_call(GtkWidget *button);
LINPHONE_PUBLIC void linphone_gtk_call_update_tab_header(LinphoneCall *call, gboolean pause);
LINPHONE_PUBLIC void linphone_gtk_show_directory_search(void);
LINPHONE_PUBLIC void linphone_gtk_status_icon_set_blinking(gboolean val);
LINPHONE_PUBLIC void linphone_gtk_notify(LinphoneCall *call, const char *msg);
LINPHONE_PUBLIC void linphone_gtk_notify(LinphoneCall *call, LinphoneChatMessage *chat_message, const char *msg);
LINPHONE_PUBLIC void linphone_gtk_load_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *uri, GtkWidget *chat_view);
LINPHONE_PUBLIC void linphone_gtk_send_text();
......
......@@ -1217,20 +1217,26 @@ static void make_notification(const char *title, const char *body){
#endif
void linphone_gtk_notify(LinphoneCall *call, const char *msg){
void linphone_gtk_notify(LinphoneCall *call, LinphoneChatMessage *chat_message, const char *msg){
#ifdef HAVE_NOTIFY
if (!notify_is_initted())
if (!notify_init ("Linphone")) ms_error("Libnotify failed to init.");
#endif
if (!call) {
#ifdef HAVE_NOTIFY
if (!notify_notification_show(notify_notification_new("Linphone",msg,NULL
if (chat_message) {
const LinphoneAddress *address = linphone_chat_message_get_peer_address(chat_message);
char *remote = linphone_address_as_string(address);
make_notification(remote, linphone_chat_message_get_text(chat_message));
} else {
if (!notify_notification_show(notify_notification_new("Linphone",msg,NULL
#ifdef HAVE_NOTIFY1
,NULL
,NULL
#endif
),NULL))
ms_error("Failed to send notification.");
),NULL)) {
ms_error("Failed to send notification.");
}
}
#else
linphone_gtk_show_main_window();
#endif
......@@ -1392,7 +1398,7 @@ static void linphone_gtk_call_state_changed(LinphoneCore *lc, LinphoneCall *call
default:
break;
}
linphone_gtk_notify(call, msg);
linphone_gtk_notify(call, NULL, msg);
linphone_gtk_update_call_buttons (call);
}
......@@ -1955,7 +1961,7 @@ void linphone_gtk_refer_received(LinphoneCore *lc, const char *refer_to){
GtkEntry * uri_bar =GTK_ENTRY(linphone_gtk_get_widget(
linphone_gtk_get_main_window(), "uribar"));
char *text;
linphone_gtk_notify(NULL,(text=ms_strdup_printf(_("We are transferred to %s"),refer_to)));
linphone_gtk_notify(NULL,NULL,(text=ms_strdup_printf(_("We are transferred to %s"),refer_to)));
g_free(text);
gtk_entry_set_text(uri_bar, refer_to);
linphone_gtk_start_call(linphone_gtk_get_main_window());
......
mediastreamer2 @ af36a13d
Subproject commit e0d0840147e33e9cee9d2acea5c91ce48ff1159b
Subproject commit af36a13d36b8e63d25983a8f786cc1edd02498e5
......@@ -14,30 +14,30 @@ gtk/incall_view.c
gtk/loginframe.c
gtk/config-fetching.c
gtk/audio_assistant.c
[type: gettext/glade]gtk/main.ui
[type: gettext/glade]gtk/about.ui
[type: gettext/glade]gtk/contact.ui
[type: gettext/glade]gtk/log.ui
[type: gettext/glade]gtk/password.ui
[type: gettext/glade]gtk/call_logs.ui
[type: gettext/glade]gtk/main.ui
[type: gettext/glade]gtk/sip_account.ui
[type: gettext/glade]gtk/parameters.ui
[type: gettext/glade]gtk/audio_assistant.ui
[type: gettext/glade]gtk/buddylookup.ui
[type: gettext/glade]gtk/waiting.ui
[type: gettext/glade]gtk/dscp_settings.ui
[type: gettext/glade]gtk/callee_frame.ui
[type: gettext/glade]gtk/call_logs.ui
[type: gettext/glade]gtk/call_statistics.ui
[type: gettext/glade]gtk/tunnel_config.ui
[type: gettext/glade]gtk/keypad.ui
[type: gettext/glade]gtk/ldap.ui
[type: gettext/glade]gtk/config-uri.ui
[type: gettext/glade]gtk/provisioning-fetch.ui
[type: gettext/glade]gtk/chatroom_frame.ui
[type: gettext/glade]gtk/callee_frame.ui
[type: gettext/glade]gtk/conf_frame.ui
[type: gettext/glade]gtk/config-uri.ui
[type: gettext/glade]gtk/contact.ui
[type: gettext/glade]gtk/dscp_settings.ui
[type: gettext/glade]gtk/in_call_frame.ui
[type: gettext/glade]gtk/keypad.ui
[type: gettext/glade]gtk/ldap.ui
[type: gettext/glade]gtk/login_frame.ui
[type: gettext/glade]gtk/log.ui
[type: gettext/glade]gtk/main.ui
[type: gettext/glade]gtk/parameters.ui
[type: gettext/glade]gtk/password.ui
[type: gettext/glade]gtk/provisioning-fetch.ui
[type: gettext/glade]gtk/setup_wizard.ui
[type: gettext/glade]gtk/sip_account.ui
[type: gettext/glade]gtk/tunnel_config.ui
[type: gettext/glade]gtk/waiting.ui
coreapi/linphonecore.c
coreapi/misc.c
coreapi/presence.c
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -55,7 +55,7 @@ copyright = u'2014, Belledonne Communications'
# The short X.Y version.
version = '3.9'
# The full version, including alpha/beta/rc tags.
release = '3.9.0'
release = '3.9.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment