From 317df7f15286a2b0fb4f660fc4b970c494897e44 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 12 Jan 2011 11:51:31 +0000
Subject: [PATCH] Fixed "CUPS Web Interface" button (bug #633899).

---
 hplip-cups-web.patch | 24 ++++++++++++++++++++++++
 hplip.spec           |  5 +++++
 2 files changed, 29 insertions(+)
 create mode 100644 hplip-cups-web.patch

diff --git a/hplip-cups-web.patch b/hplip-cups-web.patch
new file mode 100644
index 0000000..3db2c73
--- /dev/null
+++ b/hplip-cups-web.patch
@@ -0,0 +1,24 @@
+diff -up hplip-3.10.9/ui4/nodevicesdialog.py.cups-web hplip-3.10.9/ui4/nodevicesdialog.py
+--- hplip-3.10.9/ui4/nodevicesdialog.py.cups-web	2011-01-12 11:48:50.743722601 +0000
++++ hplip-3.10.9/ui4/nodevicesdialog.py	2011-01-12 11:48:59.869475866 +0000
+@@ -71,7 +71,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevi
+ 
+     def CUPSButton_clicked(self):
+         self.close()
+-        utils.openURL("http://localhost:631/admin?op=add-printer")
++        utils.openURL("http://localhost:631/admin")
+ 
+ 
+     def CloseButton_clicked(self):
+diff -up hplip-3.10.9/ui/nodevicesform.py.cups-web hplip-3.10.9/ui/nodevicesform.py
+--- hplip-3.10.9/ui/nodevicesform.py.cups-web	2011-01-12 11:48:31.161230788 +0000
++++ hplip-3.10.9/ui/nodevicesform.py	2011-01-12 11:48:43.253920424 +0000
+@@ -43,7 +43,7 @@ class NoDevicesForm(NoDevicesForm_base):
+ 
+     def CUPSButton_clicked(self):
+         self.close()
+-        utils.openURL("http://localhost:631/admin?op=add-printer")
++        utils.openURL("http://localhost:631/admin")
+ 
+ 
+     def ExitButton_clicked(self):
diff --git a/hplip.spec b/hplip.spec
index 126c6b7..5a903fe 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -48,6 +48,7 @@ Patch31: hplip-hpaio-segfault.patch
 Patch32: hplip-newline.patch
 Patch33: hplip-dbus-threads.patch
 Patch34: hplip-notification-exception.patch
+Patch35: hplip-cups-web.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -293,6 +294,9 @@ done
 # Catch GError exception when notification showing failed (bug #665577).
 %patch34 -p1 -b .notification-exception
 
+# Fixed "CUPS Web Interface" button (bug #633899).
+%patch35 -p1 -b .cups-web
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -520,6 +524,7 @@ fi
 
 %changelog
 * Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-11
+- Fixed "CUPS Web Interface" button (bug #633899).
 - Set mimedir explicitly via configure.
 
 * Wed Jan 05 2011 Jiri Popelka <jpopelka@redhat.com> 3.10.9-10