User: kz Date: 06/02/28 02:32:03 Modified: /dba/connectivity/source/drivers/evoab2/ EApi.cxx
Log: INTEGRATION: CWS evo2fixes (1.3.74); FILE MERGED 2006/02/15 12:15:24 mmeeks 1.3.74.1: Issue numbers: i#50913#, i#62042#, i#55893#, i#62043# Submitted by: misc, Tor, Jayant, me Reviewed by: mmeeks Fix a number of bugs, make it work with evo 2.4 & 2.6. File Changes: Directory: /dba/connectivity/source/drivers/evoab2/ =================================================== File [changed]: EApi.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/EApi.cxx?r1=1.3&r2=1.4 Delta lines: +21 -20 --------------------- --- EApi.cxx 8 Sep 2005 05:48:53 -0000 1.3 +++ EApi.cxx 28 Feb 2006 10:32:00 -0000 1.4 @@ -36,17 +36,14 @@ #include <rtl/ustring.hxx> #include <osl/module.h> #include <stdio.h> -#define _EVOLUTION_ALREADY_DEFINED_ 1 +#define DECLARE_FN_POINTERS 1 #ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ #include "EApi.h" #endif static char *eBookLibNames[] = { "libebook.so.8", // evolution-2.0 - "libebook-1.2.so.3" // evolution-2.2 - // FIXME: ask JPR about ABI compatibility going forwards - // "libebook-1.3.so.0", - // "libebook-1.4.so.0", - // "libebook-1.5.so.0" + "libebook-1.2.so.3", // evolution-2.2 + "libebook-1.2.so.5" // evolution-2.4 and 2.6+ }; typedef void (*SymbolFunc) (void); @@ -56,6 +53,8 @@ const char *sym_name; SymbolFunc *ref_value; } aApiMap[] = { + SYM_MAP( e_contact_field_name ), + SYM_MAP( e_contact_get ), SYM_MAP( e_contact_get_type ), SYM_MAP( e_contact_field_id ), SYM_MAP( e_source_peek_name ), @@ -74,6 +73,7 @@ SYM_MAP( e_book_query_or ), SYM_MAP( e_book_query_not ), SYM_MAP( e_book_query_unref ), + SYM_MAP( e_book_query_from_string ), SYM_MAP( e_book_query_to_string ), SYM_MAP( e_book_query_field_exists ), SYM_MAP( e_source_group_peek_base_uri) @@ -121,13 +121,14 @@ #if 0 - Test code - enable & +/* + * Test code - enable & * * Compile with ( after source LinuxIntelEnv.Set.sh ) - gcc $SOLARDEF -I $SOLARSRC/sal/inc -I $SOLARSRC/sal/unxlngi4.pro/inc \ + gcc $SOLARDEF -I $SOLARVER/$UPD/$INPATH/inc \ -I. `pkg-config --cflags --libs gobject-2.0` \ - -L $SOLARSRC/sal/unxlngi4.pro/lib -luno_sal -lstdc++ EApi.cxx - + -L $SOLARVER/$UPD/$INPATH/lib -luno_sal -lstdc++ EApi.cxx + */ int main( int argc, char **argv) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
