From ce61c8dc61c4250b9b6b6dd5806fa47c8eca4f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 28 Aug 2023 16:49:48 +0200
Subject: [PATCH] eis: Don't expose global socket

How EIS will be used depends on its context, meaning we'll have multiple
EIS contexts that expose different things. To prepare for this remove
the global socket since that won't work with multiple contexts.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3228>
---
 src/backends/meta-eis.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/backends/meta-eis.c b/src/backends/meta-eis.c
index 12b385f07..e6b35610b 100644
--- a/src/backends/meta-eis.c
+++ b/src/backends/meta-eis.c
@@ -243,48 +243,19 @@ meta_eis_add_client_get_fd (MetaEis *eis)
   return eis_backend_fd_add_client (eis->eis);
 }
 
-static int
-try_and_find_free_eis_socket (MetaEis *eis)
-{
-  int rc;
-  int n;
-  char socketname[16];
-
-  for (n = 0; n < 100; n++)
-    {
-      g_snprintf (socketname, sizeof (socketname), "eis-%d", n);
-      rc = eis_setup_backend_socket (eis->eis, socketname);
-      if (rc == 0)
-        {
-          g_info ("Using EIS socket: %s", socketname);
-          return 0;
-        }
-    }
-
-  return rc;
-}
-
 MetaEis *
 meta_eis_new (MetaBackend *backend)
 {
   MetaEis *eis;
   int fd;
-  int rc;
 
   eis = g_object_new (META_TYPE_EIS, NULL);
   eis->backend = backend;
 
   eis->eis = eis_new (eis);
-  rc = try_and_find_free_eis_socket (eis);
-  if (rc != 0)
-    {
-      g_warning ("Failed to initialize the EIS socket: %s", g_strerror (-rc));
-      g_clear_pointer (&eis->eis, eis_unref);
-      return NULL;
-    }
-
   eis_log_set_handler (eis->eis, eis_logger);
   eis_log_set_priority (eis->eis, EIS_LOG_PRIORITY_DEBUG);
+  eis_setup_backend_fd (eis->eis);
 
   fd = eis_get_fd (eis->eis);
   eis->event_source = meta_event_source_new (eis, fd, &eis_event_funcs);