diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/core/gcal-manager.c | 14 | ||||
| -rw-r--r-- | src/gui/calendar-management/gcal-calendar-management-dialog.c | 1 | ||||
| -rw-r--r-- | src/meson.build | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 2ea5f5ff..4b856cc2 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.45.1') +libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.45.1') libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.45.1') libecal_dep = dependency('libecal-2.0', version: '>= 3.45.1') libsoup_dep = dependency('libsoup-3.0') diff --git a/src/core/gcal-manager.c b/src/core/gcal-manager.c index c594829e..c5c54d36 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 <libedataserverui4/libedataserverui4.h> /** * SECTION:gcal-manager @@ -67,7 +67,7 @@ struct _GcalManager GListStore *calendars_model; ESourceRegistry *source_registry; - //ECredentialsPrompter *credentials_prompter; + ECredentialsPrompter *credentials_prompter; GCancellable *async_ops; @@ -437,8 +437,6 @@ on_event_removed (GObject *source_object, GCAL_EXIT; } -#if 0 /* libedataserverui */ - static void show_source_error (const gchar *where, const gchar *what, @@ -581,8 +579,6 @@ source_get_last_credentials_required_arguments_cb (GObject *source_object, GCAL_EXIT; } -#endif /* libedataserverui */ - static void gcal_manager_finalize (GObject *object) { @@ -1260,6 +1256,7 @@ gcal_manager_get_synchronizing (GcalManager *self) void gcal_manager_startup (GcalManager *self) { + ESourceCredentialsProvider *credentials_provider; GList *sources, *l; GError *error = NULL; @@ -1291,9 +1288,6 @@ 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... */ @@ -1358,8 +1352,6 @@ 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/gui/calendar-management/gcal-calendar-management-dialog.c b/src/gui/calendar-management/gcal-calendar-management-dialog.c index b480b926..fc11f384 100644 --- a/src/gui/calendar-management/gcal-calendar-management-dialog.c +++ b/src/gui/calendar-management/gcal-calendar-management-dialog.c @@ -28,7 +28,6 @@ #include "gcal-utils.h" #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> #include <libsoup/soup.h> /** diff --git a/src/meson.build b/src/meson.build index 0b58297d..88e62ca6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,7 +3,7 @@ src_inc = include_directories('.') gcal_deps = [ libadwaita_dep, gsettings_desktop_schemas_dep, - #libedataserverui_dep, + libedataserverui_dep, libedataserver_dep, libecal_dep, libsoup_dep, |