[Xfce4-commits] <xfce4-datetime-plugin:master> Update to 2013 xfce standards

[Landry Breuil]

Updating branch refs/heads/master
         to e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
       from cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)

commit e55a418bd9d8c284774d7b8ac33aff0356a5a4ab
Author: Landry Breuil <landry at xfce.org>
Date:   Wed Feb 13 22:49:21 2013 +0100

    Update to 2013 xfce standards
    
    - rename datetime.desktop.in.in
    - use newer xfce4/panel/plugins paths for desktop and module file
    - register the module as not internal to the panel
    - remove now useless cygwin check

 configure.ac.in                                    |    1 -
 panel-plugin/Makefile.am                           |   27 ++++++-------------
 panel-plugin/datetime.c                            |    2 +-
 ...{datetime.desktop.in.in => datetime.desktop.in} |    2 +-
 po/POTFILES.in                                     |    2 +-
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 98b394a..cdb3536 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE()
 dnl Check for UNIX variants
 AC_AIX
 AC_ISC_POSIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
 
 dnl check for basic programs
 AC_PROG_CC
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 18bbc7e..c6e44df 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/xfce4/panel-plugins/
+plugindir = $(libdir)/xfce4/panel/plugins/
 
 plugin_LTLIBRARIES = 				\
 	libdatetime.la
@@ -19,12 +19,10 @@ libdatetime_la_CFLAGS = 			\
 
 libdatetime_la_LDFLAGS = 			\
 	-avoid-version				\
-	-module
-
-if HAVE_CYGWIN
-libdatetime_la_LDFLAGS += 			\
-	-no-undefined
-endif
+	-module \
+	-no-undefined \
+	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+	$(PLATFORM_LDFLAGS)
 
 libdatetime_la_LIBADD = 			\
 	$(GTK_LIBS)				\
@@ -32,19 +30,12 @@ libdatetime_la_LIBADD = 			\
 	$(LIBXFCE4UI_LIBS)			\
 	$(LIBXFCE4UTIL_LIBS)
 
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = datetime.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = datetime.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 
-EXTRA_DIST =					\
-	$(desktop_in_in_files)
-
-DISTCLEANFILES =				\
-	$(desktop_DATA)				\
-	$(desktop_in_files)
+EXTRA_DIST = $(desktop_in_files)
 
+CLEANFILES = $(desktop_DATA)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 0738889..3350c3a 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -694,5 +694,5 @@ static void datetime_construct(XfcePanelPlugin *plugin)
 }
 
 
-XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(datetime_construct);
+XFCE_PANEL_PLUGIN_REGISTER(datetime_construct);
 
diff --git a/panel-plugin/datetime.desktop.in.in b/panel-plugin/datetime.desktop.in
similarity index 75%
rename from panel-plugin/datetime.desktop.in.in
rename to panel-plugin/datetime.desktop.in
index e3e3c5d..3c3277a 100644
--- a/panel-plugin/datetime.desktop.in.in
+++ b/panel-plugin/datetime.desktop.in
@@ -4,4 +4,4 @@ _Name=DateTime
 _Comment=Date and Time plugin with a simple calendar
 Icon=xfce-schedule
 X-XFCE-Module=datetime
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Internal=FALSE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec27071..971c3a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
 panel-plugin/datetime.c
 panel-plugin/datetime-dialog.c
-panel-plugin/datetime.desktop.in.in
+panel-plugin/datetime.desktop.in