From 15a574976ee0605dc617dabbb197b6740e51b810 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 13 Jun 2021 08:02:06 -0400
Subject: [PATCH] listitemwidget: Match activation conditions

Make the conditions used for activation in the single-
and double-click case properly match, so that it is
obvious that we won't trigger both of them.
---
 gtk/gtklistitemwidget.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gtk/gtklistitemwidget.c b/gtk/gtklistitemwidget.c
index 09ac15d1bf..348c0e0e67 100644
--- a/gtk/gtklistitemwidget.c
+++ b/gtk/gtklistitemwidget.c
@@ -356,14 +356,16 @@ gtk_list_item_widget_click_gesture_released (GtkGestureClick   *gesture,
 {
   GtkListItemWidgetPrivate *priv = gtk_list_item_widget_get_instance_private (self);
 
-  if (priv->single_click_activate)
+  if (!priv->list_item || priv->list_item->activatable)
     {
-      gtk_widget_activate_action (GTK_WIDGET (self),
-                                  "list.activate-item",
-                                  "u",
-                                  priv->position);
-
-      return;
+      if (n_press == 1 && priv->single_click_activate)
+        {
+          gtk_widget_activate_action (GTK_WIDGET (self),
+                                      "list.activate-item",
+                                      "u",
+                                      priv->position);
+          return;
+        }
     }
 
   if (!priv->list_item || priv->list_item->selectable)