diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-13 08:40:39 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-13 09:03:47 +0800 |
| commit | 1c7c5557bfc87ec7e77720736494fa722ea764f8 (patch) | |
| tree | 6f78b974e0cbdf62bf37c518438770b1e38e1e48 | |
| parent | 6c903c5ef1c63d104a73adf0cd2c6282d5167065 (diff) | |
| download | gsoc2013-evolution-1c7c5557bfc87ec7e77720736494fa722ea764f8.tar.gz gsoc2013-evolution-1c7c5557bfc87ec7e77720736494fa722ea764f8.tar.zst gsoc2013-evolution-1c7c5557bfc87ec7e77720736494fa722ea764f8.zip | |
Require libgdata >= 0.10.
Drop all the backward-compatibility cruft.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | plugins/google-account-setup/google-source.c | 9 |
2 files changed, 2 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 746bcc10b0..93f03bb8c6 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ m4_define([gnome_desktop_minimum_version], [2.91.3]) m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess +m4_define([libgdata_minimum_version], [0.10]) m4_define([libsoup_minimum_version], [2.31.2]) m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) @@ -1248,14 +1249,10 @@ PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version]) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -PKG_CHECK_MODULES([GDATA], [libgdata >= 0.7.0]) +PKG_CHECK_MODULES([GDATA], [libgdata >= libgdata_minimum_version]) AC_SUBST(GDATA_CFLAGS) AC_SUBST(GDATA_LIBS) -if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then - AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) -fi - dnl **************************** dnl Check for ical_set_unknown_token_handling_setting function dnl **************************** diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index e8d3f5a410..a9785ad844 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -434,9 +434,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) { ESource *source; - #ifdef HAVE_LIBGDATA_0_9 GDataClientLoginAuthorizer *authorizer; - #endif GDataCalendarService *service; GDataFeed *feed; gchar *user, *password, *tmp; @@ -467,14 +465,9 @@ retrieve_list_clicked (GtkButton *button, return; } - #ifdef HAVE_LIBGDATA_0_9 authorizer = gdata_client_login_authorizer_new ("evolution-client-0.1.0", GDATA_TYPE_CALENDAR_SERVICE); service = gdata_calendar_service_new (GDATA_AUTHORIZER (authorizer)); if (!gdata_client_login_authorizer_authenticate (authorizer, user, password, NULL, &error)) { - #else - service = gdata_calendar_service_new ("evolution-client-0.1.0"); - if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) { - #endif /* Error! */ claim_error (parent, error->message); g_error_free (error); @@ -584,9 +577,7 @@ retrieve_list_clicked (GtkButton *button, } g_object_unref (service); - #ifdef HAVE_LIBGDATA_0_9 g_object_unref (authorizer); - #endif g_free (user); } |