Commit 15a73f07 authored by Alexandre Savard's avatar Alexandre Savard

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into pjsipupdate
parents 81b7a757 e5d60414
......@@ -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
......
......@@ -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
......
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/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment