[evolution-data-server/wip/mcrha/gtk4] REMOVE ME: Just to make the library linkable



commit d8ec839a0b4d50e5bfeef0ee3c449deef25f914d
Author: Milan Crha <mcrha redhat com>
Date:   Tue Oct 19 11:54:14 2021 +0200

    REMOVE ME: Just to make the library linkable

 src/libedataserverui/e-credentials-prompter.c   |  3 +++
 src/libedataserverui/e-webdav-discover-widget.c | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/src/libedataserverui/e-credentials-prompter.c b/src/libedataserverui/e-credentials-prompter.c
index 3532eedf8..70739cc6e 100644
--- a/src/libedataserverui/e-credentials-prompter.c
+++ b/src/libedataserverui/e-credentials-prompter.c
@@ -1182,7 +1182,10 @@ e_credentials_prompter_class_init (ECredentialsPrompterClass *class)
 
        /* Ensure built-in credential providers implementation types */
        g_type_ensure (E_TYPE_CREDENTIALS_PROMPTER_IMPL_PASSWORD);
+       /* FIXME: Disabled until WebKitGTK with gtk4 is available */
+#if !GTK_CHECK_VERSION(4, 0, 0)
        g_type_ensure (E_TYPE_CREDENTIALS_PROMPTER_IMPL_OAUTH2);
+#endif
 }
 
 static void
diff --git a/src/libedataserverui/e-webdav-discover-widget.c b/src/libedataserverui/e-webdav-discover-widget.c
index 280014ba3..ba834a79c 100644
--- a/src/libedataserverui/e-webdav-discover-widget.c
+++ b/src/libedataserverui/e-webdav-discover-widget.c
@@ -679,7 +679,13 @@ e_webdav_discover_content_trust_prompt_done_cb (GObject *source_object,
        rd = g_task_get_task_data (task);
        cancellable = g_task_get_cancellable (task);
        source = E_SOURCE (source_object);
+#if GTK_CHECK_VERSION(4, 0, 0)
+       /* FIXME: Temporarily disabled, until gcr with gtk4 is available */
+       local_error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "No ETrustPrompt for gtk4");
+       if (local_error) {
+#else
        if (!e_trust_prompt_run_for_source_finish (source, result, &response, &local_error)) {
+#endif
                g_task_return_error (task, g_steal_pointer (&local_error));
        } else if (response == E_TRUST_PROMPT_RESPONSE_ACCEPT || response == 
E_TRUST_PROMPT_RESPONSE_ACCEPT_TEMPORARILY) {
                /* Use NULL credentials to reuse those from the last time. */
@@ -765,17 +771,19 @@ e_webdav_discover_content_refresh_done_cb (GObject *source_object,
                        GtkWidget *widget;
 
 #if GTK_CHECK_VERSION(4, 0, 0)
-                       widget = GTK_WIDGET (rd->content);
-                       while (widget && !GTK_IS_WINDOW (widget)) {
-                               widget = gtk_widget_get_parent (widget);
-                       }
+                       widget = gtk_widget_get_ancestor (GTK_WIDGET (rd->content), GTK_TYPE_WINDOW);
 #else
                        widget = gtk_widget_get_toplevel (GTK_WIDGET (rd->content));
 #endif
-                       parent = widget ? GTK_WINDOW (widget) : NULL;
+                       parent = GTK_IS_WINDOW (widget) ? GTK_WINDOW (widget) : NULL;
 
+#if GTK_CHECK_VERSION(4, 0, 0)
+                       /* FIXME: Temporarily disabled, until gcr with gtk4 is available */
+                       e_webdav_discover_content_trust_prompt_done_cb (G_OBJECT (source), NULL, 
g_steal_pointer (&task));
+#else
                        e_trust_prompt_run_for_source (parent, source, certificate_pem, certificate_errors,
                                NULL, FALSE, cancellable, e_webdav_discover_content_trust_prompt_done_cb, 
g_steal_pointer (&task));
+#endif
                } else if (g_cancellable_is_cancelled (cancellable) ||
                    (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED) &&
                    !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) &&


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