Mercurial > hg > release > icedtea-web-1.5
changeset 44:5a9f55d67b50
fix Exec, Icon and Encoding in desktop entry files
2010-11-19 Omair Majid <omajid@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. Use the absolute path to javaws binary in the Exec= line 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 icon name without the extension.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Fri, 19 Nov 2010 10:35:27 -0500 |
parents | 88d31285a14b |
children | dd77da50a226 |
files | ChangeLog Makefile.am javaws.desktop javaws.desktop.in netx/net/sourceforge/jnlp/util/XDesktopEntry.java |
diffstat | 5 files changed, 37 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Nov 18 11:55:26 2010 -0500 +++ b/ChangeLog Fri Nov 19 10:35:27 2010 -0500 @@ -1,3 +1,17 @@ +2010-11-19 Omair Majid <omajid@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. Use the absolute path to javaws binary in the Exec= line 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 icon name without the extension. + 2010-11-18 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/SecurityDesc.java: Remove window banner
--- a/Makefile.am Thu Nov 18 11:55:26 2010 -0500 +++ b/Makefile.am Fri Nov 19 10:35:27 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
--- a/javaws.desktop Thu Nov 18 11:55:26 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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/javaws.desktop.in Fri Nov 19 10:35:27 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;
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Nov 18 11:55:26 2010 -0500 +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Fri Nov 19 10:35:27 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;