[folks/wip/tintou/eds-fixes] Conditionally build for EDS<3.41
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks/wip/tintou/eds-fixes] Conditionally build for EDS<3.41
- Date: Tue, 8 Jun 2021 10:24:34 +0000 (UTC)
commit 03867cb9da139ea948a327179b6e25946e816517
Author: Corentin Noël <corentin noel collabora com>
Date: Tue Jun 8 12:13:12 2021 +0200
Conditionally build for EDS<3.41
Keep support for previous versions. We need to cast GLib.List into GLib.SList as the binding was wrong
and EDS was using a GLib.SList anyway.
backends/eds/lib/edsf-persona-store.vala | 25 +++++++++++++++++++++++++
backends/eds/lib/meson.build | 4 ++++
2 files changed, 29 insertions(+)
---
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 83ccb7cf..2193c0ed 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -1224,7 +1224,11 @@ public class Edsf.PersonaStore : Folks.PersonaStore
signal_id = ((!) this._ebookview).objects_added.connect (
(_contacts) =>
{
+#if HAS_EDS_3_41
GLib.SList<E.Contact> contacts = _contacts.copy_deep ((GLib.CopyFunc<E.Contact>)
GLib.Object.ref);
+#else
+ GLib.SList<E.Contact> contacts = ((GLib.SList<E.Contact>) _contacts).copy_deep
((GLib.CopyFunc<E.Contact>) GLib.Object.ref);
+#endif
/* All handlers for objects-added have to be pushed through the
* idle queue so they remain in order with respect to each other
@@ -2438,8 +2442,15 @@ public class Edsf.PersonaStore : Folks.PersonaStore
}
}
+#if HAS_EDS_3_41
private void _contacts_added_cb (GLib.SList<E.Contact> contacts)
{
+#else
+ // The binding was using the wrong list type
+ private void _contacts_added_cb (GLib.List<E.Contact> _contacts)
+ {
+ unowned GLib.SList<E.Contact> contacts = (GLib.SList<E.Contact>)_contacts;
+#endif
GLib.SList<E.Contact> copy = contacts.copy_deep ((GLib.CopyFunc<E.Contact>) GLib.Object.ref);
this._idle_queue (() => { return this._contacts_added_idle (copy); });
}
@@ -2511,8 +2522,15 @@ public class Edsf.PersonaStore : Folks.PersonaStore
return false;
}
+#if HAS_EDS_3_41
private void _contacts_changed_cb (GLib.SList<E.Contact> contacts)
{
+#else
+ // The binding was using the wrong list type
+ private void _contacts_changed_cb (GLib.List<E.Contact> _contacts)
+ {
+ unowned GLib.SList<E.Contact> contacts = (GLib.SList<E.Contact>)_contacts;
+#endif
GLib.SList<E.Contact> copy = contacts.copy_deep ((GLib.CopyFunc<E.Contact>) GLib.Object.ref);
this._idle_queue (() => { return this._contacts_changed_idle (copy); });
}
@@ -2539,8 +2557,15 @@ public class Edsf.PersonaStore : Folks.PersonaStore
return false;
}
+#if HAS_EDS_3_41
private void _contacts_removed_cb (GLib.SList<string> contacts_ids)
{
+#else
+ // The binding was using the wrong list type
+ private void _contacts_removed_cb (GLib.List<string> _contacts_ids)
+ {
+ unowned GLib.SList<string> contacts_ids = (GLib.SList<string>)_contacts_ids;
+#endif
GLib.SList<string> copy = contacts_ids.copy_deep ((GLib.CopyFunc<string>) string.dup);
this._idle_queue (() => { return this._contacts_removed_idle (copy); });
}
diff --git a/backends/eds/lib/meson.build b/backends/eds/lib/meson.build
index fd500475..c8d0c423 100644
--- a/backends/eds/lib/meson.build
+++ b/backends/eds/lib/meson.build
@@ -34,6 +34,10 @@ eds_backendlib_vala_flags = [
common_backendlib_vala_flags,
]
+if eds_dep.version().version_compare('>=3.41')
+ eds_backendlib_vala_flags += ['-D', 'HAS_EDS_3_41']
+endif
+
eds_backendlib_c_flags = [
'-include', 'config.h',
'-DBACKEND_NAME="@0@"'.format(eds_backend_name),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]