Skip to content

Commit 2e02ea8

Browse files
[Wayland] Remove deprecated and obsolete protocols (#729)
* remove gtk-primary-selection protocol It's replaced by the standard primary-selection-v1 protocol * remove wl-shell protocol It's deprecated for a long time and replaced by xdg-shell * remove deprecated gtk-text-input protocol This protocol is deprecated, removed from GTK 3 & 4 and replaced by the text-input-unstable-v3 * remove deprecated xdg-shel-unstable-v6 protocol This protocol is obsolete and replaced by the xdg-shell stable --------- Co-authored-by: Michael Webster <[email protected]>
1 parent f6fb565 commit 2e02ea8

25 files changed

+10
-4961
lines changed

clutter/clutter/cally/cally-actor.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ struct _CallyActor
8989
/**
9090
* CallyActorClass:
9191
* @notify_clutter: Signal handler for notify signal on Clutter actor
92-
* @focus_clutter: Signal handler for key-focus-in and key-focus-out
93-
* signal on Clutter actor. This virtual functions is deprecated.
9492
* @add_actor: Signal handler for actor-added signal on
9593
* ClutterContainer interface
9694
* @remove_actor: Signal handler for actor-added signal on
@@ -110,9 +108,6 @@ struct _CallyActorClass
110108
void (*notify_clutter) (GObject *object,
111109
GParamSpec *pspec);
112110

113-
gboolean (*focus_clutter) (ClutterActor *actor,
114-
gpointer data);
115-
116111
gint (*add_actor) (ClutterActor *container,
117112
ClutterActor *actor,
118113
gpointer data);

src/core/window-private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ struct _MetaWindow
518518
* For X11 windows, this matches XGetGeometry of the toplevel.
519519
*
520520
* For Wayland windows, the position matches the position of the
521-
* surface associated with shell surface (wl_shell_surface, xdg_surface
522-
* etc). The size matches the size surface size as displayed in the stage.
521+
* surface associated with shell surface (xdg_surface etc).
522+
* The size matches the size surface size as displayed in the stage.
523523
*/
524524
MetaRectangle buffer_rect;
525525

src/meson.build

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -500,20 +500,14 @@ if have_wayland
500500
'wayland/meta-wayland-data-device.h',
501501
'wayland/meta-wayland-data-device-primary.c',
502502
'wayland/meta-wayland-data-device-primary.h',
503-
'wayland/meta-wayland-data-device-primary-legacy.c',
504-
'wayland/meta-wayland-data-device-primary-legacy.h',
505503
'wayland/meta-wayland-data-offer.c',
506504
'wayland/meta-wayland-data-offer.h',
507505
'wayland/meta-wayland-data-offer-primary.c',
508506
'wayland/meta-wayland-data-offer-primary.h',
509-
'wayland/meta-wayland-data-offer-primary-legacy.c',
510-
'wayland/meta-wayland-data-offer-primary-legacy.h',
511507
'wayland/meta-wayland-data-source.c',
512508
'wayland/meta-wayland-data-source.h',
513509
'wayland/meta-wayland-data-source-primary.c',
514510
'wayland/meta-wayland-data-source-primary.h',
515-
'wayland/meta-wayland-data-source-primary-legacy.c',
516-
'wayland/meta-wayland-data-source-primary-legacy.h',
517511
'wayland/meta-wayland-dma-buf.c',
518512
'wayland/meta-wayland-dma-buf.h',
519513
'wayland/meta-wayland-dnd-surface.c',
@@ -531,8 +525,6 @@ if have_wayland
531525
'wayland/meta-wayland-keyboard.h',
532526
'wayland/meta-wayland-legacy-xdg-foreign.c',
533527
'wayland/meta-wayland-legacy-xdg-foreign.h',
534-
'wayland/meta-wayland-legacy-xdg-shell.c',
535-
'wayland/meta-wayland-legacy-xdg-shell.h',
536528
'wayland/meta-wayland-outputs.c',
537529
'wayland/meta-wayland-outputs.h',
538530
'wayland/meta-wayland-pointer.c',
@@ -578,8 +570,6 @@ if have_wayland
578570
'wayland/meta-wayland-tablet-tool.h',
579571
'wayland/meta-wayland-text-input.c',
580572
'wayland/meta-wayland-text-input.h',
581-
'wayland/meta-wayland-text-input-legacy.c',
582-
'wayland/meta-wayland-text-input-legacy.h',
583573
'wayland/meta-wayland-touch.c',
584574
'wayland/meta-wayland-touch.h',
585575
'wayland/meta-wayland-types.h',
@@ -588,8 +578,6 @@ if have_wayland
588578
'wayland/meta-wayland-viewporter.h',
589579
'wayland/meta-wayland-window-configuration.c',
590580
'wayland/meta-wayland-window-configuration.h',
591-
'wayland/meta-wayland-wl-shell.c',
592-
'wayland/meta-wayland-wl-shell.h',
593581
'wayland/meta-wayland-xdg-foreign.c',
594582
'wayland/meta-wayland-xdg-foreign.h',
595583
'wayland/meta-wayland-xdg-foreign-private.h',
@@ -804,9 +792,7 @@ if have_wayland
804792
# - protocol stability ('private', 'stable' or 'unstable')
805793
# - protocol version (if stability is 'unstable')
806794
wayland_protocols = [
807-
['gtk-primary-selection', 'private', ],
808795
['gtk-shell', 'private', ],
809-
['gtk-text-input', 'private', ],
810796
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
811797
['linux-dmabuf', 'unstable', 'v1', ],
812798
['pointer-constraints', 'unstable', 'v1', ],
@@ -819,7 +805,6 @@ if have_wayland
819805
['xdg-foreign', 'unstable', 'v1', ],
820806
['xdg-foreign', 'unstable', 'v2', ],
821807
['xdg-output', 'unstable', 'v1', ],
822-
['xdg-shell', 'unstable', 'v6', ],
823808
['xdg-shell', 'stable', ],
824809
['xwayland-keyboard-grab', 'unstable', 'v1', ],
825810
]

0 commit comments

Comments
 (0)