rpms/gnome-speech/devel gnome-speech-0.4.18-dont-fail.patch, NONE, 1.1 gnome-speech.spec, 1.47, 1.48

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-speech/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23521

Modified Files:
	gnome-speech.spec 
Added Files:
	gnome-speech-0.4.18-dont-fail.patch 
Log Message:
- Don't crash in a normal failure case


gnome-speech-0.4.18-dont-fail.patch:

--- NEW FILE gnome-speech-0.4.18-dont-fail.patch ---
diff -up gnome-speech-0.4.18/gnome-speech/speaker.c.dont-fail gnome-speech-0.4.18/gnome-speech/speaker.c
--- gnome-speech-0.4.18/gnome-speech/speaker.c.dont-fail	2008-04-17 14:02:05.000000000 -0400
+++ gnome-speech-0.4.18/gnome-speech/speaker.c	2008-04-17 14:02:11.000000000 -0400
@@ -188,8 +188,11 @@ impl_getParameterValueDescription (Porta
   
 	g_return_val_if_fail (s, NULL);
 	priv = find_parameter (s, name);
-	g_return_val_if_fail (priv, NULL);
-	g_return_val_if_fail (priv->value_descriptions, NULL);
+
+	if (priv == NULL || priv->value_descriptions == NULL) {
+                return NULL;
+        }
+
 	for (tmp = priv->value_descriptions; tmp; tmp = tmp->next)
 	{
 		d = (ValueDescription *) tmp->data;
@@ -368,8 +371,11 @@ speaker_set_parameter (Speaker *s,
 	ParameterPrivate *priv;
 
 	priv = find_parameter (s, name);
-	g_return_val_if_fail (priv, FALSE);
-	g_return_val_if_fail (priv->set_func, FALSE);
+
+        if (priv == NULL || priv->set_func == NULL) {
+                return FALSE;
+        }
+
 	if (value >= priv->min && value <= priv->max) {
 		priv->current = value;
 		s->parameter_refresh = TRUE;


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-speech.spec	19 Feb 2008 00:27:28 -0000	1.47
+++ gnome-speech.spec	17 Apr 2008 18:39:45 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.4.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -14,6 +14,7 @@
 BuildRequires: libbonobo-devel
 BuildRequires: espeak-devel
 Patch1: gnome-speech-0.3.5-no-gnome-common.patch
+Patch2: gnome-speech-0.4.18-dont-fail.patch
 Requires: festival >= 1.96-0.11
 
 %description
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .no-gnome-common
+%patch2 -p1 -b .dont-fail
 
 %build
 autoreconf -f -i
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Thu Apr 17 2008  Ray Strode <rstrode at redhat.com> - 0.4.18-3
+- Don't crash in a normal failure case
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.18-2
 - Autorebuild for GCC 4.3