diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:07:03 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:15:57 +0100 |
| commit | 2567f558da3eb9911678227d4aeb15162e707d89 (patch) | |
| tree | 13c80b0e091c8ba585b14b966cda998f95f1936d /libnm/nm-dbus-helpers.h | |
| parent | 02d99ffd62ede29cffcb45fcbe33d044b7406d3a (diff) | |
| parent | f54032b30e1ddd84f10a339e0caf493772e049a7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'libnm/nm-dbus-helpers.h')
| -rw-r--r-- | libnm/nm-dbus-helpers.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index f83f2b0d..a918d22f 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2013 Red Hat, Inc. */ @@ -6,21 +6,18 @@ #ifndef __NM_DBUS_HELPERS_PRIVATE_H__ #define __NM_DBUS_HELPERS_PRIVATE_H__ -#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE) -#error Cannot use this header. +#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE) + #error Cannot use this header. #endif #include "nm-std-aux/nm-dbus-compat.h" -#define NM_DBUS_DEFAULT_TIMEOUT_MSEC 25000 +#define NM_DBUS_DEFAULT_TIMEOUT_MSEC 25000 -GBusType _nm_dbus_bus_type (void); +GBusType _nm_dbus_bus_type(void); -void _nm_dbus_bind_properties (gpointer object, - gpointer skeleton); +void _nm_dbus_bind_properties(gpointer object, gpointer skeleton); -void _nm_dbus_bind_methods (gpointer object, - gpointer skeleton, - ...) G_GNUC_NULL_TERMINATED; +void _nm_dbus_bind_methods(gpointer object, gpointer skeleton, ...) G_GNUC_NULL_TERMINATED; #endif /* __NM_DBUS_HELPERS_PRIVATE_H__ */ |