Skip to content
Snippets Groups Projects
Commit 6b9cb06d authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'conference'

parents b0008ae4 4dd47998
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,9 @@ void
addressbook_search(GtkEntry* entry)
{
gchar* query = gtk_entry_get_text(GTK_ENTRY (entry));
if (strlen(query) >= 3) {
AddressBook_Config *addressbook_config;
// Activate waiting layer
......@@ -41,8 +44,9 @@ addressbook_search(GtkEntry* entry)
addressbook_config_load_parameters(&addressbook_config);
// Start the asynchronous search as soon as we have an entry */
search_async(gtk_entry_get_text(GTK_ENTRY (entry)), addressbook_config->max_results, &handler_async_search,
addressbook_config);
search_async(gtk_entry_get_text(GTK_ENTRY (entry)), addressbook_config->max_results, &handler_async_search, addressbook_config);
}
}
/**
......@@ -84,6 +88,7 @@ addressbook_is_active()
static void
addressbook_config_books()
{
gchar **config_book_uid;
book_data_t *book_data;
gchar **list;
......@@ -91,16 +96,16 @@ addressbook_config_books()
// Retrieve list of books
list = (gchar **) dbus_get_addressbook_list();
if (list)
{
for (config_book_uid = list; *config_book_uid; config_book_uid++)
{
if (list) {
for (config_book_uid = list; *config_book_uid; config_book_uid++) {
// Get corresponding book data
book_data = books_get_book_data_by_uid(*config_book_uid);
// If book_data exists
if (book_data != NULL)
{
if (book_data != NULL) {
book_data->active = TRUE;
}
}
......
......@@ -279,8 +279,10 @@ eds_async_open_callback(EBook *book, EBookStatus status, gpointer closure)
remaining_books_to_open--;
if (status == E_BOOK_ERROR_OK)
{
DEBUG("eds_async_open_callback remaining book to open: %i", remaining_books_to_open);
if (status == E_BOOK_ERROR_OK) {
book_data_t *book_data = g_new(book_data_t, 1);
book_data->active = FALSE;
book_data->name = g_strdup(e_source_peek_name(e_book_get_source(book)));
......@@ -289,8 +291,8 @@ eds_async_open_callback(EBook *book, EBookStatus status, gpointer closure)
books_data = g_slist_prepend(books_data, book_data);
had->handler();
}
else
{
else {
WARN("Got error %d when opening book", status);
}
}
......@@ -302,14 +304,15 @@ void
init(OpenAsyncHandler callback)
{
GSList *list, *l;
ESourceList *source_list;
ESourceList *source_list = NULL;
remaining_books_to_open = 0;
books_data = NULL;
source_list = e_source_list_new_for_gconf_default(
"/apps/evolution/addressbook/sources");
source_list = e_source_list_new_for_gconf_default("/apps/evolution/addressbook/sources");
if (source_list == NULL)
{
DEBUG("Error could not initialize source list for addressbook");
return;
}
......@@ -320,6 +323,7 @@ init(OpenAsyncHandler callback)
for (l = list; l != NULL; l = l->next)
{
ESourceGroup *group = l->data;
GSList *sources = NULL, *m;
sources = e_source_group_peek_sources(group);
......@@ -330,10 +334,12 @@ init(OpenAsyncHandler callback)
if (book != NULL)
{
// Keep count of remaining books to open
DEBUG("init addressbook %i", remaining_books_to_open);
remaining_books_to_open++;
// Asynchronous open
e_book_async_open(book, TRUE, eds_async_open_callback, had);
e_book_async_open(book, FALSE, eds_async_open_callback, had);
}
}
}
......
......@@ -36,6 +36,8 @@ GdkPixbuf *missed_pixbuf = NULL;
void searchbar_entry_changed (GtkEntry* entry, gchar* arg1 UNUSED, gpointer data UNUSED)
{
DEBUG("searchbar_entry_changed");
if (active_calltree == contacts) {
addressbook_search (entry);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment