[nautilus-sendto/gnome-2-32] Remove plugin to use sendto from Evolution
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-sendto/gnome-2-32] Remove plugin to use sendto from Evolution
- Date: Wed, 4 Aug 2010 12:24:23 +0000 (UTC)
commit eb0692ea555c404a6fbbe9fdf1ddab5f372ffc22
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 9 17:36:38 2010 +0100
Remove plugin to use sendto from Evolution
And not the plugin to use evolution-data-server in nautilus-sendto.
Makefile.am | 8 +--
configure.in | 19 ----
evolution/Makefile.am | 17 ---
evolution/nautilus-sendto.c | 112 --------------------
...g-gnome-evolution-send-attachments-to.eplug.xml | 28 -----
evolution/plugin.mk | 11 --
po/POTFILES.in | 2 -
7 files changed, 1 insertions(+), 196 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a814bb1..be84bf5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,4 @@
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN_DIR=evolution
-endif
-
-SUBDIRS = src $(EVOLUTION_PLUGIN_DIR) docs po
-
-DIST_SUBDIRS = evolution src docs po
+SUBDIRS = src docs po
DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
diff --git a/configure.in b/configure.in
index 0e6eb74..f64d187 100644
--- a/configure.in
+++ b/configure.in
@@ -81,18 +81,6 @@ fi
AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}])
AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}])
-dnl Get details about evolution
-
-PKG_CHECK_MODULES(EVOLUTION, evolution-plugin < 2.27.1,
- enable_evo=yes, enable_evo=no)
-AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evo" = "xyes")
-
-plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
-AC_SUBST(plugindir)
-
-EVO_PLUGIN_RULE=$srcdir/evolution/plugin.mk
-AC_SUBST_FILE(EVO_PLUGIN_RULE)
-
# The full list of plugins
allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp"
@@ -291,7 +279,6 @@ src/plugins/upnp/Makefile
docs/Makefile
docs/nautilus-sendto/Makefile
docs/nautilus-sendto/version.xml
-evolution/Makefile
po/Makefile.in
])
@@ -315,11 +302,5 @@ else
AC_MSG_NOTICE([ No nautilus-sendto plugins enabled])
fi
-if test "x$enable_evo" = "xyes"; then
- AC_MSG_NOTICE([** Evolution send-to plugin ( < 2.27.1) enabled])
-else
- AC_MSG_NOTICE([ Evolution send-to plugin ( < 2.27.1) disabled])
-fi
-
echo " "
echo "-------------------------------------------------------"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 69ca4ea..a66fef3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,6 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
nst.schemas.in
-evolution/nautilus-sendto.c
-evolution/org-gnome-evolution-send-attachments-to.eplug.xml
src/nautilus-nste.c
src/nautilus-nste.h
src/nautilus-sendto-command.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]