- Better media-empty-error state handling: always set the state.
This commit is contained in:
parent
2107213173
commit
af255be3fc
@ -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;
|
||||
}
|
||||
|
@ -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 @@ fi
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Thu Apr 5 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-5
|
||||
- Better media-empty-error state handling: always set the state.
|
||||
|
||||
* Wed Apr 4 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-4
|
||||
- Clear the media-empty-error printer state.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user