search

apple / cups

Apple CUPS Sources
https://www.cups.org
Apache License 2.0
1.95k stars 464 forks source link

cups.desktop file doesn't follow freedesktop spec #2924

Closed michaelrsweet closed 16 years ago

michaelrsweet commented 16 years ago

Version: 1.3.8 CUPS.org User: pacho

desktop-file-validate reports the following problems: cups.desktop: warning: value "Application;System;X-Red-Hat-Base;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application" cups.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated cups.desktop: warning: value "" for key "Path" in group "Desktop Entry" does not look like an absolute path cups.desktop: warning: key "TerminalOptions" in group "Desktop Entry" is deprecated

Path set to "" is an important issue as it prevent launch desktop entry from Desktop (with nautilus-2.22)

The attached patch fixes all this

michaelrsweet commented 16 years ago

CUPS.org User: mike

Considering...

michaelrsweet commented 16 years ago

CUPS.org User: mike

Fixed in Subversion repository.

I also fixed several other issues (locale encoding wasn't specified, adding printing categories, dropped KDE-specific keywords)

michaelrsweet commented 16 years ago

"cups-desktop.patch":

--- desktop/cups.desktop~ 2008-09-04 17:03:51.000000000 +0200 +++ desktop/cups.desktop 2008-09-04 17:03:51.000000000 +0200 @@ -1,14 +1,11 @@ [Desktop Entry] -Categories=Application;System;X-Red-Hat-Base; -Encoding=UTF-8 +Categories=System;X-Red-Hat-Base; Exec=htmlview http://localhost:631/ GenericName= Icon=cups MimeType= -Path= StartupNotify=false Terminal=false -TerminalOptions= Type=Application X-DCOP-ServiceType= X-KDE-SubstituteUID=false

michaelrsweet commented 16 years ago

"str2924.patch":

Index: desktop/cups.desktop.in

--- desktop/cups.desktop.in (revision 7908) +++ desktop/cups.desktop.in (working copy) @@ -1,41 +1,33 @@ [Desktop Entry] -Categories=Application;System;X-Red-Hat-Base; -Encoding=UTF-8 +Categories=System;Printing;HardwareSettings;X-Red-Hat-Base; 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 網頁介面 +Name[de.UTF-8]=Druckerverwaltung +Comment[de.UTF-8]=CUPS Webinterface +Name[en_US.UTF-8]=Manage Printing +Comment[en_US.UTF-8]=CUPS Web Interface +Name[es.UTF-8]=Administrar impresión +Comment[es.UTF-8]=Interfaz Web de CUPS +Name[et.UTF-8]=Trükkimise haldur +Comment[et.UTF-8]=CUPS-i veebiliides +Name[fr.UTF-8]=Gestionnaire d'impression +Comment[fr.UTF-8]=Interface Web de CUPS +Name[he.UTF-8]=נהל הדפסות +Comment[he.UTF-8]=ממשק דפדפן של CUPS +Name[id.UTF-8]=Manajemen Pencetakan +Comment[id.UTF-8]=Antarmuka Web CUPS +Name[it.UTF-8]=Gestione stampa +Comment[it.UTF-8]=Interfaccia web di CUPS +Name[ja.UTF-8]=印刷の管理 +Comment[ja.UTF-8]=CUPS Web インタフェース +Name[pl.UTF-8]=Zarządzanie drukowaniem +Comment[pl.UTF-8]=Interfejs WWW CUPS +Name[zh.UTF-8]=打印机管理 +Comment[zh.UTF-8]=CUPS网页界面 +Name[zh_TW.UTF-8]=印表管理 +Comment[zh_TW.UTF-8]=CUPS 網頁介面