gnome-keyring r1421 - in trunk: . daemon po

[kelemeng svn gnome org]

Author: kelemeng
Date: Sun Jan  4 20:38:13 2009
New Revision: 1421
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1421&view=rev

Log:
2009-01-04  Gabor Kelemen  <kelemeng gnome hu>

	* configure.in:
	* daemon/gnome-keyring-daemon.desktop.in: (removed)
	* daemon/gnome-keyring-daemon.desktop.in.in: (added)
	* daemon/Makefile.am:
	* po/POTFILES.in:
	Make .desktop file translatable. Fixes bug #566280.

Added:
   trunk/daemon/gnome-keyring-daemon.desktop.in.in
Removed:
   trunk/daemon/gnome-keyring-daemon.desktop.in
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/daemon/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan  4 20:38:13 2009
@@ -491,7 +491,7 @@
 common/Makefile
 common/tests/Makefile
 daemon/Makefile
-daemon/gnome-keyring-daemon.desktop
+daemon/gnome-keyring-daemon.desktop.in
 daemon/data/Makefile
 daemon/keyrings/Makefile
 daemon/keyrings/tests/Makefile

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Sun Jan  4 20:38:13 2009
@@ -53,11 +53,11 @@
 
 EXTRA_DIST = \
 	org.gnome.keyring.service.in \
-	gnome-keyring-daemon.desktop.in
+	$(desktop_in_files)
 
 CLEANFILES = \
 	org.gnome.keyring.service \
-	gnome-keyring-daemon.desktop
+	$(desktop_DATA)
 
 servicedir       = $(DBUS_SERVICES_DIR)
 service_in_files = org.gnome.keyring.service.in
@@ -66,5 +66,8 @@
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@
 
+desktop_in_files = gnome-keyring-daemon.desktop.in
 desktopdir       = $(datadir)/gnome/autostart
-desktop_DATA = gnome-keyring-daemon.desktop
+desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@

Added: trunk/daemon/gnome-keyring-daemon.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/daemon/gnome-keyring-daemon.desktop.in.in	Sun Jan  4 20:38:13 2009
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Keyring Daemon
+Exec=gnome-keyring-daemon --start
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Jan  4 20:38:13 2009
@@ -3,6 +3,7 @@
 common/gkr-location.c
 daemon/gkr-daemon-ops.c
 daemon/data/gnome-keyring.schemas.in
+daemon/gnome-keyring-daemon.desktop.in.in
 daemon/keyrings/gkr-keyring-login.c
 daemon/keyrings/gkr-keyring.c
 daemon/pk/gkr-pk-import.c