diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 12 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 4 |
3 files changed, 17 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2007-09-08 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-contact-list-view.c: + * libempathy-gtk/empathy-contact-list-store.c: Make use of the search + function to correctly find when typing in the contact list view. + Fixes bug #472309 (Will Thompson, Xavier Claessens). + +2007-09-08 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-log-window.c: Fix crash if there is no date for a conversation. Fixes bug #473510. diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 9cf03bfe8..5301bdc76 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -571,10 +571,10 @@ empathy_contact_list_store_get_parent_group (GtkTreeModel *model, gboolean empathy_contact_list_store_search_equal_func (GtkTreeModel *model, - gint column, - const gchar *key, - GtkTreeIter *iter, - gpointer search_data) + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer search_data) { gchar *name, *name_folded; gchar *key_folded; @@ -583,13 +583,13 @@ empathy_contact_list_store_search_equal_func (GtkTreeModel *model, g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE); if (!key) { - return FALSE; + return TRUE; } gtk_tree_model_get (model, iter, COL_NAME, &name, -1); if (!name) { - return FALSE; + return TRUE; } name_folded = g_utf8_casefold (name, -1); diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 5b3f0de08..4aeac322d 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -519,6 +519,10 @@ contact_list_view_setup (EmpathyContactListView *view) priv = GET_PRIV (view); + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (view), + empathy_contact_list_store_search_equal_func, + NULL, NULL); + g_signal_connect (priv->store, "row-has-child-toggled", G_CALLBACK (contact_list_view_row_has_child_toggled_cb), view); |