From e870cbfd5a1f15e6ac8550500aefe8ea6d2c4539 Mon Sep 17 00:00:00 2001 From: Andy Holmes Date: Fri, 4 Oct 2024 17:15:37 -0700 Subject: [PATCH] chore(contacts): cleanup EDS header Remove the helper `valent-eds.h` and require EDS >= 3.48.0. --- meson.build | 2 +- src/libvalent/contacts/libvalent-contacts.h | 1 - src/libvalent/contacts/meson.build | 2 +- src/libvalent/contacts/valent-contact-list.c | 2 +- src/libvalent/contacts/valent-contact.c | 2 +- src/libvalent/contacts/valent-contact.h | 3 ++ src/libvalent/contacts/valent-eds.h | 37 ------------------- src/libvalent/valent.h | 1 - src/plugins/contacts/valent-contacts-device.c | 1 + src/plugins/eds/valent-ebook-adapter.c | 1 + src/plugins/eds/valent-ebook-store.c | 5 ++- src/plugins/gnome/valent-contact-page.c | 1 + src/plugins/gnome/valent-contact-row.c | 2 +- src/plugins/gnome/valent-contact-row.h | 1 + src/plugins/gnome/valent-conversation-page.c | 1 + src/plugins/gnome/valent-conversation-page.h | 1 + src/plugins/gnome/valent-conversation-row.c | 2 + src/plugins/gnome/valent-conversation-row.h | 1 + src/plugins/gnome/valent-message-row.c | 2 +- src/plugins/gnome/valent-message-row.h | 1 + src/plugins/gnome/valent-messages-window.c | 3 +- src/plugins/gnome/valent-ui-utils-private.h | 1 + src/plugins/gnome/valent-ui-utils.c | 1 + tests/fixtures/valent-mock-contacts-adapter.c | 1 + tests/plugins/gnome/test-contact-row.c | 1 + tests/plugins/gnome/test-conversation-row.c | 1 + tests/plugins/gnome/test-message-row.c | 1 + tests/plugins/sms/test-sms-common.h | 1 + 28 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 src/libvalent/contacts/valent-eds.h diff --git a/meson.build b/meson.build index 5dc0f85e62..52202a7a90 100644 --- a/meson.build +++ b/meson.build @@ -160,7 +160,7 @@ gtk_version = '>= 4.10.0' gnutls_version = '>= 3.1.3' json_glib_version = '>= 1.6.0' libpeas_version = '>= 2.0.0' -eds_version = '>= 3.34' +eds_version = '>= 3.48' libadwaita_version = '>= 1.5' libportal_version = ['>= 0.7.1'] tinysparql_version = '>= 3.0' diff --git a/src/libvalent/contacts/libvalent-contacts.h b/src/libvalent/contacts/libvalent-contacts.h index 9b98269327..6cd4a7dde4 100644 --- a/src/libvalent/contacts/libvalent-contacts.h +++ b/src/libvalent/contacts/libvalent-contacts.h @@ -7,7 +7,6 @@ G_BEGIN_DECLS #include "valent-contacts.h" #include "valent-contacts-adapter.h" -#include "valent-eds.h" #include "valent-contact.h" G_END_DECLS diff --git a/src/libvalent/contacts/meson.build b/src/libvalent/contacts/meson.build index df14be04bd..c5d177689b 100644 --- a/src/libvalent/contacts/meson.build +++ b/src/libvalent/contacts/meson.build @@ -11,7 +11,6 @@ libvalent_contacts_generated_sources = [] libvalent_contacts_public_headers = [ 'valent-contacts.h', 'valent-contacts-adapter.h', - 'valent-eds.h', 'valent-contact.h', ] @@ -48,6 +47,7 @@ libvalent_contacts_generated_headers += [libvalent_contacts_resources[1]] # Dependencies libvalent_deps += [ libebook_dep, + tinysparql_dep, ] diff --git a/src/libvalent/contacts/valent-contact-list.c b/src/libvalent/contacts/valent-contact-list.c index d45c755eac..6a3d55c677 100644 --- a/src/libvalent/contacts/valent-contact-list.c +++ b/src/libvalent/contacts/valent-contact-list.c @@ -6,11 +6,11 @@ #include "config.h" #include +#include #include #include #include "valent-contacts.h" -#include "valent-eds.h" #include "valent-contact.h" #include "valent-contact-list.h" diff --git a/src/libvalent/contacts/valent-contact.c b/src/libvalent/contacts/valent-contact.c index 8dc005180e..06b4fa6268 100644 --- a/src/libvalent/contacts/valent-contact.c +++ b/src/libvalent/contacts/valent-contact.c @@ -6,7 +6,7 @@ #include "config.h" #include -#include +#include #include #include "valent-contact.h" diff --git a/src/libvalent/contacts/valent-contact.h b/src/libvalent/contacts/valent-contact.h index 04ed1680ba..39b9c442e9 100644 --- a/src/libvalent/contacts/valent-contact.h +++ b/src/libvalent/contacts/valent-contact.h @@ -8,8 +8,11 @@ #endif #include +#include #include +#include "../core/valent-version.h" + G_BEGIN_DECLS VALENT_AVAILABLE_IN_1_0 diff --git a/src/libvalent/contacts/valent-eds.h b/src/libvalent/contacts/valent-eds.h deleted file mode 100644 index f0ce80ebeb..0000000000 --- a/src/libvalent/contacts/valent-eds.h +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -// SPDX-FileCopyrightText: Andy Holmes - -#pragma once - -#if !defined (VALENT_INSIDE) && !defined (VALENT_COMPILATION) -# error "Only can be included directly." -#endif - -#include - -/* - * Silence deprecation warnings - */ -#define EDS_DISABLE_DEPRECATED -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -#include -#include -#include -#include - -G_GNUC_END_IGNORE_DEPRECATIONS - - -/* - * Autocleanups - */ -#if !(EDS_CHECK_VERSION(3,47,0)) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EBookBackendFactory, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EBookClientView, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EBookQuery, e_book_query_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EContact, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EContactPhoto, e_contact_photo_free) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (EVCardAttribute, e_vcard_attribute_free) -#endif /* !(EDS_CHECK_VERSION(3,47,0)) */ - diff --git a/src/libvalent/valent.h b/src/libvalent/valent.h index 924088134c..ca772788fe 100644 --- a/src/libvalent/valent.h +++ b/src/libvalent/valent.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS #include "contacts/valent-contacts.h" #include "contacts/valent-contacts-adapter.h" -#include "contacts/valent-eds.h" #include "contacts/valent-contact.h" #include "input/valent-input.h" diff --git a/src/plugins/contacts/valent-contacts-device.c b/src/plugins/contacts/valent-contacts-device.c index 841c110fce..2e98b9e602 100644 --- a/src/plugins/contacts/valent-contacts-device.c +++ b/src/plugins/contacts/valent-contacts-device.c @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/src/plugins/eds/valent-ebook-adapter.c b/src/plugins/eds/valent-ebook-adapter.c index c18a7505fb..d2be201f10 100644 --- a/src/plugins/eds/valent-ebook-adapter.c +++ b/src/plugins/eds/valent-ebook-adapter.c @@ -6,6 +6,7 @@ #include "config.h" #include +#include #include #include diff --git a/src/plugins/eds/valent-ebook-store.c b/src/plugins/eds/valent-ebook-store.c index 03325e5b90..532eccc13e 100644 --- a/src/plugins/eds/valent-ebook-store.c +++ b/src/plugins/eds/valent-ebook-store.c @@ -6,13 +6,16 @@ #include "config.h" #include +#include +#include +#include +#include #include #include #include "valent-ebook-store.h" #define WAIT_FOR_CONNECTED_TIMEOUT 30 -#define ALL_CONTACTS_SEXP "(exists 'tel')" struct _ValentEBookStore diff --git a/src/plugins/gnome/valent-contact-page.c b/src/plugins/gnome/valent-contact-page.c index fcb1c15c6b..debf730cc5 100644 --- a/src/plugins/gnome/valent-contact-page.c +++ b/src/plugins/gnome/valent-contact-page.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "valent-contact-row.h" diff --git a/src/plugins/gnome/valent-contact-row.c b/src/plugins/gnome/valent-contact-row.c index f4d08c085c..cb5fbcd9fc 100644 --- a/src/plugins/gnome/valent-contact-row.c +++ b/src/plugins/gnome/valent-contact-row.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include "valent-contact-row.h" diff --git a/src/plugins/gnome/valent-contact-row.h b/src/plugins/gnome/valent-contact-row.h index 3aab28d5c8..73d6f21efd 100644 --- a/src/plugins/gnome/valent-contact-row.h +++ b/src/plugins/gnome/valent-contact-row.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include G_BEGIN_DECLS diff --git a/src/plugins/gnome/valent-conversation-page.c b/src/plugins/gnome/valent-conversation-page.c index 1b54e27337..ecb5f383c9 100644 --- a/src/plugins/gnome/valent-conversation-page.c +++ b/src/plugins/gnome/valent-conversation-page.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/plugins/gnome/valent-conversation-page.h b/src/plugins/gnome/valent-conversation-page.h index 3bfbf24aed..324cad4a4a 100644 --- a/src/plugins/gnome/valent-conversation-page.h +++ b/src/plugins/gnome/valent-conversation-page.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include G_BEGIN_DECLS diff --git a/src/plugins/gnome/valent-conversation-row.c b/src/plugins/gnome/valent-conversation-row.c index 89c7839d36..47ffb0e49f 100644 --- a/src/plugins/gnome/valent-conversation-row.c +++ b/src/plugins/gnome/valent-conversation-row.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "valent-date-label.h" #include "valent-ui-utils-private.h" diff --git a/src/plugins/gnome/valent-conversation-row.h b/src/plugins/gnome/valent-conversation-row.h index 209a7e4068..49fa9cc27d 100644 --- a/src/plugins/gnome/valent-conversation-row.h +++ b/src/plugins/gnome/valent-conversation-row.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include G_BEGIN_DECLS diff --git a/src/plugins/gnome/valent-message-row.c b/src/plugins/gnome/valent-message-row.c index f5e348db13..7f3d61bba4 100644 --- a/src/plugins/gnome/valent-message-row.c +++ b/src/plugins/gnome/valent-message-row.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include "valent-date-label.h" diff --git a/src/plugins/gnome/valent-message-row.h b/src/plugins/gnome/valent-message-row.h index d2c2c7cf52..a98c0d0331 100644 --- a/src/plugins/gnome/valent-message-row.h +++ b/src/plugins/gnome/valent-message-row.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include G_BEGIN_DECLS diff --git a/src/plugins/gnome/valent-messages-window.c b/src/plugins/gnome/valent-messages-window.c index 18603ee9af..7e4693f79f 100644 --- a/src/plugins/gnome/valent-messages-window.c +++ b/src/plugins/gnome/valent-messages-window.c @@ -7,9 +7,10 @@ #include +#include #include #include -#include +#include #include #include "valent-contact-page.h" diff --git a/src/plugins/gnome/valent-ui-utils-private.h b/src/plugins/gnome/valent-ui-utils-private.h index aae75f9432..85595b4e0f 100644 --- a/src/plugins/gnome/valent-ui-utils-private.h +++ b/src/plugins/gnome/valent-ui-utils-private.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include G_BEGIN_DECLS diff --git a/src/plugins/gnome/valent-ui-utils.c b/src/plugins/gnome/valent-ui-utils.c index 38f0bf1f59..96d660d0c0 100644 --- a/src/plugins/gnome/valent-ui-utils.c +++ b/src/plugins/gnome/valent-ui-utils.c @@ -6,6 +6,7 @@ #include "config.h" #include +#include #include #include "valent-ui-utils-private.h" diff --git a/tests/fixtures/valent-mock-contacts-adapter.c b/tests/fixtures/valent-mock-contacts-adapter.c index 3a75ba381f..78132d3e9c 100644 --- a/tests/fixtures/valent-mock-contacts-adapter.c +++ b/tests/fixtures/valent-mock-contacts-adapter.c @@ -6,6 +6,7 @@ #include "config.h" #include +#include #include #include diff --git a/tests/plugins/gnome/test-contact-row.c b/tests/plugins/gnome/test-contact-row.c index 8d1feacb4b..0123028470 100644 --- a/tests/plugins/gnome/test-contact-row.c +++ b/tests/plugins/gnome/test-contact-row.c @@ -2,6 +2,7 @@ // SPDX-FileCopyrightText: Andy Holmes #include +#include #include #include diff --git a/tests/plugins/gnome/test-conversation-row.c b/tests/plugins/gnome/test-conversation-row.c index 991cae75bf..bb320a6f5c 100644 --- a/tests/plugins/gnome/test-conversation-row.c +++ b/tests/plugins/gnome/test-conversation-row.c @@ -2,6 +2,7 @@ // SPDX-FileCopyrightText: Andy Holmes #include +#include #include #include diff --git a/tests/plugins/gnome/test-message-row.c b/tests/plugins/gnome/test-message-row.c index 53968fd18c..6b688b098e 100644 --- a/tests/plugins/gnome/test-message-row.c +++ b/tests/plugins/gnome/test-message-row.c @@ -2,6 +2,7 @@ // SPDX-FileCopyrightText: Andy Holmes #include +#include #include #include diff --git a/tests/plugins/sms/test-sms-common.h b/tests/plugins/sms/test-sms-common.h index dd809287dc..20bfadf66d 100644 --- a/tests/plugins/sms/test-sms-common.h +++ b/tests/plugins/sms/test-sms-common.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include "valent-message-store.h"