From 4e1e73445605ff2599d1f68b1c76693dacafca96 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Tue, 17 Feb 2015 16:56:25 -0600
Subject: [PATCH] Update desktop file contents/location for xfce4-panel changes

This should fix bz7015

Thanks to Christoph Wickert for the original patch.
---
 panel-plugin/Makefile.am                 | 23 +++++------------------
 panel-plugin/quicklauncher.desktop.in    |  7 +++++++
 panel-plugin/quicklauncher.desktop.in.in |  8 --------
 3 files changed, 12 insertions(+), 26 deletions(-)
 create mode 100644 panel-plugin/quicklauncher.desktop.in
 delete mode 100644 panel-plugin/quicklauncher.desktop.in.in

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 65ad03e..52be90f 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,5 +1,5 @@
 
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
 
 plugin_LTLIBRARIES =							\
 	libquicklauncher.la
@@ -25,27 +25,14 @@ libquicklauncher_la_LIBADD = 							\
 	@LIBXFCE4PANEL_LIBS@		\
 	@LIBXFCEGUI4_LIBS@
 
-# .desktop file
-#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-
-desktop_in_in_files = quicklauncher.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktop_in_files = quicklauncher.desktop.in
+desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = 								\
-	$(desktop_in_in_files)
+	$(desktop_in_files)
 
 DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files)
+	$(desktop_DATA)
 
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
-		$< > $@
diff --git a/panel-plugin/quicklauncher.desktop.in b/panel-plugin/quicklauncher.desktop.in
new file mode 100644
index 0000000..a16d487
--- /dev/null
+++ b/panel-plugin/quicklauncher.desktop.in
@@ -0,0 +1,7 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+_Name=Quicklauncher
+_Comment=Program with several launchers
+Icon=application-x-executable
+X-XFCE-Module=quicklauncher
+X-XFCE-Internal=TRUE
diff --git a/panel-plugin/quicklauncher.desktop.in.in b/panel-plugin/quicklauncher.desktop.in.in
deleted file mode 100644
index 7db2aad..0000000
--- a/panel-plugin/quicklauncher.desktop.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-Encoding=UTF-8
-_Name=Quicklauncher
-_Comment=Program with several launchers
-Icon=gnome-fs-executable
-X-XFCE-Module=libquicklauncher.so
-X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
-- 
2.3.0