[evolution-data-server/gnome-40] alarm-notify: Focus window on status icon click when shown

[Milan Crha <mcrha src gnome org>]

commit fb84aef0efe1d872c566dd5bc0536f1e01a3c7ae
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jul 23 11:35:52 2021 +0200

    alarm-notify: Focus window on status icon click when shown
    
    When the Reminders window is shown, but not focused, rather focus it,
    than hide it.

 src/services/evolution-alarm-notify/e-alarm-notify.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/src/services/evolution-alarm-notify/e-alarm-notify.c 
b/src/services/evolution-alarm-notify/e-alarm-notify.c
index 7b9ce0b3b..5c9b479f9 100644
--- a/src/services/evolution-alarm-notify/e-alarm-notify.c
+++ b/src/services/evolution-alarm-notify/e-alarm-notify.c
@@ -741,7 +741,8 @@ e_alarm_notify_status_icon_activated_cb (GtkStatusIcon *status_icon,
 
        g_return_if_fail (E_IS_ALARM_NOTIFY (an));
 
-       if (gtk_widget_get_visible (an->priv->window))
+       if (gtk_widget_get_visible (an->priv->window) &&
+           gtk_window_is_active (GTK_WINDOW (an->priv->window)))
                gtk_widget_set_visible (an->priv->window, FALSE);
        else
                e_alarm_notify_show_window (an, TRUE);