[Xfce4-commits] <xfce4-panel:devel> * Desktop files

[Nick Schermer]

Updating branch refs/heads/devel
         to fa1f1a4b804af51f32ab36beeeb07ac47aac2919 (commit)
       from 1ba7165b1e7a37afce4e583e496c963c502b30ee (commit)

commit fa1f1a4b804af51f32ab36beeeb07ac47aac2919
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 16 18:19:10 2008 +0200

    * Desktop files

 Makefile.am                         |   10 ++++++++++
 Panel-desktop-handler.desktop.in.in |   14 ++++++++++++++
 Panel-preferences.desktop.in.in     |   13 +++++++++++++
 STATUS                              |    4 ++--
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cb5ea7..79ee84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,16 @@ rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
 	@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
+desktopdir = $(datadir)/applications
+desktop_in_in_files = 							\
+	Panel-desktop-handler.desktop.in				\
+	Panel-preferences.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+%.desktop.in: %.desktop.in.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
 EXTRA_DIST = 								\
 	intltool-extract.in						\
 	intltool-merge.in						\
diff --git a/Panel-desktop-handler.desktop.in.in b/Panel-desktop-handler.desktop.in.in
new file mode 100644
index 0000000..d192a90
--- /dev/null
+++ b/Panel-desktop-handler.desktop.in.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Create Launcher on Xfce Panel
+_Comment=Create a new launcher on the Xfce Panel
+_GenericName=Create Launcher on Xfce Panel
+TryExec=xfce4-panel
+Exec=xfce4-panel --add=launcher %F
+Icon=application-x-executable
+NoDisplay=true
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;Utility;Core;GTK;Panel;
+MimeType=application/x-desktop;
diff --git a/Panel-preferences.desktop.in.in b/Panel-preferences.desktop.in.in
new file mode 100644
index 0000000..bfd33f6
--- /dev/null
+++ b/Panel-preferences.desktop.in.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Exec=xfce4-panel -c
+Icon=preferences-system
+Type=Application
+Categories=X-XFCE;Settings;DesktopSettings;
+OnlyShowIn=XFCE;
+Terminal=false
+StartupNotify=true
+_GenericName=Panel Preferences
+_Name=Xfce 4 Panel Preferences
+_Comment=Customize the Xfce Panel
diff --git a/STATUS b/STATUS
index 9db8e56..048d7fc 100644
--- a/STATUS
+++ b/STATUS
@@ -19,8 +19,8 @@ Bugs Fixed
        been removed.
 2471 : Hidden panel doesn't grow. The hidden window is now
        also properly allocated when the window is hidden.
-2955 : Then opening the properties or add items dialog it
+2955 : When opening the properties or add items dialog it
        appears on the correct screen.
 3748 : Panel desn't pick up changes made with XRandr. The
        monitor configuration is no longer stored and recalculated
-       when the screen size or monitor number changes (GTK+ 2.14).
\ No newline at end of file
+       when the screen size or monitor number changes (GTK+ 2.13).