[gnome-session] data: merge wayland and X11 session files



commit 88584e96f306aea22c79e1fd770aebf0eaed7b0e
Author: Ray Strode <rstrode redhat com>
Date:   Mon Nov 9 10:41:52 2015 -0500

    data: merge wayland and X11 session files
    
    The files are basically identical now, so just merge them
    together.

 data/Makefile.am                         |    4 ++--
 data/gnome-wayland.desktop.in            |    8 --------
 data/gnome-wayland.session.desktop.in.in |    3 ---
 po/POTFILES.in                           |    2 --
 4 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d1d8d25..18ef42e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,11 +21,11 @@ endif
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
 wayland_sessiondir = $(datadir)/wayland-sessions
-wayland_session_in_files = gnome-wayland.desktop.in
+wayland_session_in_files = gnome.desktop.in
 wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in 
gnome-wayland.session.desktop.in.in
+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
 session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
 session_DATA = $(session_in_files:.session.desktop.in=.session)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a887ec..593a962 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,6 @@ data/gnome-custom-session.desktop.in
 data/gnome.desktop.in
 data/gnome-dummy.session.desktop.in.in
 data/gnome.session.desktop.in.in
-data/gnome-wayland.desktop.in
-data/gnome-wayland.session.desktop.in.in
 [type: gettext/glade]data/session-selector.ui
 [type: gettext/glade]data/session-properties.ui
 gnome-session/gsm-fail-whale-dialog.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]