rpms/desktop-printing/devel desktop-printing-0.19-crash.patch, NONE, 1.1 desktop-printing.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21773

Modified Files:
	desktop-printing.spec 
Added Files:
	desktop-printing-0.19-crash.patch 
Log Message:
avoid a crash


desktop-printing-0.19-crash.patch:
 ec-job-model.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE desktop-printing-0.19-crash.patch ---
--- desktop-printing-0.19/eggcups-0.19/ec-job-model.c.crash	2006-09-29 01:44:54.000000000 -0400
+++ desktop-printing-0.19/eggcups-0.19/ec-job-model.c	2006-09-29 01:45:04.000000000 -0400
@@ -305,7 +305,7 @@
 		return state;
 	case EC_JOB_STATE_FINAL:
 	case EC_JOB_STATE_FINAL_TIMEOUT:
-		g_assert_not_reached ();
+		return state;
 	}
 	return EC_JOB_STATE_FINAL;
 }


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- desktop-printing.spec	20 Sep 2006 04:42:27 -0000	1.66
+++ desktop-printing.spec	29 Sep 2006 05:44:23 -0000	1.67
@@ -6,7 +6,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPL
 Group: Applications/File
 # total lie
@@ -18,6 +18,7 @@
 Patch3: desktop-printing-0.19-dbus-deprecated.patch
 Patch4: desktop-printing-0.19-more-hal-lpadmin.patch
 Patch5: desktop-printing-0.19-transparent.patch
+Patch6: desktop-printing-0.19-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -50,6 +51,7 @@
 %patch3 -p2 -b .desktop-printing-0.19-dbus-deprecated.patch
 %patch4 -p2 -b .more-hal-lpadmin.patch
 %patch5 -p2 -b .transparent
+%patch6 -p1 -b .crash
 popd
 
 %build
@@ -103,6 +105,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Fri Sep 29 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-15
+- Avoid a crash (#208239)
+
 * Wed Sep 20 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-14
 - Support transparent panels (#207183)