34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From 78f20627ac8f3387d0b4751d8bf66ce85676f8f4 Mon Sep 17 00:00:00 2001
|
||
|
From: Neil Roberts <neil@linux.intel.com>
|
||
|
Date: Thu, 4 Jul 2013 13:32:14 +0100
|
||
|
Subject: [PATCH 2/2] wayland: Don't pass the shell and compositor down to Cogl
|
||
|
|
||
|
The Wayland 1.0 API allows orthoganal components of an application to
|
||
|
query the shell and compositor themselves by querying their own
|
||
|
wl_registry. The corresponding API in Cogl has been removed so Clutter
|
||
|
shouldn't call it anymore.
|
||
|
|
||
|
https://bugzilla.gnome.org/show_bug.cgi?id=703878
|
||
|
---
|
||
|
clutter/wayland/clutter-backend-wayland.c | 4 ----
|
||
|
1 file changed, 4 deletions(-)
|
||
|
|
||
|
diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c
|
||
|
index 610df50..bebfcd2 100644
|
||
|
--- a/clutter/wayland/clutter-backend-wayland.c
|
||
|
+++ b/clutter/wayland/clutter-backend-wayland.c
|
||
|
@@ -244,10 +244,6 @@ clutter_backend_wayland_get_renderer (ClutterBackend *backend,
|
||
|
|
||
|
cogl_wayland_renderer_set_foreign_display (renderer,
|
||
|
backend_wayland->wayland_display);
|
||
|
- cogl_wayland_renderer_set_foreign_compositor (renderer,
|
||
|
- backend_wayland->wayland_compositor);
|
||
|
- cogl_wayland_renderer_set_foreign_shell (renderer,
|
||
|
- backend_wayland->wayland_shell);
|
||
|
|
||
|
return renderer;
|
||
|
}
|
||
|
--
|
||
|
1.8.3.1
|
||
|
|