diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-21 22:09:52 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-28 17:17:17 -0400 |
| commit | b108790833e4829586cf42a60a60a783fe535608 (patch) | |
| tree | d4be5914f03e998efd21b810aa95e0e5171d8c59 /src/devices/bluetooth | |
| parent | 6eba3aa141bc94fa81e9e20a6bf0e66a86409857 (diff) | |
| download | NetworkManager-b108790833e4829586cf42a60a60a783fe535608.tar.gz | |
libnm-core: add nm-core-types.h, remove cross-includes
Add nm-core-types.h, typedefing all of the GObject types in
libnm-core; this is needed so that nm-setting.h can reference
NMConnection in addition to nm-connection.h referencing NMSetting.
Removing the cross-includes from the various headers causes lots of
fallout elsewhere. (In particular, nm-utils.h used to include
nm-connection.h, which included every setting header, so any file that
included nm-utils.h automatically got most of the rest of libnm-core
without needing to pay attention to specifics.) Fix this up by
including nm-core-internal.h from those files that are now missing
includes.
Diffstat (limited to 'src/devices/bluetooth')
| -rw-r--r-- | src/devices/bluetooth/nm-bluez-device.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 6c1693533c..74a89a5f64 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -24,13 +24,11 @@ #include <gio/gio.h> #include <string.h> -#include "nm-dbus-interface.h" -#include "nm-setting-bluetooth.h" +#include "nm-core-internal.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" #include "nm-logging.h" -#include "nm-utils.h" #include "nm-settings-connection.h" #include "nm-bluez5-dun.h" #include "NetworkManagerUtils.h" |