rpms/hplip/devel hplip-media-empty.patch, 1.1, 1.2 hplip.spec, 1.115, 1.116

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18383

Modified Files:
	hplip-media-empty.patch hplip.spec 
Log Message:
* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5
- Better media-empty-error state handling: always set the state.


hplip-media-empty.patch:
 hp.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: hplip-media-empty.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-media-empty.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-media-empty.patch	4 Apr 2007 17:18:42 -0000	1.1
+++ hplip-media-empty.patch	5 Apr 2007 15:39:29 -0000	1.2
@@ -1,11 +1,33 @@
---- hplip-1.7.2/backend/hp/hp.c.media-empty	2007-04-04 18:14:12.000000000 +0100
-+++ hplip-1.7.2/backend/hp/hp.c	2007-04-04 18:15:01.000000000 +0100
+--- hplip-1.7.2/backend/hp/hp.c.media-empty	2006-12-14 18:15:44.000000000 +0000
++++ hplip-1.7.2/backend/hp/hp.c	2007-04-05 15:45:20.000000000 +0100
 @@ -410,7 +410,7 @@
     int len, vstatus, cnt;
     char buf[HPLIP_BUFFER_SIZE+HPLIP_HEADER_SIZE];
     HplipMsgAttributes ma;
 -   int paperout=0, offline=0;
-+   int paperout=1, offline=1;
++   int paperout = -1, offline = -1;
  
     if (argc > 1)
     {
+@@ -544,17 +544,17 @@
+                switch (vstatus)
+                {
+                   case VSTATUS_OOPA:
+-                     if (!paperout)
++                     if (paperout != 1)
+                      {
+                         fputs("STATE: +media-empty-error\n", stderr);
+-                        paperout=1;
++                        paperout = 1;
+                      }
+                      break;
+                   default:
+-                     if (!offline)
++                     if (offline != 1)
+                      {
+                         fputs("STATE: +other\n", stderr);
+-                        offline=1;
++                        offline = 1;
+                      }
+                      break;
+                }


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- hplip.spec	4 Apr 2007 17:18:42 -0000	1.115
+++ hplip.spec	5 Apr 2007 15:39:29 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -251,6 +251,9 @@
 exit 0
 
 %changelog
+* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5
+- Better media-empty-error state handling: always set the state.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
 - Clear the media-empty-error printer state.