witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Normalize linphone_proxy_config_set_expires() name.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-04 17:41:55 +02:00
parent b8453d1bc1
commit c1968e3fd8
7 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
console/commands.c
View file

@ -1616,7 +1616,7 @@ linphonec_proxy_add(LinphoneCore *lc)
continue;
}
linphone_proxy_config_expires(cfg, expires);
linphone_proxy_config_set_expires(cfg, expires);
linphonec_out("Expiration: %d seconds\n", linphone_proxy_config_get_expires (cfg));
free(input);

3
coreapi/linphonecore.h
View file

@ -658,7 +658,8 @@ LINPHONE_PUBLIC LinphoneProxyConfig *linphone_proxy_config_new(void);
LINPHONE_PUBLIC int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr);
LINPHONE_PUBLIC int linphone_proxy_config_set_identity(LinphoneProxyConfig *obj, const char *identity);
LINPHONE_PUBLIC int linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route);
LINPHONE_PUBLIC void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int expires);
LINPHONE_PUBLIC void linphone_proxy_config_set_expires(LinphoneProxyConfig *obj, int expires);
#define linphone_proxy_config_expires linphone_proxy_config_set_expires
/**
* Indicates either or not, REGISTRATION must be issued for this #LinphoneProxyConfig .
* <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.

2
coreapi/linphonecore_jni.cc
View file

@ -2600,7 +2600,7 @@ extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_getState(JNIEnv*
return (jint) linphone_proxy_config_get_state((const LinphoneProxyConfig *) ptr);
}
extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setExpires(JNIEnv* env,jobject thiz,jlong ptr,jint delay) {
linphone_proxy_config_expires((LinphoneProxyConfig *) ptr, (int) delay);
linphone_proxy_config_set_expires((LinphoneProxyConfig *) ptr, (int) delay);
}
extern "C" jint Java_org_linphone_core_LinphoneCallImpl_getDuration(JNIEnv* env,jobject thiz,jlong ptr) {

2
coreapi/proxy.c
View file

@ -227,7 +227,7 @@ void linphone_proxy_config_enableregister(LinphoneProxyConfig *obj, bool_t val){
/**
* Sets the registration expiration time in seconds.
**/
void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){
void linphone_proxy_config_set_expires(LinphoneProxyConfig *obj, int val){
if (val<0) val=600;
obj->expires=val;
}

2
gtk/propertybox.c
View file

@ -738,7 +738,7 @@ void linphone_gtk_proxy_ok(GtkButton *button){
gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"route"))));
linphone_proxy_config_set_contact_parameters(cfg,
gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"params"))));
linphone_proxy_config_expires(cfg,
linphone_proxy_config_set_expires(cfg,
(int)gtk_spin_button_get_value(
GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"regperiod"))));
linphone_proxy_config_enable_publish(cfg,

2
gtk/setupwizard.c
View file

@ -416,7 +416,7 @@ static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page
linphone_proxy_config_set_identity(cfg, creator->username);
linphone_proxy_config_set_server_addr(cfg, creator->domain);
linphone_proxy_config_set_route(cfg, creator->route);
linphone_proxy_config_expires(cfg, 3600);
linphone_proxy_config_set_expires(cfg, 3600);
linphone_proxy_config_enable_publish(cfg, FALSE);
linphone_proxy_config_enable_register(cfg, TRUE);

2
tester/register_tester.c
View file

@ -87,7 +87,7 @@ static void register_with_refresh_base_3(LinphoneCore* lc
server_addr = linphone_address_get_domain(from);
linphone_proxy_config_enable_register(proxy_cfg,TRUE);
linphone_proxy_config_expires(proxy_cfg,1);
linphone_proxy_config_set_expires(proxy_cfg,1);
if (route) {
linphone_proxy_config_set_route(proxy_cfg,route);
linphone_proxy_config_set_server_addr(proxy_cfg,route);