mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
libnm: don't include "nm-version.h" in "nm-dbus-interface.h"
We want "nm-dbus-interface.h" to have no dependancy on libnm and glib. That way, it is usable for example in the QT examples without dragging in dependencies to glib. Also drop all the unneccessary include to "nm-dbus-interface.h", which we already get by directly or indirectly including "nm-core-types.h".
This commit is contained in:
parent
66b7e45708
commit
c0852964a8
|
@ -37,7 +37,6 @@
|
||||||
#include "nm-default.h"
|
#include "nm-default.h"
|
||||||
#include "nm-connection.h"
|
#include "nm-connection.h"
|
||||||
#include "nm-core-enum-types.h"
|
#include "nm-core-enum-types.h"
|
||||||
#include "nm-dbus-interface.h"
|
|
||||||
#include "nm-setting-8021x.h"
|
#include "nm-setting-8021x.h"
|
||||||
#include "nm-setting-adsl.h"
|
#include "nm-setting-adsl.h"
|
||||||
#include "nm-setting-bluetooth.h"
|
#include "nm-setting-bluetooth.h"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
|
#include <nm-version.h>
|
||||||
#include <nm-dbus-interface.h>
|
#include <nm-dbus-interface.h>
|
||||||
#include <nm-core-enum-types.h>
|
#include <nm-core-enum-types.h>
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
#ifndef __NM_DBUS_INTERFACE_H__
|
#ifndef __NM_DBUS_INTERFACE_H__
|
||||||
#define __NM_DBUS_INTERFACE_H__
|
#define __NM_DBUS_INTERFACE_H__
|
||||||
|
|
||||||
#include <nm-version.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* dbus services details
|
* dbus services details
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
#include "nm-default.h"
|
#include "nm-default.h"
|
||||||
#include "nm-errors.h"
|
#include "nm-errors.h"
|
||||||
#include "nm-dbus-interface.h"
|
|
||||||
#include "nm-vpn-dbus-interface.h"
|
#include "nm-vpn-dbus-interface.h"
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "nm-setting-olpc-mesh.h"
|
#include "nm-setting-olpc-mesh.h"
|
||||||
#include "nm-dbus-interface.h"
|
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-utils-private.h"
|
#include "nm-utils-private.h"
|
||||||
#include "nm-setting-private.h"
|
#include "nm-setting-private.h"
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <net/ethernet.h>
|
#include <net/ethernet.h>
|
||||||
|
|
||||||
#include "nm-setting-wireless.h"
|
#include "nm-setting-wireless.h"
|
||||||
#include "nm-dbus-interface.h"
|
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-utils-private.h"
|
#include "nm-utils-private.h"
|
||||||
#include "nm-setting-private.h"
|
#include "nm-setting-private.h"
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
|
|
||||||
#include <nm-setting.h>
|
#include <nm-setting.h>
|
||||||
#include <nm-setting-wireless-security.h>
|
#include <nm-setting-wireless-security.h>
|
||||||
#include <nm-dbus-interface.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <linux/if_ether.h>
|
#include <linux/if_ether.h>
|
||||||
#include <linux/if_infiniband.h>
|
#include <linux/if_infiniband.h>
|
||||||
|
|
||||||
#include "nm-dbus-interface.h"
|
|
||||||
#include "nm-core-enum-types.h"
|
#include "nm-core-enum-types.h"
|
||||||
#include "nm-setting-wireless-security.h"
|
#include "nm-setting-wireless-security.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue