Skip to content
Snippets Groups Projects
Commit 004eb1ae authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #13994: addressbook: issue warning but compile anyway if eds version >= 3.5.3

We still have to implement the missing functionality in terms of the new API
parent ee08d9b9
Branches
Tags
No related merge requests found
...@@ -324,6 +324,9 @@ init_eds () ...@@ -324,6 +324,9 @@ init_eds ()
void void
fill_books_data () 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"); ESourceList *source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
if (source_list == NULL) if (source_list == NULL)
...@@ -369,6 +372,7 @@ fill_books_data () ...@@ -369,6 +372,7 @@ fill_books_data ()
g_static_mutex_unlock(&books_data_mutex); g_static_mutex_unlock(&books_data_mutex);
g_object_unref (source_list); g_object_unref (source_list);
#endif
} }
void void
...@@ -423,6 +427,9 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler ...@@ -423,6 +427,9 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler
had->max_results_remaining = max_results; had->max_results_remaining = max_results;
had->equery = create_query (query, current_test, (AddressBook_Config *) (user_data)); 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); EBook *book = e_book_new_from_uri(current_uri, NULL);
if (!book) if (!book)
return; return;
...@@ -432,6 +439,7 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler ...@@ -432,6 +439,7 @@ search_async_by_contacts (const char *query, int max_results, SearchAsyncHandler
#else #else
e_book_async_open(book, TRUE, eds_async_open_callback, had); e_book_async_open(book, TRUE, eds_async_open_callback, had);
#endif #endif
#endif
} }
void void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment