Index: config-scripts/cups-common.m4
===================================================================
--- config-scripts/cups-common.m4	(revision 7832)
+++ config-scripts/cups-common.m4	(revision 7833)
@@ -51,6 +51,13 @@
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
+AC_PATH_PROG(XDGOPEN,xdg-open)
+if test "x$XDGOPEN" = x; then
+	CUPS_HTMLVIEW="htmlview"
+else
+	CUPS_HTMLVIEW="$XDGOPEN"
+fi
+AC_SUBST(CUPS_HTMLVIEW)
 
 AC_MSG_CHECKING(for install-sh script)
 INSTALL="`pwd`/install-sh -c"
Index: desktop/cups.desktop
===================================================================
--- desktop/cups.desktop	(revision 7832)
+++ desktop/cups.desktop	(revision 7833)
@@ -1,41 +0,0 @@
-[Desktop Entry]
-Categories=Application;System;X-Red-Hat-Base;
-Encoding=UTF-8
-Exec=htmlview http://localhost:631/
-GenericName=
-Icon=cups
-MimeType=
-Path=
-StartupNotify=false
-Terminal=false
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-Name=Manage Printing
-Comment=CUPS Web Interface
-Name[de]=Druckerverwaltung
-Comment[de]=CUPS Webinterface
-Name[en_US]=Manage Printing
-Comment[en_US]=CUPS Web Interface
-Name[es]=Administrar impresión
-Comment[es]=Interfaz Web de CUPS
-Name[et]=Trükkimise haldur
-Comment[et]=CUPS-i veebiliides
-Name[fr]=Gestionnaire d'impression
-Comment[fr]=Interface Web de CUPS
-Name[he]=נהל הדפסות
-Comment[he]=ממשק דפדפן של CUPS
-Name[id]=Manajemen Pencetakan
-Comment[id]=Antarmuka Web CUPS
-Name[it]=Gestione stampa
-Comment[it]=Interfaccia web di CUPS
-Name[ja]=印刷の管理
-Comment[ja]=CUPS Web インタフェース
-Name[pl]=Zarządzanie drukowaniem
-Comment[pl]=Interfejs WWW CUPS
-Name[zh]=打印机管理
-Comment[zh]=CUPS网页界面
-Name[zh_TW]=印表管理
-Comment[zh_TW]=CUPS 網頁介面
Index: desktop/cups.desktop.in
===================================================================
--- desktop/cups.desktop.in	(revision 0)
+++ desktop/cups.desktop.in	(revision 7833)
@@ -0,0 +1,41 @@
+[Desktop Entry]
+Categories=Application;System;X-Red-Hat-Base;
+Encoding=UTF-8
+Exec=@CUPS_HTMLVIEW@ http://localhost:631/
+GenericName=
+Icon=cups
+MimeType=
+Path=
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Name=Manage Printing
+Comment=CUPS Web Interface
+Name[de]=Druckerverwaltung
+Comment[de]=CUPS Webinterface
+Name[en_US]=Manage Printing
+Comment[en_US]=CUPS Web Interface
+Name[es]=Administrar impresión
+Comment[es]=Interfaz Web de CUPS
+Name[et]=Trükkimise haldur
+Comment[et]=CUPS-i veebiliides
+Name[fr]=Gestionnaire d'impression
+Comment[fr]=Interface Web de CUPS
+Name[he]=נהל הדפסות
+Comment[he]=ממשק דפדפן של CUPS
+Name[id]=Manajemen Pencetakan
+Comment[id]=Antarmuka Web CUPS
+Name[it]=Gestione stampa
+Comment[it]=Interfaccia web di CUPS
+Name[ja]=印刷の管理
+Comment[ja]=CUPS Web インタフェース
+Name[pl]=Zarządzanie drukowaniem
+Comment[pl]=Interfejs WWW CUPS
+Name[zh]=打印机管理
+Comment[zh]=CUPS网页界面
+Name[zh_TW]=印表管理
+Comment[zh_TW]=CUPS 網頁介面
Index: configure.in
===================================================================
--- configure.in	(revision 7832)
+++ configure.in	(revision 7833)
@@ -64,6 +64,7 @@
 
 AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
 	  conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
+	  desktop/cups.desktop
 	  doc/index.html doc/help/ref-cupsd-conf.html doc/help/standard.html
 	  init/org.cups.cups-lpd.plist init/cups.xml
 	  man/client.conf.man man/cups-deviced.man man/cups-driverd.man
Index: CHANGES.txt
===================================================================
--- CHANGES.txt	(revision 7832)
+++ CHANGES.txt	(revision 7833)
@@ -3,6 +3,9 @@
 
 CHANGES IN CUPS V1.4b1
 
+	- The CUPS web interface menu item now uses the xdg-open
+	  command, when available (STR #2724)
+	- The cups-lpd program now supports the -h option (STR #2794)
 	- The scheduler now sets the PAM_TTY parameter and the
 	  PAM_ESTABLISH_CRED credential flag (STR #2745)
 	- The scheduler now logs unsuccessful requests to the error_log
