[Xfce4-commits] r27061 - in libexo/trunk: . exo-helper po

[Stephan Arts]

Author: stephan
Date: 2008-06-14 22:31:21 +0000 (Sat, 14 Jun 2008)
New Revision: 27061

Removed:
   libexo/trunk/exo-helper/exo-preferred-applications-settings.c
Modified:
   libexo/trunk/configure.in.in
   libexo/trunk/exo-helper/Makefile.am
   libexo/trunk/po/POTFILES.in
Log:
Remove MCS-plugin from libexo. (and thus the optional mcs-manager 
dependency)



Modified: libexo/trunk/configure.in.in
===================================================================
--- libexo/trunk/configure.in.in	2008-06-14 22:05:35 UTC (rev 27060)
+++ libexo/trunk/configure.in.in	2008-06-14 22:31:21 UTC (rev 27061)
@@ -157,12 +157,6 @@
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.2])
 
-dnl *********************************************
-dnl *** Check for xfce-mcs-manager (optional) ***
-dnl *********************************************
-XDT_CHECK_OPTIONAL_PACKAGE([XFCE_MCS_MANAGER], [xfce-mcs-manager], [4.2.2],
-                           [mcs-plugin], [xfce-mcs-manager], [yes])
-
 dnl **************************************
 dnl *** Check for libnotify (optional) ***
 dnl **************************************

Modified: libexo/trunk/exo-helper/Makefile.am
===================================================================
--- libexo/trunk/exo-helper/Makefile.am	2008-06-14 22:05:35 UTC (rev 27060)
+++ libexo/trunk/exo-helper/Makefile.am	2008-06-14 22:31:21 UTC (rev 27061)
@@ -67,36 +67,6 @@
 @INTLTOOL_DESKTOP_RULE@
 
 ##
-## Build MCS plugin if xfce-mcs-manager is present. The MCS plugin is
-## really just a wrapper for exo-preferred-applications (remember, MCS
-## must die!).
-##
-if HAVE_XFCE_MCS_MANAGER
-pluginsdir = $(libdir)/xfce4/mcs-plugins
-plugins_LTLIBRARIES =							\
-	exo-preferred-applications-settings.la
-
-exo_preferred_applications_settings_la_LDFLAGS =			\
-	-avoid-version							\
-	-module								\
-	-no-undefined
-
-if PLATFORM_WIN32
-exo_preferred_applications_settings_la_LDFLAGS +=			\
-	-export-symbols $(datadir)/xfce4/devel/mcs-manager.def
-endif
-
-exo_preferred_applications_settings_la_SOURCES =			\
-	exo-preferred-applications-settings.c
-
-exo_preferred_applications_settings_la_CFLAGS =				\
-	$(XFCE_MCS_MANAGER_CFLAGS)
-
-exo_preferred_applications_settings_la_LIBADD =				\
-	$(XFCE_MCS_MANAGER_LIBS)
-endif
-
-##
 ## Rules to auto-generate built sources
 ##
 ## This is a bit tricky with automake, and non-trivial to implement. The

Deleted: libexo/trunk/exo-helper/exo-preferred-applications-settings.c

Modified: libexo/trunk/po/POTFILES.in
===================================================================
--- libexo/trunk/po/POTFILES.in	2008-06-14 22:05:35 UTC (rev 27060)
+++ libexo/trunk/po/POTFILES.in	2008-06-14 22:31:21 UTC (rev 27061)
@@ -44,7 +44,6 @@
 exo-helper/exo-helper-launcher-dialog.c
 exo-helper/exo-helper-utils.c
 exo-helper/exo-helper.c
-exo-helper/exo-preferred-applications-settings.c
 exo-helper/exo-preferred-applications.desktop.in
 exo-helper/main.c
 exo-helper/helpers/Terminal.desktop.in.in