From 1f02b4eaaed1f314c2a054931694d90b22bdd944 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 12 May 2015 17:59:34 +0200 Subject: [PATCH 1/3] fix crash on windows (visual studio) --- gtk/calllogs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/calllogs.c b/gtk/calllogs.c index 7960708c7..51fcb260b 100644 --- a/gtk/calllogs.c +++ b/gtk/calllogs.c @@ -147,7 +147,7 @@ static GtkWidget *linphone_gtk_create_call_log_menu(GtkWidget *call_log){ name=linphone_address_as_string(la); call_label=g_strdup_printf(_("Call %s"),name); text_label=g_strdup_printf(_("Send text to %s"),name); - g_free(name); + ms_free(name); } } if (call_label){ From fe3799cb1b14215ea2cbd82a3a11bb5e3d043d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 12 May 2015 21:24:52 +0200 Subject: [PATCH 2/3] Fix bug on Windows. The status icon did not disappear after Linphone quit --- gtk/status_icon.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk/status_icon.c b/gtk/status_icon.c index aba9c5d1d..ba16e28ea 100644 --- a/gtk/status_icon.c +++ b/gtk/status_icon.c @@ -304,9 +304,10 @@ static void _linphone_status_icon_impl_gtk_init(LinphoneStatusIcon *si) { si->data = icon; } -// static void _linphone_status_icon_impl_gtk_uninit(LinphoneStatusIcon *si) { -// g_object_unref((GtkStatusIcon *)si->data); -// } +static void _linphone_status_icon_impl_gtk_uninit(LinphoneStatusIcon *si) { + GtkStatusIcon *icon = GTK_STATUS_ICON(si->data); + gtk_status_icon_set_visible(icon, FALSE); +} static void _linphone_status_icon_impl_gtk_start(LinphoneStatusIcon *si) { GtkStatusIcon *icon = GTK_STATUS_ICON(si->data); @@ -358,7 +359,7 @@ static gboolean _linphone_status_icon_impl_is_supported( static const _LinphoneStatusIconDesc _linphone_status_icon_impl_gtk_desc = { "gtk_status_icon", _linphone_status_icon_impl_gtk_init, - NULL, + _linphone_status_icon_impl_gtk_uninit, _linphone_status_icon_impl_gtk_start, _linphone_status_icon_impl_enable_blinking, _linphone_status_icon_impl_is_supported From 57b99948b353b03b3dd354d93f785f6e53ab4e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 13 May 2015 10:32:23 +0200 Subject: [PATCH 3/3] Points the mediastreamer submodule on 2.11.2 Because the 2.11.2 mediastreamer tag has been moved --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 9c57afef0..2de4bc981 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9c57afef0d3332715b701ec161b0598fe4246b53 +Subproject commit 2de4bc981ed4db1ad95c762b76663f9871c60df1