Merge "binding: telephony: remove compiler warnings"guppy_6.99.4guppy/6.99.46.99.4

1 files changed, 35 insertions, 34 deletions

diff --git a/binding/gdbus/ofono_manager_interface.c b/binding/gdbus/ofono_manager_interface.c
index d58021f..4b84c50 100644
--- a/binding/gdbus/ofono_manager_interface.c
+++ b/binding/gdbus/ofono_manager_interface.c
@@ -1,7 +1,8 @@
 /*
- * Generated by gdbus-codegen 2.50.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.56.3. DO NOT EDIT.
  *
- * The license of this code is the same as for the source it was derived from.
+ * The license of this code is the same as for the D-Bus interface description
+ * it was derived from.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -303,7 +304,7 @@ org_ofono_manager_interface_info (void)
 
 /**
  * org_ofono_manager_override_properties:
- * @klass: The class structure for a #GObject<!-- -->-derived class.
+ * @klass: The class structure for a #GObject derived class.
  * @property_id_begin: The property id to assign to the first overridden property.
  *
  * Overrides all #GObject properties in the #OrgOfonoManager interface for a concrete class.
@@ -336,7 +337,7 @@ org_ofono_manager_override_properties (GObjectClass *klass, guint property_id_be
  */
 
 typedef OrgOfonoManagerIface OrgOfonoManagerInterface;
-G_DEFINE_INTERFACE (OrgOfonoManager, org_ofono_manager, G_TYPE_OBJECT);
+G_DEFINE_INTERFACE (OrgOfonoManager, org_ofono_manager, G_TYPE_OBJECT)
 
 static void
 org_ofono_manager_default_init (OrgOfonoManagerIface *iface)
@@ -441,7 +442,7 @@ org_ofono_manager_emit_modem_removed (
 /**
  * org_ofono_manager_call_get_modems:
  * @proxy: A #OrgOfonoManagerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
@@ -502,7 +503,7 @@ _out:
  * org_ofono_manager_call_get_modems_sync:
  * @proxy: A #OrgOfonoManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-ofono-Manager.GetModems">GetModems()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
@@ -582,11 +583,11 @@ static void org_ofono_manager_proxy_iface_init (OrgOfonoManagerIface *iface);
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
 G_DEFINE_TYPE_WITH_CODE (OrgOfonoManagerProxy, org_ofono_manager_proxy, G_TYPE_DBUS_PROXY,
                          G_ADD_PRIVATE (OrgOfonoManagerProxy)
-                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_proxy_iface_init));
+                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_proxy_iface_init))
 
 #else
 G_DEFINE_TYPE_WITH_CODE (OrgOfonoManagerProxy, org_ofono_manager_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_proxy_iface_init));
+                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_proxy_iface_init))
 
 #endif
 static void
@@ -623,8 +624,8 @@ org_ofono_manager_proxy_g_signal (GDBusProxy *proxy,
   GVariantIter iter;
   GVariant *child;
   GValue *paramv;
-  guint num_params;
-  guint n;
+  gsize num_params;
+  gsize n;
   guint signal_id;
   info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_org_ofono_manager_interface_info.parent_struct, signal_name);
   if (info == NULL)
@@ -724,9 +725,9 @@ org_ofono_manager_proxy_iface_init (OrgOfonoManagerIface *iface)
  * org_ofono_manager_proxy_new:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
@@ -779,9 +780,9 @@ org_ofono_manager_proxy_new_finish (
  * org_ofono_manager_proxy_new_sync:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
  * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-ofono-Manager.top_of_page">org.ofono.Manager</link>. See g_dbus_proxy_new_sync() for more details.
@@ -816,7 +817,7 @@ org_ofono_manager_proxy_new_sync (
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
@@ -871,7 +872,7 @@ org_ofono_manager_proxy_new_for_bus_finish (
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
  * Like org_ofono_manager_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
@@ -940,9 +941,9 @@ _org_ofono_manager_skeleton_handle_method_call (
   GVariantIter iter;
   GVariant *child;
   GValue *paramv;
-  guint num_params;
+  gsize num_params;
   guint num_extra;
-  guint n;
+  gsize n;
   guint signal_id;
   GValue return_value = G_VALUE_INIT;
   info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -1166,11 +1167,11 @@ static void org_ofono_manager_skeleton_iface_init (OrgOfonoManagerIface *iface);
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
 G_DEFINE_TYPE_WITH_CODE (OrgOfonoManagerSkeleton, org_ofono_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
                          G_ADD_PRIVATE (OrgOfonoManagerSkeleton)
-                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_skeleton_iface_init));
+                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_skeleton_iface_init))
 
 #else
 G_DEFINE_TYPE_WITH_CODE (OrgOfonoManagerSkeleton, org_ofono_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_skeleton_iface_init));
+                         G_IMPLEMENT_INTERFACE (TYPE_ORG_OFONO_MANAGER, org_ofono_manager_skeleton_iface_init))
 
 #endif
 static void
@@ -1265,7 +1266,7 @@ org_ofono_manager_skeleton_new (void)
  */
 
 typedef ObjectIface ObjectInterface;
-G_DEFINE_INTERFACE_WITH_CODE (Object, object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
+G_DEFINE_INTERFACE_WITH_CODE (Object, object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT);)
 
 static void
 object_default_init (ObjectIface *iface)
@@ -1359,7 +1360,7 @@ object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
 
 G_DEFINE_TYPE_WITH_CODE (ObjectProxy, object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
                          G_IMPLEMENT_INTERFACE (TYPE_OBJECT, object_proxy__object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, object_proxy__g_dbus_object_iface_init));
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, object_proxy__g_dbus_object_iface_init))
 
 static void
 object_proxy_init (ObjectProxy *object G_GNUC_UNUSED)
