From 1e3be91c26bee43e343145585bbc85cc196c5e1d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 6 May 2010 11:38:39 +0200 Subject: [PATCH 1/7] set env variables for pulseaudio --- gtk-glade/main.c | 11 +++++++++++ mediastreamer2 | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gtk-glade/main.c b/gtk-glade/main.c index 364accbb3..3ce841ad0 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -1231,9 +1231,11 @@ int main(int argc, char *argv[]){ const char *factory_config_file; const char *lang; GtkSettings *settings; + GdkPixbuf *pbuf; g_thread_init(NULL); gdk_threads_init(); + progpath = strdup(argv[0]); config_file=linphone_gtk_get_config_file(); @@ -1247,6 +1249,9 @@ int main(int argc, char *argv[]){ _putenv(tmp); } } +#else + /*for pulseaudio:*/ + g_setenv("PULSE_PROP_media.role", "phone", TRUE); #endif if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){ @@ -1277,6 +1282,7 @@ int main(int argc, char *argv[]){ gdk_threads_leave(); return -1; } + settings=gtk_settings_get_default(); g_object_set(settings, "gtk-menu-images", TRUE, NULL); g_object_set(settings, "gtk-button-images", TRUE, NULL); @@ -1301,6 +1307,11 @@ int main(int argc, char *argv[]){ add_pixmap_directory("pixmaps"); add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone"); + + g_set_application_name("Linphone"); + pbuf=create_pixbuf(linphone_gtk_get_ui_config("icon",LINPHONE_ICON)); + if (pbuf!=NULL) gtk_window_set_default_icon(pbuf); + the_ui=linphone_gtk_create_window("main"); linphone_gtk_create_log_window(); diff --git a/mediastreamer2 b/mediastreamer2 index b340a76e9..5b8a7c368 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b340a76e998c7dd2670372212b0bf14d7c59b987 +Subproject commit 5b8a7c368076733d478aa7e49149975915408483 From b8cd93ba35072534b3756418e62413961e5dc361 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 7 May 2010 21:53:02 +0200 Subject: [PATCH 2/7] enhance .gitignores --- .gitignore | 11 +++++++++++ mediastreamer2 | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1473464cd..7de3a426a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,15 @@ msx264.iss linphone-install buddylookup-install msx264-install +*.tar.gz +intltool-extract.in +intltool-merge.in +intltool-update.in +INSTALL +Specfile +.anjuta/ +.anjuta_sym_db.db +coreapi/help/doxygen.dox +gtk-glade/version_date.h +share/linphone.desktop diff --git a/mediastreamer2 b/mediastreamer2 index 5b8a7c368..f315bd22f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 5b8a7c368076733d478aa7e49149975915408483 +Subproject commit f315bd22ffbbe9a07d079c2859ea67e831f94e52 From f905fbcd8a14ebe383094fe1eb0678105bc25afa Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 10 May 2010 11:30:41 +0200 Subject: [PATCH 3/7] new version 3.3.0 --- NEWS | 2 +- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 0173bf7d2..cc43b585d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -linphone-3.3.0 -- ????????? +linphone-3.3.0 -- May 10, 2010 * liblinphone is ported to iphoneOS and Google Android * Internal refactoring of liblinphone (code factorisation, encapsulation of signaling) diff --git a/mediastreamer2 b/mediastreamer2 index f315bd22f..488263428 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f315bd22ffbbe9a07d079c2859ea67e831f94e52 +Subproject commit 4882634280c82ca495d5bebec482d2744ddb7f61 diff --git a/oRTP b/oRTP index 92c452dcd..ba73b8155 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27 +Subproject commit ba73b8155b3a6aa64f8df95dee6b25ca9b95cbca From 6d7bf231e6d8dc57d0aabf9fe08177441825b652 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 10 May 2010 11:37:36 +0200 Subject: [PATCH 4/7] update version of configure.in --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 2ecf17659..6e40e3105 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.2.99.7],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.3.0],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers From bacf3bbc100092ef21124de31459b412db9ff8c1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 May 2010 09:23:15 +0200 Subject: [PATCH 5/7] fix bug with SalMediaDescription not ref'd --- coreapi/callbacks.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index a4c2d510a..f15404dbf 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -227,8 +227,11 @@ static void call_updated(SalOp *op){ if (call->resultdesc) sal_media_description_unref(call->resultdesc); call->resultdesc=sal_call_get_final_media_description(op); - if (call->resultdesc && !sal_media_description_empty(call->resultdesc)){ - linphone_connect_incoming(lc,call); + if (call->resultdesc){ + sal_media_description_ref(call->resultdesc); + if (sal_media_description_empty(call->resultdesc)){ + linphone_connect_incoming(lc,call); + } } } From 9f6b1ce513656d6340823737374d787dd03eb7eb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 May 2010 09:53:07 +0200 Subject: [PATCH 6/7] fix ping_op with no back reference --- coreapi/linphonecore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 4f1d367c5..6bb231242 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -168,6 +168,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro to_str=linphone_address_as_string(to); from_str=linphone_address_as_string(from); sal_op_set_route(call->ping_op,sal_op_get_network_origin(call->op)); + sal_op_set_user_pointer(call->ping_op,call); sal_ping(call->ping_op,to_str,from_str); ms_free(to_str); ms_free(from_str); From 3e1a0348cb8cec63584dea8751d570b6f80898bb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 May 2010 14:49:10 +0200 Subject: [PATCH 7/7] set a reference to the call in the ping_op --- coreapi/linphonecore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 6bb231242..1bed57f2c 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2002,6 +2002,7 @@ int linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddress *real_p call->state=LCStatePreEstablishing; call->ping_op=sal_op_new(lc->sal); sal_ping(call->ping_op,from,real_url); + sal_op_set_user_pointer(call->ping_op,call); call->start_time=time(NULL); }