[evolution] Remove backward-compatibility cruft for goa-1.0 < 3.8.



commit d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Apr 16 13:51:06 2013 -0400

    Remove backward-compatibility cruft for goa-1.0 < 3.8.
    
    In particular, GOA's Google provider uses OAuth 2.0 now, so we can drop
    the OAuth 1.0a support in CamelSaslXOAuth which was GMail-specific, and
    with it the entire "online-accounts" module in Evolution.  Evolution no
    longer links to libgoa-1.0 at all.

 NEWS                                               |   6 +-
 configure.ac                                       |  19 -
 modules/Makefile.am                                |   5 -
 modules/online-accounts/Makefile.am                |  34 --
 modules/online-accounts/camel-sasl-xoauth.c        | 423 ---------------------
 modules/online-accounts/camel-sasl-xoauth.h        |  63 ---
 .../online-accounts/evolution-online-accounts.c    |  35 --
 7 files changed, 5 insertions(+), 580 deletions(-)
---
diff --git a/NEWS b/NEWS
index b766350..182adaa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,14 @@
-Evolution 3.9.1 2013-04-??
+Evolution 3.9.1 2013-04-29
 --------------------------
 
 * The Express Mode feature developed for MeeGo has been removed.
   The MeeGo project is long dead and the Express Mode feature has
   been unmaintained quite for some time.  It served its purpose.
 
+* Dependency change: Evolution no longer links to libgoa-1.0.
+  GNOME Online Accounts support is now contained entirely within
+  Evolution-Data-Server.
+
 
 Evolution 3.7.92 2013-03-18
 ---------------------------
diff --git a/configure.ac b/configure.ac
index 414b2cf..496da14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ m4_define([champlain_minimum_version], [0.12])
 m4_define([clutter_gtk_minimum_version], [0.90])
 m4_define([geoclue_minimum_version], [0.12.0])
 m4_define([gladeui_minimum_version], [3.10.0])
-m4_define([goa_minimum_version], [3.2])
 m4_define([gweather_minimum_version], [3.5.0])
 m4_define([libcanberra_gtk_minimum_version], [0.25])
 m4_define([libnotify_minimum_version], [0.7])
@@ -1060,23 +1059,6 @@ fi
 AM_CONDITIONAL([ENABLE_TNEF], [test "$tnef_ok" = "yes"])
 AC_SUBST(TNEF_CFLAGS)
 
-dnl *******************************
-dnl Check for GNOME Online Accounts
-dnl *******************************
-AC_ARG_ENABLE([goa],
-       [AS_HELP_STRING([--enable-goa],
-       [enable GNOME Online Accounts support (default=yes)])],
-       [enable_goa=$enableval], [enable_goa=yes])
-AC_MSG_CHECKING([if GNOME Online Accounts support is enabled])
-AC_MSG_RESULT([$enable_goa])
-if test "x$enable_goa" = xyes; then
-       PKG_CHECK_MODULES([GOA], [goa-1.0 >= goa_minimum_version],,
-       [AC_MSG_ERROR([goa-1.0 not found (or version < goa_minimum_version),
-       If you want to disable GNOME Online Accounts support,
-       please append --disable-goa to configure.])])
-fi
-AM_CONDITIONAL([ENABLE_ONLINE_ACCOUNTS], [test "x$enable_goa" = xyes])
-
 if test "x$mozilla_nss" != "x"; then
        EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)
        MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss`
@@ -1658,7 +1640,6 @@ modules/composer-autosave/Makefile
 modules/mail-config/Makefile
 modules/mailto-handler/Makefile
 modules/mdn/Makefile
-modules/online-accounts/Makefile
 modules/offline-alert/Makefile
 modules/plugin-lib/Makefile
 modules/plugin-manager/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5491a60..984ad01 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,10 +10,6 @@ if ENABLE_WEATHER
 CONFIG_WEATHER_DIR = cal-config-weather
 endif
 
-if ENABLE_ONLINE_ACCOUNTS
-ONLINE_ACCOUNTS_DIR = online-accounts
-endif
-
 if ENABLE_SPAMASSASSIN
 SPAMASSASSIN_DIR = spamassassin
 endif
@@ -59,7 +55,6 @@ SUBDIRS = \
        vcard-inline \
        web-inspector \
        $(BOGOFILTER_DIR) \
-       $(ONLINE_ACCOUNTS_DIR) \
        $(SPAMASSASSIN_DIR) \
        $(TNEF_ATTACHMENT_DIR) \
        $(AUDIO_INLINE_DIR) \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]