mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 13:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct ldap support check.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2013-12-20 11:49:15 +01:00
parent 863ccb24fa
commit 6d989a4260
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/ldap/ldapprovider.c
View file

@ -767,6 +767,11 @@ LinphoneLDAPContactProvider* linphone_ldap_contact_provider_cast(void* obj)
return BELLE_SIP_CAST(obj, LinphoneLDAPContactProvider);
}
int linphone_ldap_contact_provider_available()
{
return 1;
}
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneLDAPContactProvider);
BELLE_SIP_INSTANCIATE_CUSTOM_VPTR_BEGIN(LinphoneLDAPContactProvider)
@ -807,5 +812,8 @@ LinphoneLDAPContactProvider* linphone_ldap_contact_provider_ref( void* obj ){ re
void linphone_ldap_contact_provider_unref( void* obj ){ }
LinphoneLDAPContactProvider* linphone_ldap_contact_provider_cast( void* obj ){ return NULL; }
int linphone_ldap_contact_provider_available(){ return 0; }
#endif /* BUILD_LDAP */

3
coreapi/ldap/ldapprovider.h
View file

@ -37,4 +37,5 @@ LinphoneLDAPContactProvider* linphone_ldap_contact_provider_create(LinphoneCore*
unsigned int linphone_ldap_contact_provider_get_max_result(const LinphoneLDAPContactProvider* obj);
LinphoneLDAPContactProvider* linphone_ldap_contact_provider_ref( void* obj );
void linphone_ldap_contact_provider_unref( void* obj );
LinphoneLDAPContactProvider* linphone_ldap_contact_provider_cast( void* obj );
LinphoneLDAPContactProvider* linphone_ldap_contact_provider_cast( void* obj );
int linphone_ldap_contact_provider_available();

2
gtk/linphone.h
View file

@ -94,6 +94,8 @@ void linphone_gtk_visibility_set(const char *hiddens, const char *window_name, G
LinphoneLDAPContactProvider* linphone_gtk_get_ldap(void);
void linphone_gtk_set_ldap(LinphoneLDAPContactProvider* ldap);
int linphone_gtk_is_ldap_supported(void);
void linphone_gtk_open_browser(const char *url);
void linphone_gtk_check_for_new_version(void);

4
gtk/main.c
View file

@ -236,6 +236,10 @@ LinphoneLDAPContactProvider* linphone_gtk_get_ldap(void){
return ldap_provider;
}
int linphone_gtk_is_ldap_supported(void){
return linphone_ldap_contact_provider_available();
}
void linphone_gtk_set_ldap(LinphoneLDAPContactProvider* ldap)
{
if( ldap_provider )

2
gtk/propertybox.c
View file

@ -1428,7 +1428,7 @@ void linphone_gtk_show_parameters(void){
}
/* LDAP CONFIG */
if( linphone_gtk_get_ldap() ) { // if LDAP provider is available
if( linphone_gtk_is_ldap_supported() ) { // if LDAP provider is available
linphone_gtk_ldap_load_settings(pb);
} else {
// hide the LDAP tab