gnome-session r4945 - in trunk: . po splash

[mccann svn gnome org]

Author: mccann
Date: Wed Aug 13 16:18:57 2008
New Revision: 4945
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4945&view=rev

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

	* splash/Makefile.am:
	* splash/gnome-login-sound.c:
	* splash/gnome-login-sound.desktop.in:
	* splash/gnome-logout-sound.sh:
	Remove gnome-login-sound.  It is superseded and
	improved upon by libcanberra-login-sound.



Removed:
   trunk/splash/gnome-login-sound.c
   trunk/splash/gnome-login-sound.desktop.in
   trunk/splash/gnome-logout-sound.sh
Modified:
   trunk/ChangeLog
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/splash/Makefile.am

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Aug 13 16:18:57 2008
@@ -21,5 +21,4 @@
 capplet/gsm-app-dialog.c
 capplet/gsm-properties-dialog.c
 tools/gnome-session-save.c
-splash/gnome-login-sound.c
 splash/gnome-session-splash.c

Modified: trunk/splash/Makefile.am
==============================================================================
--- trunk/splash/Makefile.am	(original)
+++ trunk/splash/Makefile.am	Wed Aug 13 16:18:57 2008
@@ -1,3 +1,5 @@
+NULL =
+
 INCLUDES =					\
 	-I$(top_srcdir)/egg			\
 	$(DBUS_GLIB_CFLAGS)			\
@@ -11,16 +13,12 @@
 helperdir = $(pkglibdir)/helpers
 helper_PROGRAMS =				\
 	gnome-session-splash			\
-	gnome-login-sound
-
-shutdowndir = $(datadir)/gnome/shutdown
-shutdown_SCRIPTS =				\
-	gnome-logout-sound.sh
+	$(NULL)
 
 default_sessiondir = $(datadir)/gnome/autostart
 default_session_DATA =				\
 	gnome-session-splash.desktop		\
-	gnome-login-sound.desktop
+	$(NULL)
 
 gnome_session_splash_SOURCES =			\
 	gnome-session-splash.c			\
@@ -31,9 +29,6 @@
 	$(DBUS_GLIB_LIBS)			\
 	$(LDADD)
 
-gnome_login_sound_SOURCES =			\
-	gnome-login-sound.c
-
 %.desktop: %.desktop.in
 	sed -e 's,\ helperdir\@,$(helperdir),' \
 		< $^ > $@
@@ -44,5 +39,4 @@
 EXTRA_DIST =					\
 	README					\
 	gnome-session-splash.desktop.in		\
-	gnome-login-sound.desktop.in		\
-	gnome-logout-sound.sh
+	$(NULL)
\ No newline at end of file