Fixed "CUPS Web Interface" button (bug #633899).

This commit is contained in:
Tim Waugh 2011-01-12 11:51:31 +00:00
parent e8263fa526
commit 317df7f152
2 changed files with 29 additions and 0 deletions

24
hplip-cups-web.patch Normal file
View File

@ -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):

View File

@ -48,6 +48,7 @@ Patch31: hplip-hpaio-segfault.patch
Patch32: hplip-newline.patch Patch32: hplip-newline.patch
Patch33: hplip-dbus-threads.patch Patch33: hplip-dbus-threads.patch
Patch34: hplip-notification-exception.patch Patch34: hplip-notification-exception.patch
Patch35: hplip-cups-web.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -293,6 +294,9 @@ done
# Catch GError exception when notification showing failed (bug #665577). # Catch GError exception when notification showing failed (bug #665577).
%patch34 -p1 -b .notification-exception %patch34 -p1 -b .notification-exception
# Fixed "CUPS Web Interface" button (bug #633899).
%patch35 -p1 -b .cups-web
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
@ -520,6 +524,7 @@ fi
%changelog %changelog
* Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-11 * 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. - Set mimedir explicitly via configure.
* Wed Jan 05 2011 Jiri Popelka <jpopelka@redhat.com> 3.10.9-10 * Wed Jan 05 2011 Jiri Popelka <jpopelka@redhat.com> 3.10.9-10