build,meson: add missing Call object support in introspection

This commit is contained in:
Aleksander Morgado
2021-09-07 11:36:05 +02:00
parent b72069395b
commit 97d15c49a3
2 changed files with 7 additions and 15 deletions

View File

@@ -64,10 +64,10 @@ gen_sources += gnome.mkenums(
) )
gdbus_ifaces = [ gdbus_ifaces = [
['bearer', mm_ifaces_bearer, [], false, true], ['bearer', mm_ifaces_bearer, [], false],
['call', mm_ifaces_call, [], false, false], ['call', mm_ifaces_call, [], false],
['manager', mm_ifaces, [], false, true], ['manager', mm_ifaces, [], false],
['sim', mm_ifaces_sim, [], false, true], ['sim', mm_ifaces_sim, [], false],
] ]
annotations = [ annotations = [
@@ -77,14 +77,11 @@ annotations = [
['org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager', 'org.gtk.GDBus.C.Name', 'Modem3gppProfileManager'], ['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']] annotations = [['org.freedesktop.ModemManager1.Sms:Data', 'org.gtk.GDBus.C.ForceGVariant', 'True']]
gdbus_ifaces += [['sms', mm_ifaces_sms, annotations, false, true]] gdbus_ifaces += [['sms', mm_ifaces_sms, annotations, false]]
# FIXME: to avoid the inclusion of call gdbus (seems a mistake in autotools)
gen_gir_sources = gen_sources + gen_headers
foreach gdbus_iface: gdbus_ifaces foreach gdbus_iface: gdbus_ifaces
gdbus_sources = gnome.gdbus_codegen( gdbus_sources = gnome.gdbus_codegen(
@@ -106,9 +103,6 @@ foreach gdbus_iface: gdbus_ifaces
gen_headers += gdbus_sources[1] gen_headers += gdbus_sources[1]
# FIXME: the `expand_content_files` must be strings # FIXME: the `expand_content_files` must be strings
gen_docs += gdbus_sources[2] gen_docs += gdbus_sources[2]
if gdbus_iface[4]
gen_gir_sources += [gdbus_sources[0], gdbus_sources[1]]
endif
endforeach endforeach
deps = [ deps = [

View File

@@ -152,9 +152,7 @@ if enable_gir
libmm_glib_gir = gnome.generate_gir( libmm_glib_gir = gnome.generate_gir(
libmm_glib, 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_sources + gen_headers + [mm_names_header, mm_version_header],
sources: sources + headers + gen_gir_sources + [mm_names_header, mm_version_header],
includes: incs, includes: incs,
namespace: gir_ns, namespace: gir_ns,
nsversion: mm_gir_version, nsversion: mm_gir_version,