rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Catch D-Bus exceptions in fax dialog (bug #645316).

Browse Source
This commit is contained in:
Tim Waugh 2010-12-13 16:47:39 +00:00
parent be4daf8d8d
commit 3e7f8d1653
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hplip-dbus-exception.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up hplip-3.10.9/ui4/sendfaxdialog.py~ hplip-3.10.9/ui4/sendfaxdialog.py
--- hplip-3.10.9/ui4/sendfaxdialog.py~ 2010-09-26 18:07:19.000000000 +0100
+++ hplip-3.10.9/ui4/sendfaxdialog.py 2010-12-13 16:44:56.857648866 +0000
@@ -915,8 +915,12 @@ class SendFaxDialog(QDialog, Ui_Dialog):
def CheckTimer_timeout(self):
if not self.busy:
#log.debug("Checking for incoming faxes...")
- device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \
- self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id)
+ try:
+ device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \
+ self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id)
+ except Exception, e:
+ log.debug("Exception caught: %s" % e)
+ fax_file = None
if fax_file:
self.last_job_id = 0

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.10.9 Version: 3.10.9
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -43,6 +43,7 @@ Patch26: hplip-UnicodeDecodeError.patch
Patch27: hplip-emit-SIGNAL.patch Patch27: hplip-emit-SIGNAL.patch
Patch28: hplip-fab-root-crash.patch Patch28: hplip-fab-root-crash.patch
Patch29: hplip-addprinter.patch Patch29: hplip-addprinter.patch
Patch30: hplip-dbus-exception.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -272,6 +273,9 @@ done
# that we can get an authentication callback (bug #538352). # that we can get an authentication callback (bug #538352).
%patch29 -p1 -b .addprinter %patch29 -p1 -b .addprinter
# Catch D-Bus exceptions in fax dialog (bug #645316).
%patch30 -p1 -b .dbus-exception
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -498,6 +502,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Mon Dec 13 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-9
- Catch D-Bus exceptions in fax dialog (bug #645316).
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-8 * Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-8
- Corrected IEEE 1284 Device IDs: - Corrected IEEE 1284 Device IDs:
HP Color LaserJet CP2025dn (bug #651509). HP Color LaserJet CP2025dn (bug #651509).