[mutter] wayland: Remove a few unused fields from MetaWaylandCompositor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Remove a few unused fields from MetaWaylandCompositor
- Date: Thu, 10 Jul 2014 17:39:27 +0000 (UTC)
commit 817c6986a0848085cbbeff0bbb4cde83355cce7f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Jul 10 11:05:59 2014 -0400
wayland: Remove a few unused fields from MetaWaylandCompositor
src/wayland/meta-wayland-private.h | 2 --
src/wayland/meta-wayland.c | 11 ++++-------
2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 76f2f06..a43d92f 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -75,10 +75,8 @@ struct _MetaWaylandCompositor
{
struct wl_display *wayland_display;
char *display_name;
- struct wl_event_loop *wayland_loop;
ClutterActor *stage;
GHashTable *outputs;
- GSource *wayland_event_source;
struct wl_list frame_callbacks;
MetaXWaylandManager xwayland_manager;
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 705c8c1..43c2261 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -382,6 +382,7 @@ void
meta_wayland_init (void)
{
MetaWaylandCompositor *compositor = &_meta_wayland_compositor;
+ GSource *wayland_event_source;
memset (compositor, 0, sizeof (MetaWaylandCompositor));
@@ -400,10 +401,7 @@ meta_wayland_init (void)
compositor, compositor_bind))
g_error ("Failed to register wayland compositor object");
- compositor->wayland_loop =
- wl_display_get_event_loop (compositor->wayland_display);
- compositor->wayland_event_source =
- wayland_event_source_new (compositor->wayland_display);
+ wayland_event_source = wayland_event_source_new (compositor->wayland_display);
/* XXX: Here we are setting the wayland event source to have a
* slightly lower priority than the X event source, because we are
@@ -414,9 +412,8 @@ meta_wayland_init (void)
* At some point we could perhaps try and get the X protocol proxied
* over the wayland protocol so that we don't have to worry about
* synchronizing the two command streams. */
- g_source_set_priority (compositor->wayland_event_source,
- GDK_PRIORITY_EVENTS + 1);
- g_source_attach (compositor->wayland_event_source, NULL);
+ g_source_set_priority (wayland_event_source, GDK_PRIORITY_EVENTS + 1);
+ g_source_attach (wayland_event_source, NULL);
clutter_wayland_set_compositor_display (compositor->wayland_display);
meta_clutter_init ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]