[Xfce4-commits] <xfce4-clipman-plugin:master> Use new Panel 4.8 installation directory for plugin

[Mike Massonnet]

Updating branch refs/heads/master
         to b72978ca73698e71012fef8e711927f13135fb02 (commit)
       from 85d729cc456e86f6c452007ed7da5100e58f4d71 (commit)

commit b72978ca73698e71012fef8e711927f13135fb02
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Oct 26 23:51:05 2011 +0200

    Use new Panel 4.8 installation directory for plugin
    
    Install plugin under the new location $prefix/lib/xfce4/panel/plugins/
    and update the main-panel-plugin.c code with the right macro to build
    libclipman.so instead of the executable binary.
    
    Moved the xfce4-clipman-plugin.desktop.in file to the panel-plugin
    directory as xfce4-clipman.desktop.in.

 Makefile.am                                        |    7 ----
 panel-plugin/Makefile.am                           |   30 ++++++++++---------
 panel-plugin/main-panel-plugin.c                   |    2 +-
 ...sktop.in.in => xfce4-clipman-plugin.desktop.in} |    3 +-
 .../xfce4-clipman.desktop.in                       |    0
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 27ab4c2..082226f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,11 +12,6 @@ SUBDIRS =								\
 distclean-local:
 	rm -rf *.cache *~
 
-desktopdir = $(datadir)/applications
-desktop_in_files = xfce4-clipman-plugin.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-
 DISTCHECK_CONFIGURE_FLAGS =						\
 	--enable-gen-doc						\
 	$(NULL)
@@ -31,11 +26,9 @@ EXTRA_DIST =								\
 	intltool-extract.in						\
 	intltool-merge.in						\
 	intltool-update.in						\
-	$(desktop_in_files)						\
 	$(NULL)
 
 CLEANFILES =								\
-	$(desktop_DATA)							\
 	$(NULL)
 
 DISTCLEANFILES =							\
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index cf8a218..547ff77 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -121,10 +121,10 @@ xfce4_clipman_LDADD =							\
 # Panel Plugin
 #
 
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-clipman-plugin
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libclipman.la
 
-xfce4_clipman_plugin_SOURCES =						\
+libclipman_la_SOURCES =							\
 	main-panel-plugin.c						\
 	common.h							\
 	plugin.c			plugin.h			\
@@ -134,7 +134,7 @@ xfce4_clipman_plugin_SOURCES =						\
 	menu.c				menu.h				\
 	$(NULL)
 
-xfce4_clipman_plugin_CFLAGS =						\
+libclipman_la_CFLAGS =							\
 	-DPANEL_PLUGIN							\
 	@GIO_CFLAGS@							\
 	@EXO_CFLAGS@							\
@@ -148,7 +148,7 @@ xfce4_clipman_plugin_CFLAGS =						\
 	@XFCONF_CFLAGS@							\
 	$(NULL)
 
-xfce4_clipman_plugin_LDADD =						\
+libclipman_la_LIBADD =							\
 	$(top_builddir)/daemon/libdaemon.la				\
 	@GIO_LIBS@							\
 	@EXO_LIBS@							\
@@ -175,15 +175,15 @@ actions_DATA = $(actions_in_files:.xml.in=.xml)
 # Desktop Entry File
 #
 
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = xfce4-clipman-plugin.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+pluginsdir = $(datadir)/xfce4/panel/plugins
+plugins_in_files = xfce4-clipman-plugin.desktop.in
+plugins_DATA = $(plugins_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-%.desktop.in: %.desktop.in.in
-	$(AM_V_GEN) sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(plugindir)^" \
-		$< > $@
+appsdir = $(datadir)/applications
+apps_in_files = xfce4-clipman.desktop.in
+apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
 
 #
 # Autostart File
@@ -202,13 +202,15 @@ EXTRA_DIST =								\
 	settings-dialog.ui						\
 	$(actions_in_files)						\
 	$(autostart_in_files)						\
-	$(desktop_in_in_files)						\
+	$(plugins_in_files)						\
+	$(apps_in_files)						\
 	$(NULL)
 
 CLEANFILES =								\
 	$(actions_DATA)							\
 	$(autostart_DATA)						\
-	$(desktop_DATA)							\
+	$(plugins_DATA)							\
+	$(apps_DATA)							\
 	$(NULL)
 
 DISTCLEANFILES =							\
diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index 98ea080..ff1c091 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -37,7 +37,7 @@
  */
 
 static void             panel_plugin_register           (XfcePanelPlugin *panel_plugin);
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (panel_plugin_register);
+XFCE_PANEL_PLUGIN_REGISTER (panel_plugin_register);
 
 static gboolean         cb_button_pressed               (GtkButton *button,
                                                          GdkEventButton *event,
diff --git a/panel-plugin/xfce4-clipman-plugin.desktop.in.in b/panel-plugin/xfce4-clipman-plugin.desktop.in
similarity index 71%
rename from panel-plugin/xfce4-clipman-plugin.desktop.in.in
rename to panel-plugin/xfce4-clipman-plugin.desktop.in
index 6efaf25..85fc50e 100644
--- a/panel-plugin/xfce4-clipman-plugin.desktop.in.in
+++ b/panel-plugin/xfce4-clipman-plugin.desktop.in
@@ -4,5 +4,6 @@ Encoding=UTF-8
 _Name=Clipman
 _Comment=Clipboard manager
 Icon=xfce4-clipman-plugin
-X-XFCE-Exec=@EXTERNAL_PLUGIN_PATH@/xfce4-clipman-plugin
+X-XFCE-Module=clipman
+X-XFCE-Internal=false
 X-XFCE-Unique=true
diff --git a/xfce4-clipman-plugin.desktop.in b/panel-plugin/xfce4-clipman.desktop.in
similarity index 100%
rename from xfce4-clipman-plugin.desktop.in
rename to panel-plugin/xfce4-clipman.desktop.in