@@ -1454,7 +1455,7 @@ object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
 
 G_DEFINE_TYPE_WITH_CODE (ObjectSkeleton, object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
                          G_IMPLEMENT_INTERFACE (TYPE_OBJECT, object_skeleton__object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, object_skeleton__g_dbus_object_iface_init));
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, object_skeleton__g_dbus_object_iface_init))
 
 static void
 object_skeleton_init (ObjectSkeleton *object G_GNUC_UNUSED)
@@ -1542,7 +1543,7 @@ object_skeleton_new (const gchar *object_path)
 /**
  * object_skeleton_set_org_ofono_manager:
  * @object: A #ObjectSkeleton.
- * @interface_: (allow-none): A #OrgOfonoManager or %NULL to clear the interface.
+ * @interface_: (nullable): A #OrgOfonoManager or %NULL to clear the interface.
  *
  * Sets the #OrgOfonoManager instance for the D-Bus interface <link linkend="gdbus-interface-org-ofono-Manager.top_of_page">org.ofono.Manager</link> on @object.
  */
@@ -1578,7 +1579,7 @@ void object_skeleton_set_org_ofono_manager (ObjectSkeleton *object, OrgOfonoMana
  * Class structure for #ObjectManagerClient.
  */
 
-G_DEFINE_TYPE (ObjectManagerClient, object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
+G_DEFINE_TYPE (ObjectManagerClient, object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT)
 
 static void
 object_manager_client_init (ObjectManagerClient *manager G_GNUC_UNUSED)
@@ -1594,12 +1595,12 @@ object_manager_client_class_init (ObjectManagerClientClass *klass G_GNUC_UNUSED)
  * object_manager_client_get_proxy_type:
  * @manager: A #GDBusObjectManagerClient.
  * @object_path: The object path of the remote object (unused).
- * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
+ * @interface_name: (nullable): Interface name of the remote object or %NULL to get the object proxy #GType.
  * @user_data: User data (unused).
  *
- * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.
+ * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy derived and #GDBusProxy derived types.
  *
- * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %NULL, otherwise the #GType for #ObjectProxy.
+ * Returns: A #GDBusProxy derived #GType if @interface_name is not %NULL, otherwise the #GType for #ObjectProxy.
  */
 GType
 object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
@@ -1626,9 +1627,9 @@ object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_U
  * object_manager_client_new:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
@@ -1681,9 +1682,9 @@ object_manager_client_new_finish (
  * object_manager_client_new_sync:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
  * Synchronously creates #GDBusObjectManagerClient using object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
@@ -1718,7 +1719,7 @@ object_manager_client_new_sync (
  * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
  * @name: A bus name (well-known or unique).
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
@@ -1773,7 +1774,7 @@ object_manager_client_new_for_bus_finish (
  * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
  * @name: A bus name (well-known or unique).
  * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
  * Like object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.