[gnome-calendar/gbsneto/gtk4: 2/37] build: Temporarily remove libedataserverui dep
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gbsneto/gtk4: 2/37] build: Temporarily remove libedataserverui dep
- Date: Wed, 26 Jan 2022 16:31:53 +0000 (UTC)
commit e22e9735bc5c8f075e90a04b789b7a8792a61c58
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Jan 10 15:15:53 2022 -0300
build: Temporarily remove libedataserverui dep
Since we'll be switching to GTK4, we can't depend on this
library which links to GTK3. There's a GTK4 port underway,
we'll reenable when it lands
meson.build | 2 +-
src/core/gcal-manager.c | 14 +++++++++++---
src/meson.build | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 63b69549..5f43828a 100644
--- a/meson.build
+++ b/meson.build
@@ -159,7 +159,7 @@ assert(cc.has_function('icaltime_days_in_year', dependencies: libical_dep),
'Error: icaltime_days_in_year() not found in libical!. Upgrade your libical library.')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>= 3.21.2')
-libedataserverui_dep = dependency('libedataserverui-1.2', version: '>= 3.17.1')
+#libedataserverui_dep = dependency('libedataserverui-1.2', version: '>= 3.17.1')
libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.17.1')
libecal_dep = dependency('libecal-2.0', version: '>= 3.33.2')
libsoup_dep = dependency('libsoup-2.4')
diff --git a/src/core/gcal-manager.c b/src/core/gcal-manager.c
index 4ac01213..e2a98653 100644
--- a/src/core/gcal-manager.c
+++ b/src/core/gcal-manager.c
@@ -26,7 +26,7 @@
#include "gcal-timeline-subscriber.h"
#include "gcal-utils.h"
-#include <libedataserverui/libedataserverui.h>
+//#include <libedataserverui/libedataserverui.h>
/**
* SECTION:gcal-manager
@@ -66,7 +66,7 @@ struct _GcalManager
GHashTable *clients;
ESourceRegistry *source_registry;
- ECredentialsPrompter *credentials_prompter;
+ //ECredentialsPrompter *credentials_prompter;
GCancellable *async_ops;
@@ -398,6 +398,8 @@ on_event_removed (GObject *source_object,
GCAL_EXIT;
}
+#if 0 /* libedataserverui */
+
static void
show_source_error (const gchar *where,
const gchar *what,
@@ -540,6 +542,8 @@ source_get_last_credentials_required_arguments_cb (GObject *source_object,
GCAL_EXIT;
}
+#endif /* libedataserverui */
+
static void
gcal_manager_finalize (GObject *object)
{
@@ -1200,7 +1204,6 @@ gcal_manager_startup (GcalManager *self)
{
GList *sources, *l;
GError *error = NULL;
- ESourceCredentialsProvider *credentials_provider;
GCAL_ENTRY;
@@ -1230,6 +1233,9 @@ gcal_manager_startup (GcalManager *self)
self,
NULL);
+#if 0 /* libedataserverui */
+ ESourceCredentialsProvider *credentials_provider;
+
self->credentials_prompter = e_credentials_prompter_new (self->source_registry);
/* First disable credentials prompt for all but calendar sources... */
@@ -1294,6 +1300,8 @@ gcal_manager_startup (GcalManager *self)
e_credentials_prompter_process_awaiting_credentials (self->credentials_prompter);
+#endif /* libedataserverui */
+
g_signal_connect_object (self->source_registry, "source-added", G_CALLBACK (load_source), self,
G_CONNECT_SWAPPED);
g_signal_connect_object (self->source_registry, "source-removed", G_CALLBACK (remove_source), self,
G_CONNECT_SWAPPED);
g_signal_connect_object (self->source_registry, "source-changed", G_CALLBACK (source_changed), self,
G_CONNECT_SWAPPED);
diff --git a/src/meson.build b/src/meson.build
index d8ac1c1b..5e2641dc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,7 +2,7 @@ src_inc = include_directories('.')
gcal_deps = [
gsettings_desktop_schemas_dep,
- libedataserverui_dep,
+ #libedataserverui_dep,
libedataserver_dep,
libecal_dep,
libdazzle_dep,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]