mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-06 21:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Browse source
This commit is contained in:
Simon Morlat 2011-10-13 11:36:44 +02:00
commit bb6a292ced
4 changed files with 3976 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/linphonecore.c
View file

@ -514,7 +514,11 @@ static void sip_config_read(LinphoneCore *lc)
ms_free(contact);
}
#ifdef HAVE_GTK_OSX
sal_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/opt/local/share/linphone/rootca.pem"));
#else
sal_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/etc/ssl/certs"));
#endif
tmp=lp_config_get_int(lc->config,"sip","guess_hostname",1);
linphone_core_set_guess_hostname(lc,tmp);

7
coreapi/linphonecore_jni.cc
View file

@ -1191,6 +1191,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv*
,jobject thiz
,jlong lc
,jobject obj) {
jobject oldWindow = (jobject) linphone_core_get_native_video_window_id((LinphoneCore*)lc);
if (oldWindow != NULL) {
env->DeleteGlobalRef(oldWindow);
}
if (obj != NULL) {
obj = env->NewGlobalRef(obj);
}
linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
}

18
gtk/propertybox.c
View file

@ -145,24 +145,6 @@ void linphone_gtk_ipv6_toggled(GtkWidget *w){
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)));
}
/* void linphone_gtk_udp_sip_port_changed(GtkWidget *w){
LCSipTransports tr;
LinphoneCore *lc=linphone_gtk_get_core();
linphone_core_get_sip_transports(lc,&tr);
tr.udp_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w));
linphone_core_set_sip_transports(lc,&tr);
}
void linphone_gtk_tcp_sip_port_changed(GtkWidget *w){
LCSipTransports tr;
LinphoneCore *lc=linphone_gtk_get_core();
linphone_core_get_sip_transports(lc,&tr);
tr.tcp_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w));
linphone_core_set_sip_transports(lc,&tr);
} */
void linphone_gtk_audio_port_changed(GtkWidget *w){
linphone_core_set_audio_port(linphone_gtk_get_core(),
(gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)));

3965
share/rootca.pem Normal file
View file

File diff suppressed because it is too large Load diff