[evolution-activesync: 1/6] Remove outdated EPlugin
- From: dwmw2 <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync: 1/6] Remove outdated EPlugin
- Date: Wed, 12 Aug 2015 22:05:36 +0000 (UTC)
commit b00dbaefa17ea72098d918935b9d37ae814eb9fb
Author: Oliver Luo <lyc pku eecs gmail com>
Date: Wed Jul 15 21:33:07 2015 +0800
Remove outdated EPlugin
The outdated EPlugin has been replaced by EExtension in our code, so
remove the old EPlugin code.
Makefile.am | 8 +-
configure.ac | 10 -
eplugin/Makefile.am | 72 ---
eplugin/activesync-account-setup.c | 673 --------------------
eplugin/eas-account-listener.c | 571 -----------------
eplugin/eas-account-listener.h | 57 --
eplugin/org-gnome-evolution-activesync.eplug.xml | 28 -
eplugin/org-gnome-evolution-activesync.error.xml | 4 -
.../meego-ux-settings-activesync.qmlproject | 2 -
po/POTFILES.in | 3 -
10 files changed, 2 insertions(+), 1426 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 72ce9e2..0e1007f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,10 @@ if ENABLE_CAMEL_BACKEND
CAMEL_DIRS = libevoeas camel
endif
-if ENABLE_EPLUGIN
- EPLUGIN_DIR = eplugin
-endif
-
# full set of directories for "make dist"
-DIST_SUBDIRS = . libeasaccount/src libeasclient libeasaccount/tests eas-daemon check_tests libevoeas camel
eplugin meego QtActivesyncdConfig po
+DIST_SUBDIRS = . libeasaccount/src libeasclient libeasaccount/tests eas-daemon check_tests libevoeas camel
meego QtActivesyncdConfig po
# subset of that list for "make && make install"
-SUBDIRS = . libeasaccount/src libeasclient libeasaccount/tests eas-daemon check_tests $(CAMEL_DIRS)
$(EPLUGIN_DIR) $(MEEGO_DIR) $(QTCONFIG_DIR) po collection configuration
+SUBDIRS = . libeasaccount/src libeasclient libeasaccount/tests eas-daemon check_tests $(CAMEL_DIRS)
$(MEEGO_DIR) $(QTCONFIG_DIR) po collection configuration
EXTRA_DIST = autogen.sh
diff --git a/configure.ac b/configure.ac
index 0bdad12..7460b21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,6 @@ CAMEL_PKG="camel-1.2"
PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG})
-PKG_CHECK_MODULES(EVOLUTION_SHELL, evolution-plugin${EVO_PKG}, [have_e_plugin=yes], [have_eplugin=no])
AC_SUBST(EVOLUTION_SHELL_CFLAGS)
AC_SUBST(EVOLUTION_SHELL_LIBS)
@@ -142,14 +141,6 @@ AC_ARG_ENABLE(camel-backend,
[enable_camel="$enableval"], [enable_camel="yes"])
AM_CONDITIONAL([ENABLE_CAMEL_BACKEND], [test "$enable_camel" = "yes"])
-AC_ARG_ENABLE(eplugin,
- AS_HELP_STRING([--disable-eplugin],
- [Can be used to disable compiling the Evolution config plugin. Enabled by
default.]),
- [enable_eplugin="$enableval"
- test "$enable_eplugin" = "no" || test "$have_e_plugin" = "yes" ||
AC_MSG_ERROR([evolution-plugin${EVO_PKG} not available, cannot enable eplugin])],
- [enable_eplugin="$have_e_plugin"])
-AM_CONDITIONAL([ENABLE_EPLUGIN], [test "$enable_eplugin" = "yes"])
-
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AC_CONFIG_FILES([
@@ -159,7 +150,6 @@ AC_CONFIG_FILES([
eas-daemon/data/org.meego.activesyncd.service
eas-daemon/libeas/Makefile
eas-daemon/src/Makefile
- eplugin/Makefile
collection/Makefile
configuration/Makefile
libeastest/src/Makefile
diff --git a/meego/meego-ux-settings-activesync/meego-ux-settings-activesync.qmlproject
b/meego/meego-ux-settings-activesync/meego-ux-settings-activesync.qmlproject
index 9062c6a..2bb4016 100644
--- a/meego/meego-ux-settings-activesync/meego-ux-settings-activesync.qmlproject
+++ b/meego/meego-ux-settings-activesync/meego-ux-settings-activesync.qmlproject
@@ -11,6 +11,4 @@ Project {
ImageFiles {
directory: "."
}
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ "../exampleplugin" ]
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4f1bd47..94ef0b8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,3 @@ camel/camel-eas-transport.c
camel/camel-eas-utils.c
eas-daemon/libeas/eas-connection.c
eas-daemon/libeas/eas-connection.c
-eplugin/activesync-account-setup.c
-eplugin/eas-account-listener.c
-eplugin/org-gnome-evolution-activesync.eplug.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]