[icedtea-web] RFC: fix icon names for desktop entries

Thu Nov 18 15:26:52 PST 2010

* Omair Majid <omajid at redhat.com> [2010-11-18 16:13]:
> On 11/08/2010 10:36 AM, Omair Majid wrote:
> >Hi,
> >
> >The attached patch removes file extensions from the icon names used in
> >desktop entries. As the algorithm in the Icon Theme Specification [1]
> >implies, icon names should not have extensions if they are not absolute
> >paths.
> >
> 
> I am attaching an updated patch. The desktop files in icedtea-web
> have a number of issues:
> 
> The Icon entries in all desktop files contain the icon extension.
> According to the Desktop Entry Specification [1] unless the icon is
> an absolute path, the algorithm in Icon Theme Specification [2] is
> to be used. This algorithm expects the Icon to be a name without any
> extensions. The patch removes the extension from all icons.
> 
> The Encoding tag in desktop entries is deprecated [1]. This patch
> removes it.
> 
> The desktop entry for IcedTea Web Start (and not the desktop file
> created by netx for JNLP applications) uses the path /usr/bin/javaws
> incorrectly. As described in the Mime Action (un)specification [3],
> a desktop file is used to figure out mime type associations
> (javaws.desktop contains a MimeType= line). Applications like
> Firefox use this to decide that "IcedTea Web Start" (the name
> described by this desktop file) should be used to run files of mime
> type appliaction/x-java-jnlp-file. javaws.desktop sets
> Exec=/usr/bin/javaws %f which means that that default javaws is used
> to run it even if the user specifically selects "IcedTea Web Start"
> from the application. The patch fixes this too. Note that the
> javaws.desktop file is not directly visible to the user; it is not
> installed in any application menus. The user can, however,
> indirectly see it (for example the javaws.desktop file is used if
> you use nautilus and right click a file and select open with->other
> applications), so an Icon is still needed.
> 
> ChangeLog
> 2010-11-18  Omair Majid  <omajid at redhat.com>
> 
>    * Makefile.am (EXTRA_DIST): Replace javaws.desktop with
>    javaws.desktop.in. (all-local): Add javaws.desktop. (clean-local):
>    Add dependency on clean-desktop-files. (.PHONY) Add clean-desktop-
>    files. (clean-desktop-files): New target. (javaws.desktop): New
>    target. Fix the Exec= line in Makefile.am to create the
>    javaws.desktop file.
>    * javaws.desktop: Renamed to...
>    * javaws.desktop.in: New file. Does not contain Encoding key. Value
>    for Icon does not contain extension.
>    * netx/net/sourceforge/jnlp/util/XDesktopEntry.java
>    (JAVA_ICON_NAME): Set to the icon name without the extension.
> 
> Any thoughts or comments?
> 

Looks fine to me. OK for head!

Cheers,
Deepak

> Thanks,
> Omair
> 
> [1] http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
> [2] http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
> [3] http://www.freedesktop.org/wiki/Specifications/mime-actions-spec

> diff -r 44d47c366e5f Makefile.am
> --- a/Makefile.am	Wed Nov 10 16:24:53 2010 -0500
> +++ b/Makefile.am	Fri Nov 12 09:28:32 2010 -0500
> @@ -66,17 +66,19 @@
>  	-Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lc -lz
>  PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
>  
> -EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop extra launcher
> +EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher
>  
>  # Top-Level Targets
>  # =================
>  
> -all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws
> +all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \
> + javaws.desktop
>  
> -clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory clean-native-ecj
> +clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
> + clean-native-ecj clean-desktop-files
>  
>  .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
> - clean-bootstrap-directory clean-native-ecj
> + clean-bootstrap-directory clean-native-ecj clean-desktop-files
>  
>  install-exec-local:
>  	mkdir -p $(DESTDIR)$(bindir)
> @@ -246,6 +248,9 @@
>  	rm -f netx-source-files.txt
>  	rm -f stamps/netx.stamp
>  
> +clean-desktop-files:
> +	rm -f javaws.desktop
> +
>  # extras -- used to create about.jar for javaws.
>  extra-source-files.txt:
>  	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
> @@ -276,6 +281,9 @@
>  	mkdir -p launcher
>  	$(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
>  
> +javaws.desktop: javaws.desktop.in
> +	sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < javaws.desktop.in > javaws.desktop
> +
>  # plugin tests
>  
>  if ENABLE_PLUGIN
> diff -r 44d47c366e5f javaws.desktop
> --- a/javaws.desktop	Wed Nov 10 16:24:53 2010 -0500
> +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
> @@ -1,11 +0,0 @@
> -[Desktop Entry]
> -Encoding=UTF-8
> -Name=IcedTea Web Start
> -Comment=IcedTea Application Launcher
> -Exec=/usr/bin/javaws %f
> -Icon=javaws.png
> -Terminal=false
> -Type=Application
> -NoDisplay=true
> -Categories=Network;WebBrowser;
> -MimeType=application/x-java-jnlp-file;
> diff -r 44d47c366e5f javaws.desktop.in
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/javaws.desktop.in	Fri Nov 12 09:28:32 2010 -0500
> @@ -0,0 +1,10 @@
> +[Desktop Entry]
> +Name=IcedTea Web Start
> +Comment=IcedTea Application Launcher
> +Exec=PATH_TO_JAVAWS %f
> +Icon=javaws
> +Terminal=false
> +Type=Application
> +NoDisplay=true
> +Categories=Network;WebBrowser;
> +MimeType=application/x-java-jnlp-file;
> diff -r 44d47c366e5f netx/net/sourceforge/jnlp/util/XDesktopEntry.java
> --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Wed Nov 10 16:24:53 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Fri Nov 12 09:28:32 2010 -0500
> @@ -46,7 +46,7 @@
>   */
>  public class XDesktopEntry {
>  
> -    public static final String JAVA_ICON_NAME = "java.png";
> +    public static final String JAVA_ICON_NAME = "java";
>  
>      private JNLPFile file = null;
>      private int iconSize = -1;