chore(contacts): cleanup EDS header

Remove the helper `valent-eds.h` and require EDS >= 3.48.0.
andyholmes · Oct 5, 2024 · e870cbf · e870cbf
1 parent b73338c
commit e870cbf
Show file tree

Hide file tree

Showing 28 changed files with 32 additions and 47 deletions.
diff --git 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
@@ -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
@@ -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
@@ -6,11 +6,11 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <libvalent-core.h>
 
 #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
@@ -6,7 +6,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
-#include <libvalent-core.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "valent-contact.h"

diff --git a/src/libvalent/contacts/valent-contact.h b/src/libvalent/contacts/valent-contact.h
@@ -8,8 +8,11 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
+#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
diff --git 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
@@ -8,6 +8,7 @@
 #include <inttypes.h>
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <valent.h>
 

diff --git a/src/plugins/eds/valent-ebook-adapter.c b/src/plugins/eds/valent-ebook-adapter.c
@@ -6,6 +6,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <libedataserver/libedataserver.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <valent.h>
 

diff --git a/src/plugins/eds/valent-ebook-store.c b/src/plugins/eds/valent-ebook-store.c
@@ -6,13 +6,16 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <libebook/libebook.h>
+#include <libebook-contacts/libebook-contacts.h>
+#include <libedata-book/libedata-book.h>
+#include <libedataserver/libedataserver.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <valent.h>
 
 #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
@@ -8,6 +8,7 @@
 #include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 #include "valent-contact-row.h"

diff --git a/src/plugins/gnome/valent-contact-row.c b/src/plugins/gnome/valent-contact-row.c
@@ -8,7 +8,7 @@
 #include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <pango/pango.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 #include "valent-contact-row.h"

diff --git a/src/plugins/gnome/valent-contact-row.h b/src/plugins/gnome/valent-contact-row.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 G_BEGIN_DECLS

diff --git a/src/plugins/gnome/valent-conversation-page.c b/src/plugins/gnome/valent-conversation-page.c
@@ -7,6 +7,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <valent.h>
 

diff --git a/src/plugins/gnome/valent-conversation-page.h b/src/plugins/gnome/valent-conversation-page.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <adwaita.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 G_BEGIN_DECLS

diff --git a/src/plugins/gnome/valent-conversation-row.c b/src/plugins/gnome/valent-conversation-row.c
@@ -8,6 +8,8 @@
 #include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
+#include <valent.h>
 
 #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
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 G_BEGIN_DECLS

diff --git a/src/plugins/gnome/valent-message-row.c b/src/plugins/gnome/valent-message-row.c
@@ -8,7 +8,7 @@
 #include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <pango/pango.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 #include "valent-date-label.h"

diff --git a/src/plugins/gnome/valent-message-row.h b/src/plugins/gnome/valent-message-row.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 G_BEGIN_DECLS

diff --git a/src/plugins/gnome/valent-messages-window.c b/src/plugins/gnome/valent-messages-window.c
@@ -7,9 +7,10 @@
 
 #include <inttypes.h>
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <adwaita.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 #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
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <adwaita.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 G_BEGIN_DECLS

diff --git a/src/plugins/gnome/valent-ui-utils.c b/src/plugins/gnome/valent-ui-utils.c
@@ -6,6 +6,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "valent-ui-utils-private.h"

diff --git a/tests/fixtures/valent-mock-contacts-adapter.c b/tests/fixtures/valent-mock-contacts-adapter.c
@@ -6,6 +6,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <libtracker-sparql/tracker-sparql.h>
 #include <valent.h>
 

diff --git a/tests/plugins/gnome/test-contact-row.c b/tests/plugins/gnome/test-contact-row.c
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: Andy Holmes <andrew.g.r.holmes@gmail.com>
 
 #include <gdk/gdk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 #include <libvalent-test.h>
 

diff --git a/tests/plugins/gnome/test-conversation-row.c b/tests/plugins/gnome/test-conversation-row.c
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: Andy Holmes <andrew.g.r.holmes@gmail.com>
 
 #include <gdk/gdk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 #include <libvalent-test.h>
 

diff --git a/tests/plugins/gnome/test-message-row.c b/tests/plugins/gnome/test-message-row.c
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: Andy Holmes <andrew.g.r.holmes@gmail.com>
 
 #include <gdk/gdk.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 #include <libvalent-test.h>
 

diff --git a/tests/plugins/sms/test-sms-common.h b/tests/plugins/sms/test-sms-common.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <gio/gio.h>
+#include <libebook-contacts/libebook-contacts.h>
 #include <valent.h>
 
 #include "valent-message-store.h"