Updating branch refs/heads/master to 3c3b6461a08cc3105bcd830a541d814161a2473b (commit) from dddf3232a52dd770b0d726e2ce7658e5ac40fe47 (commit)
commit 3c3b6461a08cc3105bcd830a541d814161a2473b Author: Nick Schermer <n...@xfce.org> Date: Sun Jul 25 20:34:32 2010 +0200 Drop the old 4.6 panel plugin implementation. Have been a couple of unstable releases of the panel and the code is mature enough to depend on it in the Xfce core modules. configure.in.in | 9 +-- panel-plugin/Makefile.am | 93 ++++++++------------ panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in | 7 -- panel-plugin/xfsm-logout-plugin.c | 4 - ...desktop.in.in => xfsm-logout-plugin.desktop.in} | 0 po/POTFILES.in | 3 +- po/POTFILES.skip | 3 - 7 files changed, 37 insertions(+), 82 deletions(-) diff --git a/configure.in.in b/configure.in.in index 471aa16..104bdab 100644 --- a/configure.in.in +++ b/configure.in.in @@ -81,15 +81,8 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0]) dnl we provide a panel plugin now -XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0], +XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.2], [panel-plugin], [Panel logout menu button], [yes]) -if test "x$LIBXFCE4PANEL_FOUND" = "xyes"; then - PANEL_MINOR=`echo $LIBXFCE4PANEL_VERSION | cut -d. -f2` - if test $PANEL_MINOR -lt 7; then - old_panel_plugin=yes - fi -fi -AM_CONDITIONAL([BUILD_OLD_PANEL_PLUGIN], [test "x$old_panel_plugin" = "xyes"]) dnl Check for gnome support XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [gconf-2.0], [2.4.0], [gnome], diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 5bbbb4b..392dce1 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,17 +1,29 @@ -plugin_sources = \ - xfsm-logout-plugin.c \ + +INCLUDES = \ + -I$(top_srcdir) \ + -DLOCALEDIR=\"$(localedir)\" \ + -DG_LOG_DOMAIN=\"libxfsm-logout-plugin\" + +plugindir = $(libdir)/xfce4/panel-plugins + +plugin_LTLIBRARIES = libxfsm-logout-plugin.la + +libxfsm_logout_plugin_built_sources = \ xfsm-logout-plugin-ui.h -plugin_cflags = \ +libxfsm_logout_plugin_la_SOURCES = \ + $(libxfsm_logout_plugin_built_sources) \ + xfsm-logout-plugin.c + +libxfsm_logout_plugin_la_CFLAGS = \ $(LIBX11_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(GTK_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" + $(DBUS_GLIB_CFLAGS) -plugin_libs = \ +libxfsm_logout_plugin_la_LIBADD = \ $(LIBX11_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ @@ -19,71 +31,36 @@ plugin_libs = \ $(GTK_LIBS) \ $(DBUS_GLIB_LIBS) -if BUILD_OLD_PANEL_PLUGIN - -plugindir = $(libexecdir)/xfce4/panel-plugins -plugin_PROGRAMS = xfsm-logout-plugin - -xfsm_logout_plugin_SOURCES = $(plugin_sources) -xfsm_logout_plugin_CFLAGS = $(plugin_cflags) -xfsm_logout_plugin_LDADD = $(plugin_libs) - -else - -plugindir = $(libdir)/xfce4/panel-plugins -plugin_LTLIBRARIES = libxfsm-logout-plugin.la - -libxfsm_logout_plugin_la_SOURCES = $(plugin_sources) -libxfsm_logout_plugin_la_CFLAGS = $(plugin_cflags) -libxfsm_logout_plugin_la_LIBADD = $(plugin_libs) libxfsm_logout_plugin_la_LDFLAGS = \ -avoid-version \ - -export-dynamic \ -module \ - -shared + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' -endif - -# .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 file # -if BUILD_OLD_PANEL_PLUGIN -dfile = xfsm-logout-plugin-4.6.desktop.in.in -else -dfile = xfsm-logout-plugin.desktop.in.in -endif - -desktop_in_in_files = $(dfile) -desktop_in_files = xfsm-logout-plugin.desktop.in - desktopdir = $(datadir)/xfce4/panel-plugins +desktop_in_files = xfsm-logout-plugin.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -# get full path into .desktop file -xfsm-logout-plugin.desktop.in: $(srcdir)/$(dfile) - sed -e "s,\...@plugindir\@,$(plugindir)," $< > $@ - -if MAINTAINER_MODE +EXTRA_DIST = \ + xfsm-logout-plugin-ui.xml \ + $(desktop_in_files) -xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile - $(AM_V_GEN) exo-csource --static --name=logout_plugin_ui $< > $@ +DISTCLEANFILES = \ + $(desktop_DATA) -BUILT_SOURCES = xfsm-logout-plugin-ui.h +if MAINTAINER_MODE +BUILT_SOURCES = \ + $(libxfsm_logout_plugin_built_sources) -MAINTAINERCLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES += \ + $(libxfsm_logout_plugin_built_sources) +xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile + $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=logout_plugin_ui $< > $@ endif -EXTRA_DIST = \ - xfsm-logout-plugin.desktop.in.in \ - xfsm-logout-plugin-4.6.desktop.in.in \ - xfsm-logout-plugin-ui.xml - -DISTCLEANFILES = \ - $(desktop_DATA) \ - $(desktop_in_files) +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in b/panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in deleted file mode 100644 index 32d4117..0000000 --- a/panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in +++ /dev/null @@ -1,7 +0,0 @@ -[Xfce Panel] -Type=X-XFCE-PanelPlugin -Encoding=UTF-8 -_Name=Session Menu -_Comment=Shows a menu with options to lock the screen, suspend, shutdown, or log out -Icon=xfce4-session -x-xfce-ex...@plugindir@/xfsm-logout-plugin diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c index 893ad88..0d1266e 100644 --- a/panel-plugin/xfsm-logout-plugin.c +++ b/panel-plugin/xfsm-logout-plugin.c @@ -424,8 +424,4 @@ xfsm_logout_plugin_construct(XfcePanelPlugin *plugin) g_object_unref(G_OBJECT(uimgr)); } -#ifdef XFCE_PANEL_PLUGIN_REGISTER /* panel >= 4.7 */ XFCE_PANEL_PLUGIN_REGISTER(xfsm_logout_plugin_construct) -#else /* panel <= 4.6 */ -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(xfsm_logout_plugin_construct) -#endif diff --git a/panel-plugin/xfsm-logout-plugin.desktop.in.in b/panel-plugin/xfsm-logout-plugin.desktop.in similarity index 100% rename from panel-plugin/xfsm-logout-plugin.desktop.in.in rename to panel-plugin/xfsm-logout-plugin.desktop.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 0976b97..f675268 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,8 +28,7 @@ xfce4-session-logout/xfce4-session-logout.desktop.in # files added by intltool-prepare. -panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in -panel-plugin/xfsm-logout-plugin.desktop.in.in +panel-plugin/xfsm-logout-plugin.desktop.in settings/xfce-session-settings.desktop.in settings/xfce4-session-settings.glade xfce4-tips/xfce4-tips-autostart.desktop.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip deleted file mode 100644 index 73043bf..0000000 --- a/po/POTFILES.skip +++ /dev/null @@ -1,3 +0,0 @@ -# temporarily needed to make distcheck work, until we drop the old -# panel plugin implementation. -panel-plugin/xfsm-logout-plugin.desktop.in _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits