From acd57a8d7d0e9502a9ff24e288f806559024eb57 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Oct 2021 18:12:08 +0200 Subject: [PATCH] I#1649 - Unable to clear search Correct signal ordering, aka save the state before executing the search, thus when some part loads the search it's the new one, not the previous search. Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1649 --- src/shell/e-shell-searchbar.c | 2 +- src/shell/e-shell-view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shell/e-shell-searchbar.c b/src/shell/e-shell-searchbar.c index 2b7e6ac4c3..9bbc96ea4f 100644 --- a/src/shell/e-shell-searchbar.c +++ b/src/shell/e-shell-searchbar.c @@ -688,7 +688,7 @@ shell_searchbar_constructed (GObject *object) shell_view, "custom-search", G_CALLBACK (shell_searchbar_custom_search_cb), searchbar); - g_signal_connect_after ( + g_signal_connect ( shell_view, "execute-search", G_CALLBACK (shell_searchbar_execute_search_cb), searchbar); diff --git a/src/shell/e-shell-view.c b/src/shell/e-shell-view.c index 63025b1f69..a038e27b7c 100644 --- a/src/shell/e-shell-view.c +++ b/src/shell/e-shell-view.c @@ -1068,7 +1068,7 @@ e_shell_view_class_init (EShellViewClass *class) signals[EXECUTE_SEARCH] = g_signal_new ( "execute-search", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EShellViewClass, execute_search), NULL, NULL, g_cclosure_marshal_VOID__VOID,