jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #19035: addressook search all if given empty query

Browse Source
This commit is contained in:
Tristan Matthews
2013-02-14 10:31:53 -05:00
parent 3d21ae48d6
commit 08ddbf7a1f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/addressbook/evolution/eds.c
View File

@ -189,8 +189,9 @@ pixbuf_from_contact(EContact *contact)
e_contact_photo_free(photo);
if (!pixbuf)
if (!pixbuf) {
return NULL;
}
// check size and resize if needed
gint width = gdk_pixbuf_get_width(pixbuf);
@ -454,11 +455,6 @@ determine_default_addressbook()
void
search_async_by_contacts(const char *query, int max_results, SearchAsyncHandler handler, gpointer user_data)
{
if (!*query) {
handler(NULL, user_data);
return;
}
Search_Handler_And_Data *had = g_new0(Search_Handler_And_Data, 1);
// initialize search data
@ -466,7 +462,11 @@ search_async_by_contacts(const char *query, int max_results, SearchAsyncHandler
had->user_data = user_data;
had->hits = NULL;
had->max_results_remaining = max_results;
had->equery = create_query(query, current_test, (AddressBook_Config *) (user_data));
if (!g_strcmp0(query, ""))
had->equery = e_book_query_any_field_contains("");
else
had->equery = create_query(query, current_test, (AddressBook_Config *) (user_data));
#if EDS_CHECK_VERSION(3,5,3)
ESourceRegistry *registry = get_registry();

3
plugins/addressbook/test/test_addressbook.c
View File

@ -89,10 +89,11 @@ main(int argc, char *argv[])
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
addressbook_init();
addressbook_set_current_book("Contacts");
GtkWidget *entry = gtk_entry_new();
//gtk_container_add(GTK_CONTAINER(vbox), entry);
gtk_container_add(GTK_CONTAINER(vbox), tree_view);
gtk_container_add(GTK_CONTAINER(vbox), entry);
gtk_container_add(GTK_CONTAINER(window), vbox);
addressbook_search(handler_async_search, GTK_ENTRY(entry), NULL);