[mutter/wayland] Move session to x11/
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] Move session to x11/
- Date: Wed, 19 Mar 2014 02:07:58 +0000 (UTC)
commit 5fa5ace5e6023932399de1c7ec471f09c870cf7b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 18 22:02:47 2014 -0400
Move session to x11/
XSMP code is X11-specific, of course.
src/Makefile.am | 4 ++--
src/core/main.c | 3 ++-
src/core/window.c | 2 +-
src/{core => x11}/session.c | 0
src/{core => x11}/session.h | 0
5 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 972fb27..9130aec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,8 +144,6 @@ libmutter_wayland_la_SOURCES = \
core/screen-private.h \
meta/screen.h \
meta/types.h \
- core/session.c \
- core/session.h \
core/stack.c \
core/stack.h \
core/stack-tracker.c \
@@ -182,6 +180,8 @@ libmutter_wayland_la_SOURCES = \
x11/group-props.h \
x11/group.c \
x11/group.h \
+ x11/session.c \
+ x11/session.h \
x11/window-props.c \
x11/window-props.h \
x11/window-x11.c \
diff --git a/src/core/main.c b/src/core/main.c
index df87ea2..d4a8ac3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -50,7 +50,6 @@
#include "display-private.h"
#include <meta/errors.h>
#include "ui.h"
-#include "session.h"
#include <meta/prefs.h>
#include <meta/compositor.h>
@@ -78,6 +77,8 @@
#include <girepository.h>
#endif
+#include "x11/session.h"
+
#include "wayland/meta-wayland.h"
/*
diff --git a/src/core/window.c b/src/core/window.c
index 36a5857..caef907 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -38,7 +38,6 @@
#include "keybindings-private.h"
#include "ui.h"
#include "place.h"
-#include "session.h"
#include <meta/prefs.h>
#include "resizepopup.h"
#include "constraints.h"
@@ -60,6 +59,7 @@
#include "x11/window-props.h"
#include "x11/xprops.h"
#include "x11/group.h"
+#include "x11/session.h"
#include "wayland/meta-wayland-private.h"
diff --git a/src/core/session.c b/src/x11/session.c
similarity index 100%
rename from src/core/session.c
rename to src/x11/session.c
diff --git a/src/core/session.h b/src/x11/session.h
similarity index 100%
rename from src/core/session.h
rename to src/x11/session.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]