GNOME.org
 

[evolution] Bug #456240 - Move exchange plugin to exchange package

commit cdd5f2c71152dcbc13c98f67914d30918b5791ee
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 2 15:04:36 2009 +0200

    Bug #456240 - Move exchange plugin to exchange package
    
    Also added gtkhtml-editor and libgnomecanvas-2.0 to evolution-plugin.pc

 configure.ac                                       |   28 +-
 evolution-plugin.pc.in                             |    2 +-
 plugins/exchange-operations/ChangeLog              | 1874 --------------------
 plugins/exchange-operations/Makefile.am            |   68 -
 .../exchange-operations/exchange-account-setup.c   | 1150 ------------
 plugins/exchange-operations/exchange-calendar.c    |  539 ------
 .../exchange-operations/exchange-change-password.c |  194 --
 .../exchange-operations/exchange-change-password.h |   33 -
 .../exchange-operations/exchange-config-listener.c | 1520 ----------------
 .../exchange-operations/exchange-config-listener.h |   84 -
 plugins/exchange-operations/exchange-contacts.c    |  548 ------
 .../exchange-operations/exchange-delegates-user.c  |  628 -------
 .../exchange-operations/exchange-delegates-user.h  |   81 -
 plugins/exchange-operations/exchange-delegates.c   | 1027 -----------
 plugins/exchange-operations/exchange-delegates.h   |   34 -
 .../exchange-folder-permission.c                   |  527 ------
 .../exchange-folder-size-display.c                 |  170 --
 .../exchange-folder-size-display.h                 |   33 -
 .../exchange-folder-subscription.c                 |  380 ----
 .../exchange-folder-subscription.h                 |   34 -
 plugins/exchange-operations/exchange-folder.c      |  420 -----
 .../exchange-mail-send-options.c                   |  196 --
 plugins/exchange-operations/exchange-operations.c  |  305 ----
 plugins/exchange-operations/exchange-operations.h  |   56 -
 .../exchange-permissions-dialog.c                  |  984 ----------
 .../exchange-permissions-dialog.h                  |   56 -
 .../exchange-operations/exchange-send-options.c    |  623 -------
 .../exchange-operations/exchange-send-options.h    |   83 -
 plugins/exchange-operations/exchange-user-dialog.c |  285 ---
 plugins/exchange-operations/exchange-user-dialog.h |   56 -
 .../org-gnome-exchange-operations.eplug.xml        |  120 --
 .../org-gnome-exchange-operations.error.xml        |  263 ---
 po/POTFILES.in                                     |   16 -
 po/POTFILES.skip                                   |    1 -
 34 files changed, 2 insertions(+), 12416 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 603aeb7..f937be9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1574,7 +1574,7 @@ dnl Add any new plugins here
 plugins_base_always="calendar-file calendar-http itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features publish-calendar caldav imap-features google-account-setup webdav-account-setup"
 
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN"
-dist_plugins_base="$plugins_base_always calendar-weather exchange-operations sa-junk-plugin bogo-junk-plugin"
+dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin"
 
 plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline"
 
@@ -1647,31 +1647,6 @@ if test "x$enable_weather" = "xyes"; then
 	fi
 fi
 
-dnl ***********************************************************
-dnl exchange-operations plugin requires libexchange-storage-1.2
-dnl ***********************************************************
-AC_ARG_ENABLE([exchange],
-	[AS_HELP_STRING([--enable-exchange],
-	[Build Exchange plugins @<:@default=yes@:>@])],
-	[enable_exchange="$enableval"], [enable_exchange=yes])
-
-if test "x$enable_exchange" = "xyes"; then
-	PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version,
-	have_libexchange="yes", have_libexchange="no")
-
-	if test "x$have_libexchange" = "xyes"; then
-		AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
-		AC_SUBST(CAMEL_EXCHANGE_LIBS)
-		msg_exchange="yes"
-		plugins_base="$plugins_base exchange-operations"
-		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE
-		libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE)
-	else
-		msg_exchange="no"
-		AC_MSG_ERROR([libevolution-exchange-$EDS_PACKAGE is required for the exchange-operations plugin.  Use --disable-exchange to exclude the plugin.])
-	fi
-fi
-
 dnl *********************************
 dnl pst-import plugin requires libpst
 dnl *********************************
@@ -1887,7 +1862,6 @@ plugins/calendar-weather/Makefile
 plugins/default-mailer/Makefile
 plugins/default-source/Makefile
 plugins/email-custom-header/Makefile
-plugins/exchange-operations/Makefile
 plugins/external-editor/Makefile
 plugins/face/Makefile
 plugins/google-account-setup/Makefile
diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in
index c7fe785..13aae35 100644
--- a/evolution-plugin.pc.in
+++ b/evolution-plugin.pc.in
@@ -15,6 +15,6 @@ errordir= privdatadir@/errors
 Name: evolution-plugin
 Description: libraries needed for Evolution plugin development
 Version: @VERSION@
-Requires: camel-provider-1.2 libxml-2.0 unique-1.0 libgtkhtml-3.14
+Requires: camel-provider-1.2 libxml-2.0 unique-1.0 libgtkhtml-3.14 gtkhtml-editor libgnomecanvas-2.0
 Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
 Cflags: -I${privincludedir}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9bc3a7c..070f492 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -306,22 +306,6 @@ plugins/email-custom-header/email-custom-header.c
 plugins/email-custom-header/email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
 plugins/email-custom-header/org-gnome-email-custom-header.glade
-plugins/exchange-operations/exchange-account-setup.c
-plugins/exchange-operations/exchange-calendar.c
-plugins/exchange-operations/exchange-change-password.c
-plugins/exchange-operations/exchange-config-listener.c
-plugins/exchange-operations/exchange-contacts.c
-plugins/exchange-operations/exchange-delegates-user.c
-plugins/exchange-operations/exchange-delegates.c
-plugins/exchange-operations/exchange-folder-permission.c
-plugins/exchange-operations/exchange-folder-size-display.c
-plugins/exchange-operations/exchange-folder-subscription.c
-plugins/exchange-operations/exchange-folder.c
-plugins/exchange-operations/exchange-permissions-dialog.c
-plugins/exchange-operations/exchange-send-options.c
-plugins/exchange-operations/exchange-user-dialog.c
-plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
-plugins/exchange-operations/org-gnome-exchange-operations.error.xml
 plugins/external-editor/apps-evolution-external-editor.schemas.in
 plugins/external-editor/external-editor.c
 plugins/external-editor/org-gnome-external-editor.eplug.xml
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 73865ab..489b771 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -23,7 +23,6 @@ mail/em-folder-view.c
 mail/importers/evolution-outlook-importer.c
 mail/importers/netscape-importer.c
 mail/message-tags.glade
-plugins/exchange-operations/exchange-operations.c
 plugins/groupwise-features/groupwise-account-setup.c
 plugins/ipod-sync/sync.c
 plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]