[gnome-panel/gnome-3-8] Add session description for Flashback mode with Compiz

[Philipp Kaluza <phk src gnome org>]

commit 03f0c9a73a06ce6a26356185ab92c49eeaa021b2
Author: Dmitry Shachnev <mitya57 gmail com>
Date:   Wed Nov 27 18:47:55 2013 +0400

    Add session description for Flashback mode with Compiz
    
    This is _not_ a supported mode for Gnome Flashback.
    We don't install these session files by default.
    
    These files are here only as a convenience for our downstream Ubuntu,
    to make it easier to collect translations for this session description.
    
    Signed-off-by: Philipp Kaluza <floss ghostroute eu>

 data/Makefile.am                               |   11 ++++++-----
 data/gnome-flashback-compiz.desktop.in.in      |    7 +++++++
 data/gnome-flashback-compiz.session.desktop.in |    3 +++
 po/POTFILES.in                                 |    2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 95c9670..3458bfc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,15 +31,16 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-flashback.session.desktop.in
-session_DATA = $(session_in_files:.session.desktop.in=.session)
+session_in_files = gnome-flashback.session.desktop.in gnome-flashback-compiz.session.desktop.in
+session_DATA = gnome-flashback.session
 
 xsessiondir = $(datadir)/xsessions
-xsession_in_in_files = gnome-fallback.desktop.in.in
-xsession_in_files = gnome-fallback.desktop.in
+xsession_in_in_files = gnome-fallback.desktop.in.in gnome-flashback-compiz.desktop.in.in
+xsession_in_files = gnome-fallback.desktop.in gnome-flashback-compiz.desktop.in
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
-%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C 
$(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+%.session: %.session.desktop.in
+       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
 %.desktop.in: %.desktop.in.in
        $(AM_V_GEN)sed -e 's,[ ]libexecdir[@],$(libexecdir),g' <$< >$@
diff --git a/data/gnome-flashback-compiz.desktop.in.in b/data/gnome-flashback-compiz.desktop.in.in
new file mode 100644
index 0000000..d43a39d
--- /dev/null
+++ b/data/gnome-flashback-compiz.desktop.in.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=GNOME Flashback (Compiz)
+_Comment=This session logs you into GNOME with Compiz window-manager and the traditional panel
+Exec= libexecdir@/gnome-session-flashback --session=gnome-flashback-compiz
+TryExec= libexecdir@/gnome-session-flashback
+Icon=
+Type=Application
diff --git a/data/gnome-flashback-compiz.session.desktop.in b/data/gnome-flashback-compiz.session.desktop.in
new file mode 100644
index 0000000..6ecaa6d
--- /dev/null
+++ b/data/gnome-flashback-compiz.session.desktop.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=GNOME Flashback (Compiz)
+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;compiz;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9784acd..51de3dc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,7 +24,9 @@ applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
 data/gnome-fallback.desktop.in.in
+data/gnome-flashback-compiz.desktop.in.in
 data/gnome-flashback.session.desktop.in
+data/gnome-flashback-compiz.session.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in