rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't crash when unable to connect to D-Bus.

Browse Source
This commit is contained in:
Tim Waugh 2011-06-03 14:03:01 +01:00
parent 019a41cd01
commit 9463d0b6c9
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cups-icc.patch
View File

@ -8,9 +8,9 @@
listen.o \ listen.o \
job.o \ job.o \
log.o \ log.o \
--- b/scheduler/colord.c --- cups-1.4.6/scheduler/colord.c 2011-05-24 12:47:19.698093377 +0100
+++ 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,684 @@ @@ -0,0 +1,688 @@
+/* +/*
+ * "$Id$" + * "$Id$"
+ * + *
@ -528,6 +528,8 @@
+ */ + */
+ +
+ colordStart(); + colordStart();
+ if (con == NULL)
+ return;
+ +
+ /* + /*
+ * Try opening the PPD file for this printer... + * Try opening the PPD file for this printer...
@ -681,6 +683,8 @@
+ */ + */
+ +
+ colordStart(); + colordStart();
+ if (con == NULL)
+ return;
+ +
+ /* + /*
+ * Just delete the device itself, and leave the profiles registered + * Just delete the device itself, and leave the profiles registered

5
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.6 Version: 1.4.6
Release: 18%{?dist} Release: 19%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 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 %{php_extdir}/phpcups.so
%changelog %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 * Fri Jun 03 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.6-18
- Set the default RIPCache to 128m (STR #3535, bug #549901). - Set the default RIPCache to 128m (STR #3535, bug #549901).