From 56ed0bf00118b23dfd21c0d834987ef8408e4d38 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 16 Oct 2020 10:11:37 -0300
Subject: [PATCH] clutter: Remove pick mode from context

It is not used anywhere now.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1509
---
 clutter/clutter/clutter-main.c    | 8 --------
 clutter/clutter/clutter-private.h | 3 ---
 clutter/clutter/clutter-stage.c   | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 0a21d1f25..c258f676d 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -2311,14 +2311,6 @@ _clutter_clear_events_queue (void)
     }
 }
 
-ClutterPickMode
-_clutter_context_get_pick_mode (void)
-{
-  ClutterMainContext *context = _clutter_context_get_default ();
-
-  return context->pick_mode;
-}
-
 /**
  * clutter_add_debug_flags: (skip)
  *
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index cc310edb2..08a8c3f8c 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -127,8 +127,6 @@ struct _ClutterMainContext
    * ordered from least recently added to most recently added */
   GList *event_filters;
 
-  ClutterPickMode  pick_mode;
-
   /* default FPS; this is only used if we cannot sync to vblank */
   guint frame_rate;
 
@@ -176,7 +174,6 @@ ClutterMainContext *    _clutter_context_get_default                    (void);
 void                    _clutter_context_lock                           (void);
 void                    _clutter_context_unlock                         (void);
 gboolean                _clutter_context_is_initialized                 (void);
-ClutterPickMode         _clutter_context_get_pick_mode                  (void);
 gboolean                _clutter_context_get_show_fps                   (void);
 
 gboolean      _clutter_feature_init (GError **error);
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 7df016dfa..1b3e9ad97 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1391,12 +1391,9 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
                                 ClutterPickMode   mode,
                                 ClutterStageView *view)
 {
-  ClutterMainContext *context = _clutter_context_get_default ();
   ClutterStagePrivate *priv = stage->priv;
   int i;
 
-  g_assert (context->pick_mode == CLUTTER_PICK_NONE);
-
   COGL_TRACE_BEGIN_SCOPED (ClutterStagePickView, "Pick (view)");
 
   if (mode != priv->cached_pick_mode)
@@ -1407,10 +1404,8 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
 
       pick_context = clutter_pick_context_new_for_view (view, mode);
 
-      context->pick_mode = mode;
       priv->cached_pick_mode = CLUTTER_PICK_NONE;
       clutter_actor_pick (CLUTTER_ACTOR (stage), pick_context);
-      context->pick_mode = CLUTTER_PICK_NONE;
       priv->cached_pick_mode = mode;
 
       clutter_pick_context_destroy (pick_context);