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

- One more D-Bus signal fix (bug #212763).

Browse Source
This commit is contained in:
Tim Waugh 2006-11-06 16:07:22 +00:00
parent bd63485e00
commit 4a4ac22dc3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cups-eggcups.patch
View File

@ -28,7 +28,7 @@
dnl New default port definition for IPP... dnl New default port definition for IPP...
--- cups-1.2.5/scheduler/subscriptions.c.eggcups 2006-09-29 03:26:29.000000000 +0100 --- cups-1.2.5/scheduler/subscriptions.c.eggcups 2006-09-29 03:26:29.000000000 +0100
+++ cups-1.2.5/scheduler/subscriptions.c 2006-11-03 09:59:16.000000000 +0000 +++ cups-1.2.5/scheduler/subscriptions.c 2006-11-03 09:59:16.000000000 +0000
@@ -1321,13 +1321,14 @@ @@ -1321,13 +1321,13 @@
what = "PrinterAdded"; what = "PrinterAdded";
else if (event & CUPSD_EVENT_PRINTER_DELETED) else if (event & CUPSD_EVENT_PRINTER_DELETED)
what = "PrinterRemoved"; what = "PrinterRemoved";
@ -37,16 +37,14 @@
else if (event & CUPSD_EVENT_JOB_CREATED) else if (event & CUPSD_EVENT_JOB_CREATED)
what = "JobQueuedLocal"; what = "JobQueuedLocal";
else if ((event & CUPSD_EVENT_JOB_STATE) && job && else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
- job->state_value == IPP_JOB_PROCESSING) job->state_value == IPP_JOB_PROCESSING)
+ job->state_value == IPP_JOB_PROCESSING &&
+ dest && !strncmp (dest->device_uri, "ipp:", 4))
what = "JobStartedLocal"; what = "JobStartedLocal";
+ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED)) + else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED))
+ what = "QueueChanged"; + what = "QueueChanged";
else else
return; return;
@@ -1363,7 +1364,7 @@ @@ -1363,7 +1363,7 @@
dbus_message_append_iter_init(message, &iter); dbus_message_append_iter_init(message, &iter);
if (dest) if (dest)
dbus_message_iter_append_string(&iter, &(dest->name)); dbus_message_iter_append_string(&iter, &(dest->name));

5
cups.spec
View File

@ -6,7 +6,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.5 Version: 1.2.5
Release: 6%{?dist} Release: 7%{?dist}
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -426,6 +426,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Mon Nov 6 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.5-7
- One more D-Bus signal fix (bug #212763).
* Fri Nov 3 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.5-6 * Fri Nov 3 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.5-6
- Restore missed JobQueuedRemote D-Bus signal in ipp backend (part of - Restore missed JobQueuedRemote D-Bus signal in ipp backend (part of
bug #212763). bug #212763).