[evolution/gnome-3-34] I#615 - Some actions are disabled in the top menu in error

[Milan Crha <mcrha src gnome org>]

commit 636af36d3b1d25594099191b3406f0252a4b48f9
Author: Milan Crha <mcrha redhat com>
Date:   Fri Sep 13 12:38:09 2019 +0200

    I#615 - Some actions are disabled in the top menu in error
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/615

 src/modules/addressbook/e-book-shell-view.c | 16 ++++++++++------
 src/modules/calendar/e-cal-shell-view.c     |  6 +++---
 src/modules/calendar/e-memo-shell-view.c    | 10 +++++-----
 src/modules/calendar/e-task-shell-view.c    | 10 +++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/src/modules/addressbook/e-book-shell-view.c b/src/modules/addressbook/e-book-shell-view.c
index 2671afd86d..923fb9ff91 100644
--- a/src/modules/addressbook/e-book-shell-view.c
+++ b/src/modules/addressbook/e-book-shell-view.c
@@ -284,22 +284,26 @@ book_shell_view_update_actions (EShellView *shell_view)
        any_contacts_selected =
                (single_contact_selected || multiple_contacts_selected);
 
+       action = ACTION (ADDRESS_BOOK_COPY);
+       sensitive = has_primary_source;
+       gtk_action_set_sensitive (action, sensitive);
+
        action = ACTION (ADDRESS_BOOK_MOVE);
-       sensitive = clicked_source_is_primary && source_is_editable;
+       sensitive = has_primary_source && source_is_editable;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_DELETE);
-       sensitive = clicked_source_is_primary && (
+       sensitive =
                primary_source_is_removable ||
-               primary_source_is_remote_deletable);
+               primary_source_is_remote_deletable;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_PRINT);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_PRINT_PREVIEW);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_PROPERTIES);
@@ -321,7 +325,7 @@ book_shell_view_update_actions (EShellView *shell_view)
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_SAVE_AS);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (ADDRESS_BOOK_POPUP_MAP);
diff --git a/src/modules/calendar/e-cal-shell-view.c b/src/modules/calendar/e-cal-shell-view.c
index 4d4b3e6d1c..c8f441cd40 100644
--- a/src/modules/calendar/e-cal-shell-view.c
+++ b/src/modules/calendar/e-cal-shell-view.c
@@ -361,13 +361,13 @@ cal_shell_view_update_actions (EShellView *shell_view)
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (CALENDAR_COPY);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (CALENDAR_DELETE);
-       sensitive = clicked_source_is_primary && (
+       sensitive =
                primary_source_is_removable ||
-               primary_source_is_remote_deletable);
+               primary_source_is_remote_deletable;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (CALENDAR_PRINT);
diff --git a/src/modules/calendar/e-memo-shell-view.c b/src/modules/calendar/e-memo-shell-view.c
index 1e27533d0f..c2e2a27d7d 100644
--- a/src/modules/calendar/e-memo-shell-view.c
+++ b/src/modules/calendar/e-memo-shell-view.c
@@ -238,21 +238,21 @@ memo_shell_view_update_actions (EShellView *shell_view)
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (MEMO_LIST_COPY);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (MEMO_LIST_DELETE);
-       sensitive = clicked_source_is_primary && (
+       sensitive =
                primary_source_is_removable ||
-               primary_source_is_remote_deletable);
+               primary_source_is_remote_deletable;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (MEMO_LIST_PRINT);
-       sensitive = clicked_source_is_primary;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (MEMO_LIST_PRINT_PREVIEW);
-       sensitive = clicked_source_is_primary;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (MEMO_LIST_PROPERTIES);
diff --git a/src/modules/calendar/e-task-shell-view.c b/src/modules/calendar/e-task-shell-view.c
index e88328cf6a..7be2909701 100644
--- a/src/modules/calendar/e-task-shell-view.c
+++ b/src/modules/calendar/e-task-shell-view.c
@@ -357,21 +357,21 @@ task_shell_view_update_actions (EShellView *shell_view)
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (TASK_LIST_COPY);
-       sensitive = clicked_source_is_primary && has_primary_source;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (TASK_LIST_DELETE);
-       sensitive = clicked_source_is_primary && (
+       sensitive =
                primary_source_is_removable ||
-               primary_source_is_remote_deletable);
+               primary_source_is_remote_deletable;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (TASK_LIST_PRINT);
-       sensitive = clicked_source_is_primary;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (TASK_LIST_PRINT_PREVIEW);
-       sensitive = clicked_source_is_primary;
+       sensitive = has_primary_source;
        gtk_action_set_sensitive (action, sensitive);
 
        action = ACTION (TASK_LIST_PROPERTIES);