mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-04 02:50:17 +01: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".
(cherry picked from commit c0852964a8)
This commit is contained in:
parent
f9757b7d5b
commit
ea8e3b88d1
8 changed files with 1 additions and 9 deletions
|
|
@ -35,7 +35,6 @@
|
|||
|
||||
#include "nm-connection.h"
|
||||
#include "nm-core-enum-types.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-setting-8021x.h"
|
||||
#include "nm-setting-adsl.h"
|
||||
#include "nm-setting-bluetooth.h"
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include <glib-object.h>
|
||||
|
||||
#include <nm-version.h>
|
||||
#include <nm-dbus-interface.h>
|
||||
#include <nm-core-enum-types.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
#ifndef __NM_DBUS_INTERFACE_H__
|
||||
#define __NM_DBUS_INTERFACE_H__
|
||||
|
||||
#include "nm-version.h"
|
||||
|
||||
/*
|
||||
* dbus services details
|
||||
*/
|
||||
|
|
@ -551,7 +549,6 @@ typedef enum {
|
|||
*
|
||||
* Since: 1.0.6
|
||||
**/
|
||||
NM_AVAILABLE_IN_1_0_6
|
||||
typedef enum {
|
||||
NM_METERED_UNKNOWN = 0,
|
||||
NM_METERED_YES = 1,
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#include "nm-errors.h"
|
||||
#include "nm-glib-compat.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-vpn-dbus-interface.h"
|
||||
#include "nm-core-internal.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <glib/gi18n-lib.h>
|
||||
|
||||
#include "nm-setting-olpc-mesh.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-utils-private.h"
|
||||
#include "nm-setting-private.h"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include <glib/gi18n-lib.h>
|
||||
|
||||
#include "nm-setting-wireless.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-utils-private.h"
|
||||
#include "nm-setting-private.h"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#include <nm-setting.h>
|
||||
#include <nm-setting-wireless-security.h>
|
||||
#include <nm-dbus-interface.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-core-enum-types.h"
|
||||
#include "nm-setting-wireless-security.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue