[evolution/gnome-3-36] The "Address Book Map" menu item shown even when not compiled with it

[Milan Crha <mcrha src gnome org>]

commit 1a3c9ff6f1f4fd5e22df274a4375aea17b99b54e
Author: Milan Crha <mcrha redhat com>
Date:   Mon Mar 23 12:17:44 2020 +0100

    The "Address Book Map" menu item shown even when not compiled with it
    
    When Evolution is not compiled with the contact maps support the option
    should not be available.
    
    A reproducer:
    a) open Evolution in the Contacts view
    b) right-click an address book and see no "Address Book Map" option there
    c) switch to the Mail view and back to the Contacts view
    d) right-click the address book and see the "Address Book Map" option there

 src/modules/addressbook/e-book-shell-view-actions.c | 5 -----
 src/modules/addressbook/e-book-shell-view.c         | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/modules/addressbook/e-book-shell-view-actions.c 
b/src/modules/addressbook/e-book-shell-view-actions.c
index 133d25c8ca..b74d3bd39c 100644
--- a/src/modules/addressbook/e-book-shell-view-actions.c
+++ b/src/modules/addressbook/e-book-shell-view-actions.c
@@ -1488,11 +1488,6 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view)
           See also accum_address_map() in eab-contact-formatter.cpp.
        */
        gtk_action_set_visible (ACTION (CONTACT_PREVIEW_SHOW_MAPS), FALSE);
-
-#ifndef ENABLE_CONTACT_MAPS
-       gtk_action_set_visible (ACTION (ADDRESS_BOOK_MAP), FALSE);
-       gtk_action_set_visible (ACTION (ADDRESS_BOOK_POPUP_MAP), FALSE);
-#endif
 }
 
 void
diff --git a/src/modules/addressbook/e-book-shell-view.c b/src/modules/addressbook/e-book-shell-view.c
index 923fb9ff91..fb1f506b76 100644
--- a/src/modules/addressbook/e-book-shell-view.c
+++ b/src/modules/addressbook/e-book-shell-view.c
@@ -391,6 +391,11 @@ book_shell_view_update_actions (EShellView *shell_view)
        else
                label = _("_Send Message to Contact");
        gtk_action_set_label (action, label);
+
+#ifndef ENABLE_CONTACT_MAPS
+       gtk_action_set_visible (ACTION (ADDRESS_BOOK_MAP), FALSE);
+       gtk_action_set_visible (ACTION (ADDRESS_BOOK_POPUP_MAP), FALSE);
+#endif
 }
 
 static void