Index: plugins/actions/actions.desktop.in.in
===================================================================
--- plugins/actions/actions.desktop.in.in	(revision 23450)
+++ plugins/actions/actions.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Action Buttons
 _Comment=Log out or lock the screen
 Icon=xfce-system-exit
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libactions.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/actions/Makefile.am
===================================================================
--- plugins/actions/Makefile.am	(revision 23450)
+++ plugins/actions/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/separator/separator.desktop.in.in
===================================================================
--- plugins/separator/separator.desktop.in.in	(revision 23450)
+++ plugins/separator/separator.desktop.in.in	(working copy)
@@ -3,5 +3,5 @@
 Encoding=UTF-8
 _Name=Separator or Spacing
 _Comment=Adds a space or a line between panel items
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libseparator.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/separator/Makefile.am
===================================================================
--- plugins/separator/Makefile.am	(revision 23450)
+++ plugins/separator/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/iconbox/iconbox.desktop.in.in
===================================================================
--- plugins/iconbox/iconbox.desktop.in.in	(revision 23450)
+++ plugins/iconbox/iconbox.desktop.in.in	(working copy)
@@ -4,5 +4,4 @@
 _Name=Icon Box
 _Comment=Show icons of all running applications
 Icon=xfce4-iconbox
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libiconbox.so
-
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
Index: plugins/iconbox/Makefile.am
===================================================================
--- plugins/iconbox/Makefile.am	(revision 23450)
+++ plugins/iconbox/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/launcher/launcher.desktop.in.in
===================================================================
--- plugins/launcher/launcher.desktop.in.in	(revision 23450)
+++ plugins/launcher/launcher.desktop.in.in	(working copy)
@@ -4,5 +4,4 @@
 _Name=Launcher
 _Comment=Program launcher with optional menu
 Icon=gnome-fs-executable
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/liblauncher.so
-
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
Index: plugins/launcher/Makefile.am
===================================================================
--- plugins/launcher/Makefile.am	(revision 23450)
+++ plugins/launcher/Makefile.am	(working copy)
@@ -1,9 +1,10 @@
-plugindir = $(libdir)/xfce4/panel-plugins
+liblauncherdir = $(libdir)/xfce4/panel-plugins
 
-plugin_LTLIBRARIES = liblauncher.la
+liblauncher_LTLIBRARIES = liblauncher.la
 
 liblauncher_la_LDFLAGS =						\
 	-avoid-version							\
+	-export-dynamic							\
 	-module
 
 liblauncher_la_SOURCES = 						\
@@ -14,7 +15,7 @@
 
 liblauncher_la_CFLAGS =							\
 	-I$(top_srcdir)							\
-	@LIBXFCEGUI4_CFLAGS@						\
+	$(LIBXFCEGUI4_CFLAGS)						\
 	-DLOCALEDIR=\"$(localedir)\"
 
 liblauncher_la_LIBADD =							\
@@ -25,11 +26,11 @@
 	../../libxfce4panel/libxfce4panel.la
 	
 if HAVE_CYGWIN
-liblauncher_la_LDFLAGS +=                        	                \
-	-no-undefined                                                   \
-	@LIBX11_LDFLAGS@                                                \
-	@LIBXFCEGUI4_LIBS@                                              \
-	@LIBX11_LIBS@
+liblauncher_la_LDFLAGS +=						\
+	-no-undefined							\
+	$(LIBX11_LDFLAGS)						\
+	$(LIBXFCEGUI4_LIBS)						\
+	$(LIBX11_LIBS)
 endif
 
 # .desktop file
@@ -54,6 +55,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= liblauncher.la | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/windowlist/windowlist.desktop.in.in
===================================================================
--- plugins/windowlist/windowlist.desktop.in.in	(revision 23450)
+++ plugins/windowlist/windowlist.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Window List
 _Comment=Show list of available windows
 Icon=xfce-windowlist
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libwindowlist.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/windowlist/Makefile.am
===================================================================
--- plugins/windowlist/Makefile.am	(revision 23450)
+++ plugins/windowlist/Makefile.am	(working copy)
@@ -70,6 +70,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/showdesktop/Makefile.am
===================================================================
--- plugins/showdesktop/Makefile.am	(revision 23450)
+++ plugins/showdesktop/Makefile.am	(working copy)
@@ -51,7 +51,9 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
 
Index: plugins/showdesktop/showdesktop.desktop.in.in
===================================================================
--- plugins/showdesktop/showdesktop.desktop.in.in	(revision 23450)
+++ plugins/showdesktop/showdesktop.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Show Desktop
 _Comment=Toggle desktop show/hide
 Icon=gnome-fs-desktop
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libshowdesktop.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/clock/Makefile.am
===================================================================
--- plugins/clock/Makefile.am	(revision 23450)
+++ plugins/clock/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/clock/clock.desktop.in.in
===================================================================
--- plugins/clock/clock.desktop.in.in	(revision 23450)
+++ plugins/clock/clock.desktop.in.in	(working copy)
@@ -4,5 +4,4 @@
 _Name=Clock
 _Comment=What time is it?
 Icon=xfce-schedule
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libclock.so
-
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
Index: plugins/pager/pager.desktop.in.in
===================================================================
--- plugins/pager/pager.desktop.in.in	(revision 23450)
+++ plugins/pager/pager.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Pager
 _Comment=Miniature view of all virtual desktops
 Icon=wksp
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libpager.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/pager/Makefile.am
===================================================================
--- plugins/pager/Makefile.am	(revision 23450)
+++ plugins/pager/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/systray/systray.desktop.in.in
===================================================================
--- plugins/systray/systray.desktop.in.in	(revision 23450)
+++ plugins/systray/systray.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=System Tray
 _Comment=Show notification icons
 Icon=xfce-system-info
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsystray.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/systray/Makefile.am
===================================================================
--- plugins/systray/Makefile.am	(revision 23450)
+++ plugins/systray/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/tasklist/tasklist.desktop.in.in
===================================================================
--- plugins/tasklist/tasklist.desktop.in.in	(revision 23450)
+++ plugins/tasklist/tasklist.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Task List
 _Comment=Show all running applications
 Icon=xfce4-taskbar
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libtasklist.so
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/tasklist/Makefile.am
===================================================================
--- plugins/tasklist/Makefile.am	(revision 23450)
+++ plugins/tasklist/Makefile.am	(working copy)
@@ -51,6 +51,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@
 
Index: plugins/testplugin/testplugin.desktop.in.in
===================================================================
--- plugins/testplugin/testplugin.desktop.in.in	(revision 23450)
+++ plugins/testplugin/testplugin.desktop.in.in	(working copy)
@@ -4,5 +4,5 @@
 _Name=Test Plugin
 _Comment=This plugin has no purpose
 Icon=xfce-mouse
-X-XFCE-Exec=@EXTERNAL_PLUGIN_PATH@/testplugin
+X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/@PLUGIN_NAME@
 
Index: plugins/testplugin/Makefile.am
===================================================================
--- plugins/testplugin/Makefile.am	(revision 23450)
+++ plugins/testplugin/Makefile.am	(working copy)
@@ -38,6 +38,8 @@
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+# 	plugin_name=`grep dlname= $(plugin_LTLIBRARIES) | sed "s/dlname='\(.*\)'/\1/"`; \
+	sed	-e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+		-e "s^@PLUGIN_NAME@^$$plugin_name^" \
 		$< > $@