[Xfce4-commits] <xfce-utils:master> Add desktop files for the applications in the Xfce menu.

[Nick Schermer]

Updating branch refs/heads/master
         to 8855dcfd9cdac58cb7617b24f6f4a71a532f7b61 (commit)
       from 5fc443bce6a2702ecddb5f8108719d9f2c9ae640 (commit)

commit 8855dcfd9cdac58cb7617b24f6f4a71a532f7b61
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Apr 28 23:12:01 2010 +0200

    Add desktop files for the applications in the Xfce menu.

 po/POTFILES.in                     |    3 +++
 scripts/Makefile.am                |    7 +++++++
 scripts/xfhelp4.desktop.in         |   12 ++++++++++++
 xfce4-about/Makefile.am            |   11 ++++++++++-
 xfce4-about/xfce4-about.desktop.in |   12 ++++++++++++
 xfrun/Makefile.am                  |   15 ++++++++++-----
 xfrun/xfrun4.desktop.in            |   12 ++++++++++++
 7 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index eb7f38a..f00df29 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,10 @@
 # List of source files containing translatable strings.
 
 xfce4-about/info.c
+xfce4-about/xfce4-about.desktop.in
 xfrun/xfrun.c
 xfrun/xfrun-dbus.c
 xfrun/xfrun-dialog.c
+xfrun/xfrun4.desktop.in
 xfce.desktop.in
+scripts/xfhelp4.desktop.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 777e635..2ea17e4 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -32,6 +32,11 @@ xfhelp4: Makefile $(srcdir)/xfhelp4.in
 	$(edit) $(srcdir)/xfhelp4.in >xfhelp4.tmp
 	mv xfhelp4.tmp xfhelp4
 
+desktopdir = $(datadir)/applications
+desktop_in_files = xfhelp4.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
 xinitrc: Makefile $(srcdir)/xinitrc.in
 	rm -f xinitrc xinitrc.tmp
 	$(edit) $(srcdir)/xinitrc.in >xinitrc.tmp
@@ -63,6 +68,7 @@ endif
 EXTRA_DIST = \
 	$(scripts) \
 	$(conffiles_DATA) \
+	$(desktop_in_files) \
 	xfbrowser4.in \
 	startxfce4.in \
 	xfhelp4.in \
@@ -71,6 +77,7 @@ EXTRA_DIST = \
 	xfconf-migration-4.6.pl.in
 
 DISTCLEANFILES = \
+	$(desktop_DATA) \
 	xfhelp4 \
 	startxfce4 \
 	xfbrowser4 \
diff --git a/scripts/xfhelp4.desktop.in b/scripts/xfhelp4.desktop.in
new file mode 100644
index 0000000..2eb88de
--- /dev/null
+++ b/scripts/xfhelp4.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Encoding=UTF-8
+Exec=xfhelp4
+Icon=help-contents
+StartupNotify=false
+Terminal=false
+Categories=X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+_Name=Help
+_Comment=Help using Xfce
diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am
index 57f3030..6506c7f 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -32,6 +32,15 @@ xfce4_about_CFLAGS =							\
 xfce4_about_LDADD =							\
 	@LIBXFCE4UI_LIBS@
 
+desktopdir = $(datadir)/applications
+desktop_in_files = xfce4-about.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
 EXTRA_DIST = 								\
-	$(about_DATA)
+	$(about_DATA)							\
+	$(desktop_in_files)
+
+DISTCLEANFILES = 							\
+	$(desktop_DATA)
 
diff --git a/xfce4-about/xfce4-about.desktop.in b/xfce4-about/xfce4-about.desktop.in
new file mode 100644
index 0000000..701a04a
--- /dev/null
+++ b/xfce4-about/xfce4-about.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Encoding=UTF-8
+Exec=xfce4-about
+Icon=help-about
+StartupNotify=false
+Terminal=false
+Categories=X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+_Name=About Xfce
+_Comment=Information about the Xfce Desktop Environment
diff --git a/xfrun/Makefile.am b/xfrun/Makefile.am
index 65c88bd..affa48d 100644
--- a/xfrun/Makefile.am
+++ b/xfrun/Makefile.am
@@ -30,23 +30,28 @@ xfrun4_LDADD = \
 	@GTK_LIBS@ \
 	@DBUS_LIBS@
 
+desktopdir = $(datadir)/applications
+desktop_in_files = xfrun4.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
 
 if HAVE_DBUS
 
 service_in_files = org.xfce.RunDialog.service.in
-
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
 	sed -e "s,\@bindir\@,$(bindir),g" < $< > $@
 
-DISTCLEANFILES = \
-	$(service_DATA)
-
 endif
 
 EXTRA_DIST = \
 	xfrun.c \
 	xfrun-dbus.c \
-	$(service_in_files)
+	$(service_in_files) \
+	$(desktop_in_files)
+
+DISTCLEANFILES = \
+	$(service_DATA) \
+	$(desktop_DATA)
diff --git a/xfrun/xfrun4.desktop.in b/xfrun/xfrun4.desktop.in
new file mode 100644
index 0000000..ec9e446
--- /dev/null
+++ b/xfrun/xfrun4.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Encoding=UTF-8
+Exec=xfrun4
+Icon=system-run
+StartupNotify=false
+Terminal=false
+Categories=X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+_Name=Run Program...
+_Comment=Run a program