devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=914a85159be2244e541b7f44f16ea4c7e4f3aca5
commit 914a85159be2244e541b7f44f16ea4c7e4f3aca5
Author: Christopher Michael <devilho...@comcast.net>
Date: Mon Mar 1 11:22:58 2021 -0500
ecore_wl2: Remove legacy teamwork stuff
This patch removes the remainder of the Teamwork protocol &
implementation. The module has been removed from Enlightenment for
some time now so there is no need to generate a protocol or have any
legacy code remaining..
---
src/lib/ecore_wl2/ecore_wl2_display.c | 6 ------
src/lib/ecore_wl2/ecore_wl2_private.h | 4 ----
src/wayland_protocol/meson.build | 3 +--
src/wayland_protocol/teamwork.xml | 39 -----------------------------------
4 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index efaa25363c..7a0e20cf31 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -326,12 +326,6 @@ _cb_global_add(void *data, struct wl_registry *registry,
unsigned int id, const
EINA_INLIST_FOREACH(ewd->windows, window)
if (window->surface)
efl_aux_hints_get_supported_aux_hints(ewd->wl.efl_aux_hints, window->surface);
}
- else if (!strcmp(interface, "zwp_teamwork"))
- {
- ewd->wl.teamwork =
- wl_registry_bind(registry, id,
- &zwp_teamwork_interface, EFL_TEAMWORK_VERSION);
- }
else if (!strcmp(interface, "wl_output"))
_ecore_wl2_output_add(ewd, id);
else if (!strcmp(interface, "wl_seat"))
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 0a662e7884..c374c67857 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -7,9 +7,6 @@
# include <xkbcommon/xkbcommon-compose.h>
# include "ecore_wl2_internal.h"
-# define EFL_TEAMWORK_VERSION 2
-# include "teamwork-client-protocol.h"
-
# include "session-recovery-client-protocol.h"
# include "xdg-shell-client-protocol.h"
@@ -92,7 +89,6 @@ struct _Ecore_Wl2_Display
struct xdg_wm_base *xdg_wm_base;
struct zwp_e_session_recovery *session_recovery;
struct efl_aux_hints *efl_aux_hints;
- struct zwp_teamwork *teamwork;
struct efl_hints *efl_hints;
int compositor_version;
} wl;
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 652dfd551d..3749e5d91b 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -7,8 +7,7 @@ wayland_client = dependency('wayland-client')
wl_protocol_local = [
'efl-aux-hints.xml',
'efl-hints.xml',
- 'session-recovery.xml',
- 'teamwork.xml'
+ 'session-recovery.xml'
]
wl_unstable_protocol_sys = [
diff --git a/src/wayland_protocol/teamwork.xml
b/src/wayland_protocol/teamwork.xml
deleted file mode 100644
index 99e2f33dfa..0000000000
--- a/src/wayland_protocol/teamwork.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<protocol name="teamwork">
-
- <interface name="zwp_teamwork" version="2">
- <request name="preload_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- </request>
- <request name="activate_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- <arg name="x" type="fixed" summary="surface local coords"/>
- <arg name="y" type="fixed" summary="surface local coords"/>
- </request>
- <request name="deactivate_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- </request>
- <request name="open_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- </request>
-
- <event name="fetching_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- </event>
- <event name="completed_uri">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- <arg name="valid" type="int" summary="1 if uri can be displayed, else
0"/>
- </event>
- <event name="fetch_info">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="uri" type="string"/>
- <arg name="progress" type="uint" summary="percentage of download"/>
- </event>
- </interface>
-
-</protocol>
--
