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
This commit is contained in:
+1
-1
@@ -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')
|
||||
|
||||
+11
-3
@@ -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);
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ src_inc = include_directories('.')
|
||||
|
||||
gcal_deps = [
|
||||
gsettings_desktop_schemas_dep,
|
||||
libedataserverui_dep,
|
||||
#libedataserverui_dep,
|
||||
libedataserver_dep,
|
||||
libecal_dep,
|
||||
libdazzle_dep,
|
||||
|
||||
Reference in New Issue
Block a user