rpms/gdm/devel gdm-2.13.0.9-disable-sounds-completely.patch, NONE, 1.1 gdm.spec, 1.138, 1.139

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31303

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.13.0.9-disable-sounds-completely.patch 
Log Message:
- disable sounds completely when disabled in configuration file
 (upstream bug 333435)


gdm-2.13.0.9-disable-sounds-completely.patch:
 slave.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gdm-2.13.0.9-disable-sounds-completely.patch ---
Index: gdm2/daemon/slave.c
===================================================================
RCS file: /cvs/gnome/gdm2/daemon/slave.c,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- gdm2/daemon/slave.c	15 Feb 2006 20:40:41 -0000	1.318
+++ gdm2/daemon/slave.c	6 Mar 2006 21:40:26 -0000	1.319
@@ -2047,8 +2047,8 @@ gdm_slave_wait_for_login (void)
 			gdm_slave_greeter_ctl_no_ret (GDM_RESET, "");
 
 			/* Play sounds if specified for a failed login */
-			if (d->attached &&
-			    failuresound &&
+			if (d->attached && failuresound &&
+			    gdm_get_value_bool (GDM_KEY_SOUND_ON_LOGIN_FAILURE) &&
 			    ! play_login_sound (failuresound)) {
 				gdm_error (_("Login sound requested on non-local display or the play "
 					     "software cannot be run or the sound does not exist."));
@@ -2069,9 +2069,9 @@ gdm_slave_wait_for_login (void)
 
 	successsound = gdm_get_value_string (GDM_KEY_SOUND_ON_LOGIN_SUCCESS_FILE);
 	/* Play sounds if specified for a successful login */
-	if (login != NULL &&
+	if (login != NULL && successsound &&
+	    gdm_get_value_bool (GDM_KEY_SOUND_ON_LOGIN_SUCCESS) &&
 	    d->attached &&
-	    successsound &&
 	    ! play_login_sound (successsound)) {
 		gdm_error (_("Login sound requested on non-local display or the play software "
 			     "cannot be run or the sound does not exist."));


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gdm.spec	28 Feb 2006 15:38:45 -0000	1.138
+++ gdm.spec	6 Mar 2006 22:10:47 -0000	1.139
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.9
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -43,6 +43,7 @@
 Patch18: gdm-2.8.0.4-dont-call-xsm.patch
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
+Patch23: gdm-2.13.0.9-disable-sounds-completely.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -114,6 +115,7 @@
 %patch18 -p1 -b .dont-call-xsm
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
+%patch23 -p1 -b .disable-sounds-completely
 
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
@@ -307,6 +309,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Mar  6 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.9-2
+- disable sounds completely when disabled in configuration file
+ (upstream bug 333435)
+
 * Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.9-1
 - Update to 2.13.0.9
 - Use new %%post section, written by