diff --git a/hplip-notification-exception.patch b/hplip-notification-exception.patch index f0a7fb8..0143229 100644 --- a/hplip-notification-exception.patch +++ b/hplip-notification-exception.patch @@ -1,22 +1,14 @@ -diff -up hplip-3.10.9/ui4/systemtray.py.notification-exception hplip-3.10.9/ui4/systemtray.py ---- hplip-3.10.9/ui4/systemtray.py.notification-exception 2011-01-05 10:45:57.000000000 +0100 -+++ hplip-3.10.9/ui4/systemtray.py 2011-01-05 12:34:18.000000000 +0100 -@@ -27,6 +27,7 @@ import os - import signal - import os.path - import time -+import gobject - - - # Local -@@ -662,7 +663,10 @@ class SystemTrayApp(QApplication): +diff -up hplip-3.12.9/ui4/systemtray.py.notification-exception hplip-3.12.9/ui4/systemtray.py +--- hplip-3.12.9/ui4/systemtray.py.notification-exception 2012-09-24 14:11:44.764151285 +0200 ++++ hplip-3.12.9/ui4/systemtray.py 2012-09-24 14:11:45.574138763 +0200 +@@ -761,7 +761,10 @@ class SystemTrayApp(QApplication): else: n.set_timeout(TRAY_MESSAGE_DELAY) - n.show() + try: + n.show() -+ except gobject.GError: ++ except: + log.error("Failed to show notification!") else: # Use "standard" message bubbles diff --git a/hplip.spec b/hplip.spec index 947bf89..c4e258a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.12.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -532,6 +532,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon Sep 24 2012 Jiri Popelka 3.12.9-3 +- amend hplip-notification-exception.patch (bug #859543). + * Thu Sep 20 2012 Jiri Popelka 3.12.9-2 - Support IEEE 1284.4 protocol over USB (bug #858861).