From 9463d0b6c995c0a333c0d15718f6c29801b1ff3d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 03 2011 13:05:20 +0000
Subject: Don't crash when unable to connect to D-Bus.


---

diff --git a/cups-icc.patch b/cups-icc.patch
index 04a839d..6b829fa 100644
--- a/cups-icc.patch
+++ b/cups-icc.patch
@@ -8,9 +8,9 @@
  		listen.o \
  		job.o \
  		log.o \
---- b/scheduler/colord.c
-+++ cups-1.4.6/scheduler/colord.c	2011-05-24 12:47:19.698093377 +0100
-@@ -0,0 +1,684 @@
+--- cups-1.4.6/scheduler/colord.c	2011-05-24 12:47:19.698093377 +0100
++++ cups-1.4.6/scheduler/colord.c	2011-06-03 14:01:22.780205436 +0100
+@@ -0,0 +1,688 @@
 +/*
 + * "$Id$"
 + *
@@ -528,6 +528,8 @@
 +  */
 +
 +  colordStart();
++  if (con == NULL)
++    return;
 +
 + /*
 +  * Try opening the PPD file for this printer...
@@ -681,6 +683,8 @@
 +  */
 +
 +  colordStart();
++  if (con == NULL)
++    return;
 +
 + /*
 +  * Just delete the device itself, and leave the profiles registered
diff --git a/cups.spec b/cups.spec
index e46af38..ad37641 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -617,6 +617,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Jun  3 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-19
+- Don't crash when unable to connect to D-Bus.
+
 * Fri Jun 03 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.6-18
 - Set the default RIPCache to 128m (STR #3535, bug #549901).