Index: m4macros/xdt-xfce.m4
===================================================================
--- m4macros/xdt-xfce.m4	(revision 24251)
+++ m4macros/xdt-xfce.m4	(working copy)
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-dnl Copyright (c) 2002-2006
+dnl Copyright (c) 2002-2007
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
@@ -26,53 +26,6 @@
 
 
 
-dnl XDT_XFCE_PANEL_PLUGIN(varname, [version = 4.2.0])
-dnl
-dnl This macro is intended to be used by panel plugin writers. It
-dnl detects the xfce4-panel package on the target system and sets
-dnl "varname"_CFLAGS, "varname"_LIBS, "varname"_REQUIRED_VERSION
-dnl and "varname"_VERSION properly. The parameter "version"
-dnl specifies the minimum required version of xfce4-panel (defaults
-dnl to 4.2.0 if not given).
-dnl
-dnl This macro also takes care of handling special panel versions,
-dnl like the threaded panel, that was used during the Xfce 4.2.0
-dnl development, and automatically sets up the correct flags.
-dnl
-dnl In addition, this macro defines "varname"_PLUGINSDIR (and
-dnl marks it for substitution), which points to the directory
-dnl where the panel plugin should be installed to. You should
-dnl use this variable in your Makefile.am.
-dnl
-AC_DEFUN([XDT_XFCE_PANEL_PLUGIN],
-[
-  dnl Check for the xfce4-panel package
-  XDT_CHECK_PACKAGE([$1], [xfce4-panel-1.0], [m4_default([$2], [4.2.0])])
-
-  dnl Check if the panel is threaded (only for old panels)
-  xdt_cv_CFLAGS=$$1_CFLAGS
-  AC_MSG_CHECKING([whether the Xfce panel is threaded])
-  if $PKG_CONFIG --max-version=4.1.90 xfce4-panel-1.0 >/dev/null 2>&1; then
-    AC_MSG_RESULT([yes])
-    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_THREADED=1"
-    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\)"
-    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
-  else
-    AC_MSG_RESULT([no])
-    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\)"
-    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
-  fi
-  $1_CFLAGS="$xdt_cv_CFLAGS"
-
-  dnl Check where to put the plugins to
-  AC_MSG_CHECKING([where to install panel plugins])
-  $1_PLUGINSDIR=$libdir/xfce4/panel-plugins
-  AC_SUBST([$1_PLUGINSDIR])
-  AC_MSG_RESULT([$$1_PLUGINSDIR])
-])
-
-
-
 dnl XDT_XFCE_MCS_PLUGIN(varname, [version = 4.2.0])
 dnl
 dnl This macro is intented to be used by MCS plugin writers. It
@@ -101,18 +54,6 @@
 
 
 
-dnl XFCE_PANEL_PLUGIN(varname, version)
-dnl
-dnl Simple wrapper for XDT_XFCE_PANEL_PLUGIN(varname, version). Kept
-dnl for backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([XFCE_PANEL_PLUGIN],
-[
-  XDT_XFCE_PANEL_PLUGIN([$1], [$2])
-])
-
-
-
 dnl XFCE_MCS_PLUGIN(varname, version)
 dnl
 dnl Simple wrapper for XDT_XFCE_MCS_PLUGIN(varname, version). Kept