Commit e3789867 authored by jehan's avatar jehan
Browse files

Merge branch 'master' of git.linphone.org:linphone-private

parents d770e133 3e1a0348
...@@ -31,4 +31,15 @@ msx264.iss ...@@ -31,4 +31,15 @@ msx264.iss
linphone-install linphone-install
buddylookup-install buddylookup-install
msx264-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
linphone-3.3.0 -- ????????? linphone-3.3.0 -- May 10, 2010
* liblinphone is ported to iphoneOS and Google Android * liblinphone is ported to iphoneOS and Google Android
* Internal refactoring of liblinphone (code factorisation, encapsulation * Internal refactoring of liblinphone (code factorisation, encapsulation
of signaling) of signaling)
......
dnl Process this file with autoconf to produce a configure script. 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 AC_CANONICAL_SYSTEM
dnl Source packaging numbers dnl Source packaging numbers
......
...@@ -227,8 +227,11 @@ static void call_updated(SalOp *op){ ...@@ -227,8 +227,11 @@ static void call_updated(SalOp *op){
if (call->resultdesc) if (call->resultdesc)
sal_media_description_unref(call->resultdesc); sal_media_description_unref(call->resultdesc);
call->resultdesc=sal_call_get_final_media_description(op); call->resultdesc=sal_call_get_final_media_description(op);
if (call->resultdesc && !sal_media_description_empty(call->resultdesc)){ if (call->resultdesc){
linphone_connect_incoming(lc,call); sal_media_description_ref(call->resultdesc);
if (sal_media_description_empty(call->resultdesc)){
linphone_connect_incoming(lc,call);
}
} }
} }
......
...@@ -168,6 +168,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro ...@@ -168,6 +168,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
to_str=linphone_address_as_string(to); to_str=linphone_address_as_string(to);
from_str=linphone_address_as_string(from); from_str=linphone_address_as_string(from);
sal_op_set_route(call->ping_op,sal_op_get_network_origin(call->op)); 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); sal_ping(call->ping_op,to_str,from_str);
ms_free(to_str); ms_free(to_str);
ms_free(from_str); ms_free(from_str);
...@@ -2001,6 +2002,7 @@ int linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddress *real_p ...@@ -2001,6 +2002,7 @@ int linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddress *real_p
call->state=LCStatePreEstablishing; call->state=LCStatePreEstablishing;
call->ping_op=sal_op_new(lc->sal); call->ping_op=sal_op_new(lc->sal);
sal_ping(call->ping_op,from,real_url); sal_ping(call->ping_op,from,real_url);
sal_op_set_user_pointer(call->ping_op,call);
call->start_time=time(NULL); call->start_time=time(NULL);
} }
......
...@@ -1231,9 +1231,11 @@ int main(int argc, char *argv[]){ ...@@ -1231,9 +1231,11 @@ int main(int argc, char *argv[]){
const char *factory_config_file; const char *factory_config_file;
const char *lang; const char *lang;
GtkSettings *settings; GtkSettings *settings;
GdkPixbuf *pbuf;
g_thread_init(NULL); g_thread_init(NULL);
gdk_threads_init(); gdk_threads_init();
progpath = strdup(argv[0]); progpath = strdup(argv[0]);
config_file=linphone_gtk_get_config_file(); config_file=linphone_gtk_get_config_file();
...@@ -1247,6 +1249,9 @@ int main(int argc, char *argv[]){ ...@@ -1247,6 +1249,9 @@ int main(int argc, char *argv[]){
_putenv(tmp); _putenv(tmp);
} }
} }
#else
/*for pulseaudio:*/
g_setenv("PULSE_PROP_media.role", "phone", TRUE);
#endif #endif
if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){ if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){
...@@ -1277,6 +1282,7 @@ int main(int argc, char *argv[]){ ...@@ -1277,6 +1282,7 @@ int main(int argc, char *argv[]){
gdk_threads_leave(); gdk_threads_leave();
return -1; return -1;
} }
settings=gtk_settings_get_default(); settings=gtk_settings_get_default();
g_object_set(settings, "gtk-menu-images", TRUE, NULL); g_object_set(settings, "gtk-menu-images", TRUE, NULL);
g_object_set(settings, "gtk-button-images", TRUE, NULL); g_object_set(settings, "gtk-button-images", TRUE, NULL);
...@@ -1301,6 +1307,11 @@ int main(int argc, char *argv[]){ ...@@ -1301,6 +1307,11 @@ int main(int argc, char *argv[]){
add_pixmap_directory("pixmaps"); add_pixmap_directory("pixmaps");
add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone"); 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"); the_ui=linphone_gtk_create_window("main");
linphone_gtk_create_log_window(); linphone_gtk_create_log_window();
......
mediastreamer2 @ 48826342
Subproject commit b340a76e998c7dd2670372212b0bf14d7c59b987 Subproject commit 4882634280c82ca495d5bebec482d2744ddb7f61
oRTP @ ba73b815
Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27 Subproject commit ba73b8155b3a6aa64f8df95dee6b25ca9b95cbca
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