[evolution-data-server] I#34 - Remove Ubuntu Online Accounts from master
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] I#34 - Remove Ubuntu Online Accounts from master
- Date: Mon, 24 Sep 2018 15:37:28 +0000 (UTC)
commit 66121edf92f8babe8de8d970faf2155ca8824c07
Author: Milan Crha <mcrha redhat com>
Date: Mon Sep 24 16:00:14 2018 +0200
I#34 - Remove Ubuntu Online Accounts from master
It had been moved to https://gitlab.com/accounts-sso/evolution-data-server-signon
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/34
CMakeLists.txt | 16 -
config.h.in | 3 -
po/POTFILES.in | 13 -
po/POTFILES.skip | 3 -
src/modules/CMakeLists.txt | 4 -
src/modules/ubuntu-online-accounts/CMakeLists.txt | 158 ---
.../calendar.service-type.in.in | 7 -
.../contacts.service-type.in.in | 8 -
.../e-signon-session-password.c | 513 ---------
.../e-signon-session-password.h | 65 --
.../evolution-data-server-uoa.desktop.in.in | 10 -
.../evolution-data-server.application.in.in | 26 -
.../google-calendar.service.in.in | 25 -
.../google-contacts.service.in.in | 25 -
.../google-gmail.service.in.in | 25 -
.../ubuntu-online-accounts/mail.service-type.in.in | 7 -
.../module-credentials-uoa.c | 35 -
.../module-ubuntu-online-accounts.c | 1201 --------------------
src/modules/ubuntu-online-accounts/uoa-utils.c | 631 ----------
src/modules/ubuntu-online-accounts/uoa-utils.h | 47 -
.../windows-live-mail.service.in.in | 10 -
.../yahoo-calendar.service.in.in | 15 -
.../yahoo-mail.service.in.in | 15 -
23 files changed, 2862 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3802639c..d34dd5503 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,6 @@ set(GETTEXT_PO_DIR ${CMAKE_SOURCE_DIR}/po)
# Required for 'disttest' and 'ditcheck' of DistTarget module
set(PROJECT_DISTCONFIGURE_PARAMS
-DENABLE_GOA=ON
- -DENABLE_UOA=ON
-DENABLE_EXAMPLES=ON
-DENABLE_INTROSPECTION=ON
-DENABLE_VALA_BINDINGS=ON
@@ -440,21 +439,6 @@ if(ENABLE_GOA)
set(HAVE_GOA 1)
endif(ENABLE_GOA)
-# ********************************
-# Check for Ubuntu Online Accounts
-# ********************************
-
-add_printable_option(ENABLE_UOA "Enable Ubuntu Online Accounts support" ON)
-
-if(ENABLE_UOA)
- pkg_check_modules_for_option(ENABLE_UOA "Ubuntu Online Accounts support" LIBACCOUNTS_GLIB
libaccounts-glib>=${libaccounts_glib_minimum_version})
- pkg_check_modules_for_option(ENABLE_UOA "Ubuntu Online Accounts support" LIBSIGNON_GLIB
libsignon-glib>=${libsignon_glib_minimum_version})
- pkg_check_modules_for_option(ENABLE_UOA "Ubuntu Online Accounts support" JSON_GLIB json-glib-1.0)
- pkg_check_modules_for_option(ENABLE_UOA "Ubuntu Online Accounts support" REST rest-0.7)
-
- set(HAVE_UOA 1)
-endif(ENABLE_UOA)
-
# **********************************************
# Check if backend per process should be enabled
# **********************************************
diff --git a/config.h.in b/config.h.in
index b6e961aee..fe3b5cb5c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -197,9 +197,6 @@
#define O_LARGEFILE 0
#endif /* HAVE_O_LARGEFILE */
-/* Have libaccounts-glib */
-#cmakedefine HAVE_UOA 1
-
/* gweather_info_new() has only one argument */
#cmakedefine HAVE_ONE_ARG_GWEATHER_INFO_NEW 1
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 286c7c310..02a78215e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -221,19 +221,6 @@ src/modules/gnome-online-accounts/module-gnome-online-accounts.c
src/modules/google-backend/module-google-backend.c
src/modules/trust-prompt/module-trust-prompt.c
src/modules/trust-prompt/trust-prompt-gtk.c
-[type: gettext/xml]src/modules/ubuntu-online-accounts/calendar.service-type.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/contacts.service-type.in.in
-src/modules/ubuntu-online-accounts/e-signon-session-password.c
-src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/google-calendar.service.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/google-contacts.service.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/google-gmail.service.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/mail.service-type.in.in
-src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
-src/modules/ubuntu-online-accounts/uoa-utils.c
-[type: gettext/xml]src/modules/ubuntu-online-accounts/windows-live-mail.service.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in
-[type: gettext/xml]src/modules/ubuntu-online-accounts/yahoo-mail.service.in.in
src/modules/yahoo-backend/module-yahoo-backend.c
src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
src/services/evolution-alarm-notify/e-alarm-notify.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1513d9f5f..12ca68ace 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -11,7 +11,4 @@ src/camel/providers/nntp/test-newsrc.c
src/examples/cursor/cursor-example.ui
src/examples/cursor/cursor-search.ui
src/examples/cursor/cursor-slot.ui
-src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in
-src/modules/ubuntu-online-accounts/google-contacts.service.in
-src/modules/ubuntu-online-accounts/google-gmail.service.in
src/servers/exchange/lib/e2k-user-dialog.c
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 7fb343877..d43357c07 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -80,10 +80,6 @@ if(HAVE_GOA)
add_subdirectory(gnome-online-accounts)
endif(HAVE_GOA)
-if(HAVE_UOA)
- add_subdirectory(ubuntu-online-accounts)
-endif(HAVE_UOA)
-
if(NOT WIN32)
add_subdirectory(secret-monitor)
endif(NOT WIN32)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]