diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm-core/nm-dbus-utils.c | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm-core/nm-dbus-utils.c')
| -rw-r--r-- | libnm-core/nm-dbus-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 8389bf36..25af7c99 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -117,7 +117,7 @@ dbus_signal_meta_marshal (GClosure *closure, * * The argument types in @c_handler correspond to the types output by * g_dbus_gvariant_to_gvalue(), except for 'ay' and 'aay'. In particular: - * - both 16-bit and 32-bit integers are passed as #gint/#guint + * - both 16-bit and 32-bit integers are passed as #int/#guint * - 'as' values are passed as #GStrv (char **) * - all other array, tuple, and dict types are passed as #GVariant * @@ -245,11 +245,11 @@ _nm_dbus_proxy_call_finish (GDBusProxy *proxy, */ GVariant * _nm_dbus_proxy_call_sync (GDBusProxy *proxy, - const gchar *method_name, + const char *method_name, GVariant *parameters, const GVariantType *reply_type, GDBusCallFlags flags, - gint timeout_msec, + int timeout_msec, GCancellable *cancellable, GError **error) { |