maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

EDS compatibility: fixed inconsistency in libecal check

Browse source 
The check for the _r variants in libical still used an older max
version. This might have prevented using them (if not found) or
could have led to a mixture of old and new libecal in the same
process (probably crashed).
This commit is contained in:
Patrick Ohly 2011-11-09 14:14:09 +01:00
parent 88b0cc2b62
commit f93b675d77
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/syncevo/eds_abi_wrapper.cpp
View file

@ -231,8 +231,10 @@ extern "C" void EDSAbiWrapperInit()
# endif // ENABLE_EBOOK
# ifdef ENABLE_ECAL
static const int libecalMinVersion = 3,
libecalMaxVersion = 8;
ecalhandle =
findSymbols("libecal-1.2.so", 3, 8,
findSymbols("libecal-1.2.so", libecalMinVersion, libecalMaxVersion,
FIND_SYMBOLS_NEED_ALL|FIND_SYMBOLS_LENIENT_MAX_VERSION, NULL,
&EDSAbiWrapperSingleton.e_cal_add_timezone, "e_cal_add_timezone",
&EDSAbiWrapperSingleton.e_cal_component_get_icalcomponent, "e_cal_component_get_icalcomponent",
@ -331,7 +333,7 @@ extern "C" void EDSAbiWrapperInit()
(void *)0);
EDSAbiHaveEcal = EDSAbiWrapperSingleton.e_cal_new != 0;
ecalhandle =
findSymbols("libecal-1.2.so", 3, 7,
findSymbols("libecal-1.2.so", libecalMinVersion, libecalMaxVersion,
FIND_SYMBOLS_LENIENT_MAX_VERSION, NULL,
&EDSAbiWrapperSingleton.icalcomponent_as_ical_string_r, "icalcomponent_as_ical_string_r",
&EDSAbiWrapperSingleton.icaltime_as_ical_string_r, "icaltime_as_ical_string_r",