rpms/desktop-printing/FC-6 eggcups-cancel-remote-job.patch, NONE, 1.1 desktop-printing.spec, 1.71, 1.72

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	desktop-printing.spec 
Added Files:
	eggcups-cancel-remote-job.patch 
Log Message:
fix remote job cancellation


eggcups-cancel-remote-job.patch:
 ec-job-list.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eggcups-cancel-remote-job.patch ---
--- eggcups-0.19/ec-job-list.c~	2005-06-23 02:17:32.000000000 +0100
+++ eggcups-0.19/ec-job-list.c	2006-12-08 16:49:42.000000000 +0000
@@ -538,7 +538,7 @@
 			queue = gnome_cups_queue_get (job_data->printer);
 			
 			error = NULL;
-			gnome_cups_queue_cancel_job (queue, job_data->job->id, 
+			gnome_cups_queue_cancel_job (queue, job_data->local_jobid, 
 						     &error);
 			
 			if (error) {


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/FC-6/desktop-printing.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- desktop-printing.spec	8 Nov 2006 18:27:08 -0000	1.71
+++ desktop-printing.spec	9 Dec 2006 03:04:31 -0000	1.72
@@ -6,7 +6,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 17.0.1%{?dist}
+Release: 18%{?dist}
 License: GPL
 Group: Applications/File
 # total lie
@@ -21,6 +21,7 @@
 Patch6: desktop-printing-0.19-crash.patch
 Patch7: eggcups-cups12.patch
 Patch8: eggcups-api-name.patch
+Patch9: eggcups-cancel-remote-job.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -56,6 +57,7 @@
 %patch6 -p2 -b .crash
 %patch7 -p1 -b .cups12
 %patch8 -p1 -b .api-name
+%patch9 -p1 -b .cancel-remote-job
 popd
 
 %build
@@ -109,6 +111,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Fri Dec  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-18
+- Fix remote job cancellation (#218945)
+
 * Wed Nov  8 2006 Tim Waugh <twaugh at redhat.com> - 0.19-17.0.1
 - Fixed HAL printer interface API name (bug #214619).