diff options
Diffstat (limited to 'addressbook')
5 files changed, 6 insertions, 8 deletions
diff --git a/addressbook/gui/component/e-book-shell-module.c b/addressbook/gui/component/e-book-shell-module.c index 68d9eb76e5..e533a1a864 100644 --- a/addressbook/gui/component/e-book-shell-module.c +++ b/addressbook/gui/component/e-book-shell-module.c @@ -43,7 +43,6 @@ #define MODULE_NAME "addressbook" #define MODULE_ALIASES "contacts" #define MODULE_SCHEMES "" -#define MODULE_SEARCHES "addresstypes.xml" #define MODULE_SORT_ORDER 300 #define LDAP_BASE_URI "ldap://" @@ -405,7 +404,6 @@ static EShellModuleInfo module_info = { MODULE_NAME, MODULE_ALIASES, MODULE_SCHEMES, - MODULE_SEARCHES, MODULE_SORT_ORDER, /* Methods */ diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c index 9a1b1dea21..e81fd11998 100644 --- a/addressbook/gui/component/e-book-shell-view-actions.c +++ b/addressbook/gui/component/e-book-shell-view-actions.c @@ -519,7 +519,7 @@ action_search_execute_cb (GtkAction *action, /* Filter by category. */ value = e_shell_content_get_filter_value (shell_content); - if (value >= CONTACT_FILTER_ANY_CATEGORY) { + if (value > CONTACT_FILTER_ANY_CATEGORY) { GList *categories; const gchar *category_name; gchar *temp; @@ -557,7 +557,6 @@ action_search_filter_cb (GtkRadioAction *action, GtkRadioAction *current, EBookShellView *book_shell_view) { - g_debug ("Contacts filter changed"); action_search_execute_cb (GTK_ACTION (current), book_shell_view); } diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c index cd3d679469..af8f199799 100644 --- a/addressbook/gui/component/e-book-shell-view-private.c +++ b/addressbook/gui/component/e-book-shell-view-private.c @@ -227,11 +227,11 @@ book_shell_view_activate_selected_source (EBookShellView *book_shell_view, G_CALLBACK (selection_change), book_shell_view); book = e_book_new (source, NULL); + view = E_ADDRESSBOOK_VIEW (widget); if (book != NULL) - addressbook_load (book, book_open_cb, widget); + addressbook_load (book, book_open_cb, view); - view = E_ADDRESSBOOK_VIEW (widget); model = e_addressbook_view_get_model (view); g_signal_connect_swapped ( @@ -444,8 +444,8 @@ e_book_shell_view_private_constructed (EBookShellView *book_shell_view) book_shell_view); e_book_shell_view_actions_init (book_shell_view); - e_book_shell_view_update_search_filter (book_shell_view); book_shell_view_activate_selected_source (book_shell_view, selector); + e_book_shell_view_update_search_filter (book_shell_view); } void diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h index 8cdd03125f..f0250a5687 100644 --- a/addressbook/gui/component/e-book-shell-view-private.h +++ b/addressbook/gui/component/e-book-shell-view-private.h @@ -75,7 +75,7 @@ struct _EditorUidClosure { /* List these in the order to be displayed. * Positive values are reserved for categories. */ enum { - CONTACT_FILTER_ANY_CATEGORY + CONTACT_FILTER_ANY_CATEGORY = -1 }; /* List these in the order to be displayed. */ diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c index 8e6d87abc7..d6fe16c0d3 100644 --- a/addressbook/gui/component/e-book-shell-view.c +++ b/addressbook/gui/component/e-book-shell-view.c @@ -151,6 +151,7 @@ book_shell_view_class_init (EBookShellViewClass *class, shell_view_class->icon_name = "x-office-address-book"; shell_view_class->ui_definition = "evolution-contacts.ui"; shell_view_class->search_options = "/contact-search-options"; + shell_view_class->search_rules = "addresstypes.xml"; shell_view_class->type_module = type_module; shell_view_class->new_shell_content = e_book_shell_content_new; shell_view_class->new_shell_sidebar = e_book_shell_sidebar_new; |