GNOME.org
 

gnome-session r5050 - in trunk: . compat data po splash

Author: vuntz
Date: Wed Sep  3 23:20:23 2008
New Revision: 5050
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5050&view=rev

Log:
2008-09-04  Vincent Untz  <vuntz gnome org>

	* configure.in:
	* compat/Makefile.am:
	* compat/*.desktop.*:
	* data/Makefile.am:
	* data/gnome-wm.desktop.*:
	* data/session-properties.desktop.in.in:
	* po/POTFILES.in:
	* po/POTFILES.skip:
	* splash/Makefile.am:
	* splash/gnome-session-splash.desktop.*:
	Make all desktop files translatable. Add to rework a bit the build
	system for this.


Added:
   trunk/compat/at-spi-registryd-wrapper.desktop.in.in.in   (contents, props changed)
      - copied, changed from r5048, /trunk/compat/at-spi-registryd-wrapper.desktop.in
   trunk/compat/gnome-keyring-daemon-wrapper.desktop.in.in.in   (contents, props changed)
      - copied, changed from r5048, /trunk/compat/gnome-keyring-daemon-wrapper.desktop.in
   trunk/compat/gnome-settings-daemon-helper.desktop.in.in.in   (contents, props changed)
      - copied, changed from r5048, /trunk/compat/gnome-settings-daemon-helper.desktop.in
   trunk/data/gnome-wm.desktop.in.in   (contents, props changed)
      - copied, changed from r5048, /trunk/data/gnome-wm.desktop.in
   trunk/splash/gnome-session-splash.desktop.in.in.in   (contents, props changed)
      - copied, changed from r5048, /trunk/splash/gnome-session-splash.desktop.in
Removed:
   trunk/compat/at-spi-registryd-wrapper.desktop.in
   trunk/compat/gnome-keyring-daemon-wrapper.desktop.in
   trunk/compat/gnome-settings-daemon-helper.desktop.in
   trunk/data/gnome-wm.desktop.in
   trunk/splash/gnome-session-splash.desktop.in
Modified:
   trunk/ChangeLog
   trunk/compat/Makefile.am
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/data/session-properties.desktop.in.in
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/splash/Makefile.am

Modified: trunk/compat/Makefile.am
==============================================================================
--- trunk/compat/Makefile.am	(original)
+++ trunk/compat/Makefile.am	Wed Sep  3 23:20:23 2008
@@ -21,10 +21,12 @@
 	gnome-settings-daemon-helper
 
 default_sessiondir = $(datadir)/gnome/autostart
-default_session_DATA =				\
-	at-spi-registryd-wrapper.desktop	\
-	gnome-keyring-daemon-wrapper.desktop	\
-	gnome-settings-daemon-helper.desktop
+default_session_in_in_files = 				\
+	at-spi-registryd-wrapper.desktop.in.in	\
+	gnome-keyring-daemon-wrapper.desktop.in.in	\
+	gnome-settings-daemon-helper.desktop.in.in
+default_session_in_files = $(default_session_in_in_files:.desktop.in.in=.desktop.in)
+default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
 
 at_spi_registryd_wrapper_SOURCES =		\
 	at-spi-registryd-wrapper.c
@@ -42,15 +44,18 @@
 	$(GCONF_LIBS)				\
 	$(LDADD)
 
-%.desktop: %.desktop.in
+ INTLTOOL_DESKTOP_RULE@
+
+%.desktop.in: %.desktop.in.in Makefile.am
 	sed -e 's,\ helperdir\@,$(helperdir),' \
-		< $^ > $@
+		< $< > $@
+
+EXTRA_DIST =					\
+	README
 
 CLEANFILES =					\
-	$(default_session_DATA)
+	$(default_session_DATA)			\
+	$(default_session_in_files)
 
-EXTRA_DIST =					\
-	README					\
-	at-spi-registryd-wrapper.desktop.in	\
-	gnome-keyring-daemon-wrapper.desktop.in	\
-	gnome-settings-daemon-helper.desktop.in
+DISTCLEANFILES =					\
+	$(default_session_in_in_files)

Copied: trunk/compat/at-spi-registryd-wrapper.desktop.in.in.in (from r5048, /trunk/compat/at-spi-registryd-wrapper.desktop.in)
==============================================================================
--- /trunk/compat/at-spi-registryd-wrapper.desktop.in	(original)
+++ trunk/compat/at-spi-registryd-wrapper.desktop.in.in.in	Wed Sep  3 23:20:23 2008
@@ -1,7 +1,11 @@
 [Desktop Entry]
 Type=Application
-Name=AT SPI Registry Wrapper
+_Name=AT SPI Registry Wrapper
 Exec= helperdir@/at-spi-registryd-wrapper
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /desktop/gnome/interface/accessibility
 X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@

Copied: trunk/compat/gnome-keyring-daemon-wrapper.desktop.in.in.in (from r5048, /trunk/compat/gnome-keyring-daemon-wrapper.desktop.in)
==============================================================================
--- /trunk/compat/gnome-keyring-daemon-wrapper.desktop.in	(original)
+++ trunk/compat/gnome-keyring-daemon-wrapper.desktop.in.in.in	Wed Sep  3 23:20:23 2008
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Keyring Daemon Wrapper
+_Name=GNOME Keyring Daemon Wrapper
 Exec= helperdir@/gnome-keyring-daemon-wrapper
 OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=true
 X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@

Copied: trunk/compat/gnome-settings-daemon-helper.desktop.in.in.in (from r5048, /trunk/compat/gnome-settings-daemon-helper.desktop.in)
==============================================================================
--- /trunk/compat/gnome-settings-daemon-helper.desktop.in	(original)
+++ trunk/compat/gnome-settings-daemon-helper.desktop.in.in.in	Wed Sep  3 23:20:23 2008
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Settings Daemon Helper
+_Name=GNOME Settings Daemon Helper
 Exec= helperdir@/gnome-settings-daemon-helper
 OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Sep  3 23:20:23 2008
@@ -360,12 +360,11 @@
 
 AC_OUTPUT([
 Makefile
-compat/Makefile
-tools/Makefile
 capplet/Makefile
-gnome-session/Makefile
-egg/Makefile
-splash/Makefile
+compat/Makefile
+compat/at-spi-registryd-wrapper.desktop.in.in
+compat/gnome-keyring-daemon-wrapper.desktop.in.in
+compat/gnome-settings-daemon-helper.desktop.in.in
 doc/Makefile
 doc/dbus/Makefile
 doc/dbus/gnome-session.xml
@@ -373,6 +372,7 @@
 doc/man/gnome-session.1
 doc/man/default.session.5
 data/Makefile
+data/gnome-wm.desktop.in
 data/session-properties.desktop.in
 data/icons/Makefile
 data/icons/16x16/Makefile
@@ -380,6 +380,11 @@
 data/icons/24x24/Makefile
 data/icons/32x32/Makefile
 data/icons/scalable/Makefile
+egg/Makefile
+gnome-session/Makefile
+splash/Makefile
+splash/gnome-session-splash.desktop.in.in
+tools/Makefile
 po/Makefile.in
 ])
 

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Sep  3 23:20:23 2008
@@ -39,13 +39,15 @@
 
 EXTRA_DIST =					\
 	gnome-wm				\
-	session-properties.desktop.in		\
 	$(xsession_in_files)			\
 	$(schemas_in_files)			\
 	$(glade_DATA)				\
 	$(pixmap_DATA)
 
-DISTCLEANFILES =				\
+CLEANFILES =					\
 	$(schemas_DATA)				\
 	$(xsession_DATA)			\
 	$(settings_DATA)
+
+DISTCLEANFILES =				\
+	$(settings_in_files)

Copied: trunk/data/gnome-wm.desktop.in.in (from r5048, /trunk/data/gnome-wm.desktop.in)
==============================================================================
--- /trunk/data/gnome-wm.desktop.in	(original)
+++ trunk/data/gnome-wm.desktop.in.in	Wed Sep  3 23:20:23 2008
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Window Manager
+_Name=Window Manager
 Exec=gnome-wm
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-session
-X-GNOME-Bugzilla-Component=general
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@

Modified: trunk/data/session-properties.desktop.in.in
==============================================================================
--- trunk/data/session-properties.desktop.in.in	(original)
+++ trunk/data/session-properties.desktop.in.in	Wed Sep  3 23:20:23 2008
@@ -11,5 +11,5 @@
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-session
-X-GNOME-Bugzilla-Component=gnome-session
+X-GNOME-Bugzilla-Component=gnome-session-properties
 X-GNOME-Bugzilla-Version= VERSION@

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Sep  3 23:20:23 2008
@@ -1,11 +1,18 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+capplet/gsm-app-dialog.c
+capplet/gsm-properties-dialog.c
+capplet/main.c
 compat/at-spi-registryd-wrapper.c
-data/gnome-session.schemas.in
+compat/at-spi-registryd-wrapper.desktop.in.in.in
+compat/gnome-keyring-daemon-wrapper.desktop.in.in.in
+compat/gnome-settings-daemon-helper.desktop.in.in.in
 data/gnome.desktop.in
+data/gnome-session.schemas.in
+data/gnome-wm.desktop.in.in
+data/gsm-inhibit-dialog.glade
 data/session-properties.desktop.in.in
 data/session-properties.glade
-data/gsm-inhibit-dialog.glade
 egg/eggdesktopfile.c
 egg/eggsmclient-libgnomeui.c
 egg/eggsmclient.c
@@ -17,8 +24,6 @@
 gnome-session/gsm-xsmp-server.c
 gnome-session/gsm-util.c
 gnome-session/main.c
-capplet/main.c
-capplet/gsm-app-dialog.c
-capplet/gsm-properties-dialog.c
-tools/gnome-session-save.c
 splash/gnome-session-splash.c
+splash/gnome-session-splash.desktop.in.in.in
+tools/gnome-session-save.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Wed Sep  3 23:20:23 2008
@@ -1,4 +1,13 @@
 # List of source files containing translatable strings that should not be
 # translated.
 # Please keep this file sorted alphabetically.
+compat/at-spi-registryd-wrapper.desktop.in
+compat/at-spi-registryd-wrapper.desktop.in.in
+compat/gnome-keyring-daemon-wrapper.desktop.in
+compat/gnome-keyring-daemon-wrapper.desktop.in.in
+compat/gnome-settings-daemon-helper.desktop.in
+compat/gnome-settings-daemon-helper.desktop.in.in
+data/gnome-wm.desktop.in
 data/session-properties.desktop.in
+splash/gnome-session-splash.desktop.in
+splash/gnome-session-splash.desktop.in.in

Modified: trunk/splash/Makefile.am
==============================================================================
--- trunk/splash/Makefile.am	(original)
+++ trunk/splash/Makefile.am	Wed Sep  3 23:20:23 2008
@@ -16,9 +16,9 @@
 	$(NULL)
 
 default_sessiondir = $(datadir)/gnome/autostart
-default_session_DATA =				\
-	gnome-session-splash.desktop		\
-	$(NULL)
+default_session_in_in_files = gnome-session-splash.desktop.in.in
+default_session_in_files = $(default_session_in_in_files:.desktop.in.in=.desktop.in)
+default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
 
 gnome_session_splash_SOURCES =			\
 	gnome-session-splash.c			\
@@ -29,14 +29,19 @@
 	$(DBUS_GLIB_LIBS)			\
 	$(LDADD)
 
-%.desktop: %.desktop.in
-	sed -e 's,\ helperdir\@,$(helperdir),' \
-		< $^ > $@
+ INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES =					\
-	$(default_session_DATA)
+%.desktop.in: %.desktop.in.in Makefile.am
+	sed -e 's,\ helperdir\@,$(helperdir),' \
+		< $< > $@
 
 EXTRA_DIST =					\
 	README					\
-	gnome-session-splash.desktop.in		\
-	$(NULL)
\ No newline at end of file
+	$(NULL)
+
+CLEANFILES =					\
+	$(default_session_DATA)			\
+	$(default_session_in_files)
+
+DISTCLEANFILES =					\
+	$(default_session_in_in_files)

Copied: trunk/splash/gnome-session-splash.desktop.in.in.in (from r5048, /trunk/splash/gnome-session-splash.desktop.in)
==============================================================================
--- /trunk/splash/gnome-session-splash.desktop.in	(original)
+++ trunk/splash/gnome-session-splash.desktop.in.in.in	Wed Sep  3 23:20:23 2008
@@ -1,9 +1,13 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Splash Screen
+_Name=GNOME Splash Screen
 Exec= helperdir@/gnome-session-splash
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /apps/gnome-session/options/show_splash_screen
 X-GNOME-Autostart-Phase=Panel
 X-GNOME-Provides=splash
 X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]