From b3c1ec1c84b26d1cf70b009eb3312d12cec622b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 12 May 2011 11:28:06 +0200
Subject: Making the desktop translatable

---
 data/extra-sessions/Makefile.am                   | 18 ++++++++++++++----
 data/extra-sessions/classic-desktop.desktop.in    |  4 ----
 data/extra-sessions/classic-desktop.desktop.in.in |  6 ++++++
 3 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 data/extra-sessions/classic-desktop.desktop.in
 create mode 100644 data/extra-sessions/classic-desktop.desktop.in.in

(limited to 'data/extra-sessions')

diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am
index 2a157ad..e6b81a8 100644
--- a/data/extra-sessions/Makefile.am
+++ b/data/extra-sessions/Makefile.am
@@ -1,14 +1,24 @@
 
-extra_guests_desktop_in_files = \
-	classic-desktop.desktop.in
+###################################
+# The files that are actually here
+###################################
+
+extra_guests_desktop_in_in_files = \
+	classic-desktop.desktop.in.in
 extra_guests_sh_files = \
 	classic-desktop.sh
 
+###################################
+# Rules to make things work
+###################################
+
 extra_guestsdir = $(datadir)/indicators/session/applications/
 extra_guests_desktop_files = \
-	$(extra_guests_desktop_in_files:.desktop.in=.desktop)
+	$(extra_guests_desktop_in_in_files:.desktop.in.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
 
-%.desktop: %.desktop.in
+%.desktop.in: %.desktop.in.in
 	sed -e "s|\@guestdir\@|$(extra_guestsdir)|" $< > $@
 
 extra_guests_DATA = \
diff --git a/data/extra-sessions/classic-desktop.desktop.in b/data/extra-sessions/classic-desktop.desktop.in
deleted file mode 100644
index fad4516..0000000
--- a/data/extra-sessions/classic-desktop.desktop.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Classic Guest Session
-Exec=@guestdir@/test.sh
-Type=Application
diff --git a/data/extra-sessions/classic-desktop.desktop.in.in b/data/extra-sessions/classic-desktop.desktop.in.in
new file mode 100644
index 0000000..d7ca3da
--- /dev/null
+++ b/data/extra-sessions/classic-desktop.desktop.in.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Version=1.0
+_Name=Classic Guest Session
+_Comment=Start a guest session using the classic desktop
+Exec=@guestdir@/test.sh
+Type=Application
-- 
cgit v1.2.3