Mercurial > pidgin.yaz
changeset 9352:cc2baf349805
[gaim-migrate @ 10160]
Remove the hack that was needed before evolution-data-server 0.0.94's
release to maintain compatibility with release and CVS.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 22 Jun 2004 21:04:33 +0000 |
| parents | e537f33dc064 |
| children | b8138f3959dc |
| files | configure.ac plugins/gevolution/gevo-util.c |
| diffstat | 2 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Jun 22 19:09:24 2004 +0000 +++ b/configure.ac Tue Jun 22 21:04:33 2004 +0000 @@ -312,15 +312,6 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - dnl This is necessary, because Evolution bumps the version just before - dnl release, and they broke the API in the current evolution-data-server - dnl release (0.0.93). Version checks won't work until 0.0.94, so we'll - dnl do this for now. Remove in a couple versions! - AC_CHECK_LIB(ebook, e_book_new_system_addressbook, - [ - AC_DEFINE(LIBEBOOK_NEW_API, 1, [new API in libebook 0.0.94cvs]) - ], , $EVOLUTION_ADDRESSBOOK_LIBS) - dnl This can be removed in a few releases of Evolution, especially when dnl it goes stable! AC_MSG_CHECKING([libebook version])
--- a/plugins/gevolution/gevo-util.c Tue Jun 22 19:09:24 2004 +0000 +++ b/plugins/gevolution/gevo-util.c Tue Jun 22 21:04:33 2004 +0000 @@ -133,12 +133,10 @@ g_return_val_if_fail(book != NULL, FALSE); -/* #if EBOOK_CHECK_VERSION(0, 0, 94) */ -#ifdef LIBEBOOK_NEW_API +#if EBOOK_CHECK_VERSION(0, 0, 94) *book = e_book_new_system_addressbook(NULL); - if (book != NULL) - result = e_book_open(*book, FALSE, NULL); + result = e_book_open(*book, FALSE, NULL); #else *book = e_book_new();