diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-09-07 11:36:05 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-09-07 10:55:43 +0000 |
| commit | 97d15c49a3c74ff5b006f1f59dfae9d76a955d20 (patch) | |
| tree | 9d4a8641899ba58f7279aab8120b687dd3fb2a6d | |
| parent | b72069395ba53c8a3f45b357c257a7416e6e2179 (diff) | |
| download | ModemManager-97d15c49a3c74ff5b006f1f59dfae9d76a955d20.tar.gz | |
build,meson: add missing Call object support in introspection
| -rw-r--r-- | libmm-glib/generated/meson.build | 18 | ||||
| -rw-r--r-- | libmm-glib/meson.build | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/libmm-glib/generated/meson.build b/libmm-glib/generated/meson.build index 6f85b1f57..a44115e5d 100644 --- a/libmm-glib/generated/meson.build +++ b/libmm-glib/generated/meson.build @@ -64,10 +64,10 @@ gen_sources += gnome.mkenums( ) gdbus_ifaces = [ - ['bearer', mm_ifaces_bearer, [], false, true], - ['call', mm_ifaces_call, [], false, false], - ['manager', mm_ifaces, [], false, true], - ['sim', mm_ifaces_sim, [], false, true], + ['bearer', mm_ifaces_bearer, [], false], + ['call', mm_ifaces_call, [], false], + ['manager', mm_ifaces, [], false], + ['sim', mm_ifaces_sim, [], false], ] annotations = [ @@ -77,14 +77,11 @@ annotations = [ ['org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager', 'org.gtk.GDBus.C.Name', 'Modem3gppProfileManager'], ] -gdbus_ifaces += [['modem', mm_ifaces_modem, annotations, true, true]] +gdbus_ifaces += [['modem', mm_ifaces_modem, annotations, true]] annotations = [['org.freedesktop.ModemManager1.Sms:Data', 'org.gtk.GDBus.C.ForceGVariant', 'True']] -gdbus_ifaces += [['sms', mm_ifaces_sms, annotations, false, true]] - -# FIXME: to avoid the inclusion of call gdbus (seems a mistake in autotools) -gen_gir_sources = gen_sources + gen_headers +gdbus_ifaces += [['sms', mm_ifaces_sms, annotations, false]] foreach gdbus_iface: gdbus_ifaces gdbus_sources = gnome.gdbus_codegen( @@ -106,9 +103,6 @@ foreach gdbus_iface: gdbus_ifaces gen_headers += gdbus_sources[1] # FIXME: the `expand_content_files` must be strings gen_docs += gdbus_sources[2] - if gdbus_iface[4] - gen_gir_sources += [gdbus_sources[0], gdbus_sources[1]] - endif endforeach deps = [ diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build index f3cf0c313..93c52f06a 100644 --- a/libmm-glib/meson.build +++ b/libmm-glib/meson.build @@ -152,9 +152,7 @@ if enable_gir libmm_glib_gir = gnome.generate_gir( libmm_glib, - # FIXME: mm-gdbus-call.[ch] are not included - # sources: sources + headers + gen_sources + gen_headers + [mm_names_header, mm_version_header], - sources: sources + headers + gen_gir_sources + [mm_names_header, mm_version_header], + sources: sources + headers + gen_sources + gen_headers + [mm_names_header, mm_version_header], includes: incs, namespace: gir_ns, nsversion: mm_gir_version, |