gdm r6409 - in trunk: . data data/greeter-autostart gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Thu Aug 21 22:14:43 2008
New Revision: 6409
URL: http://svn.gnome.org/viewvc/gdm?rev=6409&view=rev

Log:
2008-08-21  William Jon McCann  <jmccann redhat com>

	* configure.ac:
	* data/Makefile.am:
	* data/greeter-autostart/Makefile.am:
	* data/greeter-autostart/gnome-power-manager.desktop.in.in:
	* data/greeter-autostart/gnome-settings-daemon.desktop.in.in:
	* gui/simple-greeter/Makefile.am:
	* gui/simple-greeter/at-spi-registryd-wrapper.desktop.in.in:
	* gui/simple-greeter/gdm-simple-greeter.desktop.in.in:
	Add some desktop files to populate the default greeter session.



Added:
   trunk/data/greeter-autostart/
   trunk/data/greeter-autostart/Makefile.am
   trunk/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in   (props changed)
      - copied unchanged from r6407, /trunk/gui/simple-greeter/at-spi-registryd-wrapper.desktop.in.in
   trunk/data/greeter-autostart/gdm-simple-greeter.desktop.in.in   (props changed)
      - copied unchanged from r6407, /trunk/gui/simple-greeter/gdm-simple-greeter.desktop.in.in
   trunk/data/greeter-autostart/gnome-power-manager.desktop.in.in
   trunk/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
Removed:
   trunk/gui/simple-greeter/at-spi-registryd-wrapper.desktop.in.in
   trunk/gui/simple-greeter/gdm-simple-greeter.desktop.in.in
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/gui/simple-greeter/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Aug 21 22:14:43 2008
@@ -1427,8 +1427,6 @@
 Makefile
 daemon/Makefile
 gui/Makefile
-gui/simple-greeter/gdm-simple-greeter.desktop.in
-gui/simple-greeter/at-spi-registryd-wrapper.desktop.in
 gui/simple-greeter/Makefile
 gui/simple-greeter/libnotificationarea/Makefile
 gui/simple-chooser/Makefile
@@ -1437,6 +1435,7 @@
 data/gdm.conf
 data/Makefile
 data/faces/Makefile
+data/greeter-autostart/Makefile
 data/pixmaps/Makefile
 data/pixmaps/16x16/Makefile
 data/pixmaps/32x32/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Aug 21 22:14:43 2008
@@ -1,8 +1,9 @@
 NULL =
 
-SUBDIRS =		\
-	faces 		\
-	pixmaps		\
+SUBDIRS =			\
+	faces 			\
+	greeter-autostart	\
+	pixmaps			\
 	$(NULL)
 
 initdir = $(gdmconfdir)/Init

Added: trunk/data/greeter-autostart/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/greeter-autostart/Makefile.am	Thu Aug 21 22:14:43 2008
@@ -0,0 +1,29 @@
+NULL =
+
+edit = sed \
+	-e 's|@SBINDIR[ ]|$(sbindir)|g' \
+	-e 's|@SYSCONFDIR[ ]|$(sysconfdir)|g' \
+	-e 's|@LIBDIR[ ]|$(libdir)|g' \
+	-e 's|@LIBEXECDIR[ ]|$(libexecdir)|g' \
+	-e 's|@LOCALSTATEDIR[ ]|$(localstatedir)|g'
+
+%.desktop.in: %.desktop.in.in Makefile
+	$(edit) $< >$@
+
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(pkgdatadir)/autostart/LoginWindow
+desktop_in_files = 	\
+	at-spi-registryd-wrapper.desktop.in	\
+	gdm-simple-greeter.desktop.in		\
+	gnome-power-manager.desktop.in		\
+	gnome-settings-daemon.desktop.in	\
+	$(NULL)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST = 			\
+	$(desktop_in_files)	\
+	$(NULL)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in

Added: trunk/data/greeter-autostart/gnome-power-manager.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/data/greeter-autostart/gnome-power-manager.desktop.in.in	Thu Aug 21 22:14:43 2008
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Power Manager
+_Comment=Power management daemon
+Icon=gnome-power-manager
+Exec=gnome-power-manager
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=GNOME;XFCE;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-power-manager
+X-GNOME-Bugzilla-Component=gnome-power-manager
+X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh

Added: trunk/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	Thu Aug 21 22:14:43 2008
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Settings Daemon
+Exec= LIBEXECDIR@/gnome-settings-daemon
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
\ No newline at end of file

Modified: trunk/gui/simple-greeter/Makefile.am
==============================================================================
--- trunk/gui/simple-greeter/Makefile.am	(original)
+++ trunk/gui/simple-greeter/Makefile.am	Thu Aug 21 22:14:43 2008
@@ -22,14 +22,6 @@
 	$(POLKIT_GNOME_CFLAGS)				\
 	$(NULL)
 
- INTLTOOL_DESKTOP_RULE@
-desktopdir = $(pkgdatadir)/autostart/LoginWindow
-desktop_in_files = 	\
-	at-spi-registryd-wrapper.desktop.in	\
-	gdm-simple-greeter.desktop.in		\
-	$(NULL)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 @INTLTOOL_SCHEMAS_RULE@
 
 schemasdir   = @GCONF_SCHEMA_FILE_DIR@
@@ -347,7 +339,6 @@
 	$(NULL)
 
 EXTRA_DIST = 			\
-	$(desktop_in_files)	\
 	$(schemas_in_files)	\
 	$(glade_DATA)		\
 	$(NULL)