diff --git a/plugins/addressbook/evolution/eds.c b/plugins/addressbook/evolution/eds.c index 508fc238ef9caf3d1f5f98dfc4459d710ab05765..475cf8bb62c5bdab755886d727ceeeb3fc676708 100644 --- a/plugins/addressbook/evolution/eds.c +++ b/plugins/addressbook/evolution/eds.c @@ -324,6 +324,9 @@ init_eds () void fill_books_data () { +#if EDS_CHECK_VERSION(3,5,3) +#warning FIXME ESource registry API is not supported yet +#else ESourceList *source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); if (source_list == NULL) @@ -369,6 +372,7 @@ fill_books_data () g_static_mutex_unlock(&books_data_mutex); g_object_unref (source_list); +#endif } void @@ -423,6 +427,9 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler had->max_results_remaining = max_results; had->equery = create_query (query, current_test, (AddressBook_Config *) (user_data)); +#if EDS_CHECK_VERSION(3,5,3) +#warning FIXME: use EClient API, EBook API is deprecated +#else EBook *book = e_book_new_from_uri(current_uri, NULL); if (!book) return; @@ -432,6 +439,7 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler #else e_book_async_open(book, TRUE, eds_async_open_callback, had); #endif +#endif } void diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh index 60b6ea698ce1bdc0393160b450e0aa8de3edf087..257ef5635f73950a1f0d15f1b23a3b069c0865d6 100755 --- a/tools/build-system/launch-build-machine-jenkins.sh +++ b/tools/build-system/launch-build-machine-jenkins.sh @@ -244,7 +244,7 @@ END if [ "$IS_KDE_CLIEN" != "1" ]; then ./autogen.sh fi - debuild -S -sa -kFDFE4451 + debuild -S -sa -kF5362695 cd ${LAUNCHPAD_DIR} if [ ${DO_UPLOAD} ] ; then diff --git a/tools/build-system/launchpad/sflphone-client-kde/debian/control b/tools/build-system/launchpad/sflphone-client-kde/debian/control index d868f950255eb2fe8b19bbc3f9d5b6e5f50a3499..33b56b33bf7f309f7874abe1aee7974dd1f92504 100644 --- a/tools/build-system/launchpad/sflphone-client-kde/debian/control +++ b/tools/build-system/launchpad/sflphone-client-kde/debian/control @@ -1,8 +1,7 @@ Source: sflphone-client-kde Section: kde Priority: optional -Maintainer: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> -Uploaders: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> +Maintainer: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Build-Depends: debhelper (>= 5.0), cdbs, kdelibs5-dev, cmake, kdepimlibs5-dev, libboost-dev, Homepage: http://www.sfphone.org/