mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 04:24:32 +00:00
libnm: drop unused _nm_dbus_proxy_call_sync() helper
It's unused and: - we probably should avoid GDBusProxy altogether - we very likely should avoid blocking D-Bus calls
This commit is contained in:
parent
7b24d6e2dc
commit
66ea6e01c8
|
@ -389,15 +389,6 @@ GVariant *_nm_dbus_proxy_call_finish (GDBusProxy *proxy,
|
||||||
const GVariantType *reply_type,
|
const GVariantType *reply_type,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
GVariant *_nm_dbus_proxy_call_sync (GDBusProxy *proxy,
|
|
||||||
const char *method_name,
|
|
||||||
GVariant *parameters,
|
|
||||||
const GVariantType *reply_type,
|
|
||||||
GDBusCallFlags flags,
|
|
||||||
int timeout_msec,
|
|
||||||
GCancellable *cancellable,
|
|
||||||
GError **error);
|
|
||||||
|
|
||||||
GVariant * _nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
|
GVariant * _nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
|
||||||
GAsyncResult *result,
|
GAsyncResult *result,
|
||||||
const GVariantType *reply_type,
|
const GVariantType *reply_type,
|
||||||
|
|
|
@ -221,52 +221,6 @@ _nm_dbus_proxy_call_finish (GDBusProxy *proxy,
|
||||||
return variant;
|
return variant;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* _nm_dbus_proxy_call_sync:
|
|
||||||
* @proxy: A #GDBusProxy.
|
|
||||||
* @method_name: Name of method to invoke.
|
|
||||||
* @parameters: (allow-none): A #GVariant tuple with parameters for the signal
|
|
||||||
* or %NULL if not passing parameters.
|
|
||||||
* @reply_type: (allow-none): the expected type of the reply, or %NULL
|
|
||||||
* @flags: Flags from the #GDBusCallFlags enumeration.
|
|
||||||
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
|
|
||||||
* "infinite") or -1 to use the proxy default timeout.
|
|
||||||
* @cancellable: (allow-none): A #GCancellable or %NULL.
|
|
||||||
* @error: Return location for error or %NULL.
|
|
||||||
*
|
|
||||||
* Synchronously invokes the @method_name method on @proxy, as with
|
|
||||||
* g_dbus_proxy_call_sync(), except that if @reply_type is non-%NULL, then the
|
|
||||||
* reply to the call will be checked against it, and an error returned if it
|
|
||||||
* does not match.
|
|
||||||
*
|
|
||||||
* Returns: %NULL if @error is set. Otherwise a #GVariant tuple with
|
|
||||||
* return values. Free with g_variant_unref().
|
|
||||||
*/
|
|
||||||
GVariant *
|
|
||||||
_nm_dbus_proxy_call_sync (GDBusProxy *proxy,
|
|
||||||
const char *method_name,
|
|
||||||
GVariant *parameters,
|
|
||||||
const GVariantType *reply_type,
|
|
||||||
GDBusCallFlags flags,
|
|
||||||
int timeout_msec,
|
|
||||||
GCancellable *cancellable,
|
|
||||||
GError **error)
|
|
||||||
{
|
|
||||||
GVariant *variant;
|
|
||||||
|
|
||||||
variant = g_dbus_proxy_call_sync (proxy,
|
|
||||||
method_name,
|
|
||||||
parameters,
|
|
||||||
flags,
|
|
||||||
timeout_msec,
|
|
||||||
cancellable,
|
|
||||||
error);
|
|
||||||
if ( variant
|
|
||||||
&& !_nm_dbus_typecheck_response (variant, reply_type, error))
|
|
||||||
nm_clear_pointer (&variant, g_variant_unref);
|
|
||||||
return variant;
|
|
||||||
}
|
|
||||||
|
|
||||||
GVariant *
|
GVariant *
|
||||||
_nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
|
_nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
|
||||||
GAsyncResult *result,
|
GAsyncResult *result,
|
||||||
|
|
Loading…
Reference in a new issue