Compare commits
No commits in common. 'i9-beta' and 'c9' have entirely different histories.
File diff suppressed because it is too large
Load Diff
@ -1,46 +0,0 @@
|
||||
From 7fa904c3240b16929c7262912b750d48536d07bf Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Berezhok <alexey.berezhok@softline.com>
|
||||
Date: Tue, 19 Sep 2023 17:37:54 +0300
|
||||
Subject: [PATCH] Fix bug when yandex account added not through goa
|
||||
|
||||
---
|
||||
src/libedataserver/e-oauth2-service-yandex.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service-yandex.c b/src/libedataserver/e-oauth2-service-yandex.c
|
||||
index 64ac387..492c826 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-yandex.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-yandex.c
|
||||
@@ -127,6 +127,13 @@ eos_yandex_get_refresh_uri (EOAuth2Service *service,
|
||||
return "https://oauth.yandex.ru/token";
|
||||
}
|
||||
|
||||
+static const gchar *
|
||||
+eos_yandex_get_redirect_uri (EOAuth2Service *service,
|
||||
+ ESource *source)
|
||||
+{
|
||||
+ return "http://localhost";
|
||||
+}
|
||||
+
|
||||
static void
|
||||
eos_yandex_prepare_authentication_uri_query (EOAuth2Service *service,
|
||||
ESource *source,
|
||||
@@ -139,7 +146,6 @@ eos_yandex_prepare_authentication_uri_query (EOAuth2Service *service,
|
||||
g_return_if_fail (uri_query != NULL);
|
||||
|
||||
e_oauth2_service_util_set_to_form (uri_query, "scope", YANDEX_SCOPE);
|
||||
- e_oauth2_service_util_set_to_form (uri_query, "include_granted_scopes", "false");
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@@ -199,6 +205,7 @@ e_oauth2_service_yandex_oauth2_service_init (EOAuth2ServiceInterface *iface)
|
||||
iface->get_client_secret = eos_yandex_get_client_secret;
|
||||
iface->get_authentication_uri = eos_yandex_get_authentication_uri;
|
||||
iface->get_refresh_uri = eos_yandex_get_refresh_uri;
|
||||
+ iface->get_redirect_uri = eos_yandex_get_redirect_uri;
|
||||
iface->prepare_authentication_uri_query = eos_yandex_prepare_authentication_uri_query;
|
||||
iface->extract_authorization_code = eos_yandex_extract_authorization_code;
|
||||
}
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
diff -up evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c.7 evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
|
||||
--- evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c.7 2021-08-13 11:44:41.000000000 +0200
|
||||
+++ evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c 2024-01-11 15:28:03.245950925 +0100
|
||||
@@ -573,6 +573,7 @@ e_credentials_prompter_impl_oauth2_show_
|
||||
GtkScrolledWindow *scrolled_window;
|
||||
GtkWindow *dialog_parent;
|
||||
ECredentialsPrompter *prompter;
|
||||
+ WebKitCookieManager *cookie_manager;
|
||||
WebKitSettings *webkit_settings;
|
||||
WebKitWebContext *web_context;
|
||||
gchar *title, *uri;
|
||||
@@ -725,9 +726,9 @@ e_credentials_prompter_impl_oauth2_show_
|
||||
webkit_settings = webkit_settings_new_with_settings (
|
||||
"auto-load-images", TRUE,
|
||||
"default-charset", "utf-8",
|
||||
- "enable-html5-database", FALSE,
|
||||
"enable-dns-prefetching", FALSE,
|
||||
- "enable-html5-local-storage", FALSE,
|
||||
+ "enable-html5-database", TRUE,
|
||||
+ "enable-html5-local-storage", TRUE,
|
||||
"enable-offline-web-application-cache", FALSE,
|
||||
"enable-page-cache", FALSE,
|
||||
"enable-plugins", FALSE,
|
||||
@@ -737,6 +738,9 @@ e_credentials_prompter_impl_oauth2_show_
|
||||
web_context = webkit_web_context_new ();
|
||||
webkit_web_context_set_sandbox_enabled (web_context, TRUE);
|
||||
|
||||
+ cookie_manager = webkit_web_context_get_cookie_manager (web_context);
|
||||
+ webkit_cookie_manager_set_accept_policy (cookie_manager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
|
||||
+
|
||||
widget = g_object_new (WEBKIT_TYPE_WEB_VIEW,
|
||||
"settings", webkit_settings,
|
||||
"web-context", web_context,
|
||||
@ -1,71 +0,0 @@
|
||||
diff --git a/src/services/evolution-alarm-notify/CMakeLists.txt b/src/services/evolution-alarm-notify/CMakeLists.txt
|
||||
index a4c0a41..a713797 100644
|
||||
--- a/src/services/evolution-alarm-notify/CMakeLists.txt
|
||||
+++ b/src/services/evolution-alarm-notify/CMakeLists.txt
|
||||
@@ -1,9 +1,14 @@
|
||||
set(DEPENDENCIES
|
||||
ecal
|
||||
- edataserverui
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
+ ../../libedataserverui/libedataserverui-private.h
|
||||
+ ../../libedataserverui/libedataserverui-private.c
|
||||
+ ../../libedataserverui/e-buffer-tagger.h
|
||||
+ ../../libedataserverui/e-buffer-tagger.c
|
||||
+ ../../libedataserverui/e-reminders-widget.h
|
||||
+ ../../libedataserverui/e-reminders-widget.c
|
||||
evolution-alarm-notify.c
|
||||
e-alarm-notify.h
|
||||
e-alarm-notify.c
|
||||
@@ -17,9 +22,15 @@ add_dependencies(evolution-alarm-notify
|
||||
${DEPENDENCIES}
|
||||
)
|
||||
|
||||
+# the -DLIBEDATASERVERUI_COMPILATION is a hackish way to borrow sources from
|
||||
+# the libedataserverui without depending on it (because it can be uninstalled)
|
||||
target_compile_definitions(evolution-alarm-notify PRIVATE
|
||||
-DG_LOG_DOMAIN=\"evolution-alarm-notify\"
|
||||
-DLOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
|
||||
+ -DLIBEDATASERVERUI_COMPILATION
|
||||
+ -DE_DATA_SERVER_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
|
||||
+ -DE_DATA_SERVER_UIMODULEDIR=\"${uimoduledir}\"
|
||||
+ -DE_DATA_SERVER_ICONDIR=\"${icondir}\"
|
||||
)
|
||||
|
||||
target_compile_options(evolution-alarm-notify PUBLIC
|
||||
@@ -33,6 +44,7 @@ target_include_directories(evolution-alarm-notify PUBLIC
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_BINARY_DIR}/src
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
+ ${CMAKE_SOURCE_DIR}/src/libedataserverui
|
||||
${CANBERRA_INCLUDE_DIRS}
|
||||
${DATA_SERVER_INCLUDE_DIRS}
|
||||
${GNOME_PLATFORM_INCLUDE_DIRS}
|
||||
diff --git a/src/services/evolution-alarm-notify/e-alarm-notify.c b/src/services/evolution-alarm-notify/e-alarm-notify.c
|
||||
index 5c9b479..bf53a86 100644
|
||||
--- a/src/services/evolution-alarm-notify/e-alarm-notify.c
|
||||
+++ b/src/services/evolution-alarm-notify/e-alarm-notify.c
|
||||
@@ -30,7 +30,9 @@
|
||||
#endif
|
||||
|
||||
#include "libecal/libecal.h"
|
||||
-#include "libedataserverui/libedataserverui.h"
|
||||
+
|
||||
+#include "libedataserverui/e-buffer-tagger.h"
|
||||
+#include "libedataserverui/e-reminders-widget.h"
|
||||
|
||||
#include "e-alarm-notify.h"
|
||||
|
||||
diff --git a/src/services/evolution-alarm-notify/evolution-alarm-notify.c b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
|
||||
index 5467a8d..14a13aa 100644
|
||||
--- a/src/services/evolution-alarm-notify/evolution-alarm-notify.c
|
||||
+++ b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include <libedataserver/libedataserver.h>
|
||||
-#include <libedataserverui/libedataserverui.h>
|
||||
|
||||
#include "e-alarm-notify.h"
|
||||
|
||||
Loading…
Reference in new issue