libnm: add NetworkManager.h, disallow including individual headers

Add NetworkManager.h, which includes all of the other NM header, and
require all external users of libnm to use that rather than the
individual headers.

(An exception is made for nm-dbus-interface.h,
nm-vpn-dbus-interface.h, and nm-version.h, which can be included
separately.)
This commit is contained in:
Dan Winship 2014-07-06 16:53:02 -04:00
parent 3ddce74803
commit d0b05b34d5
162 changed files with 394 additions and 206 deletions

View file

@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I${top_builddir}/libnm-core \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \

View file

@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/callouts \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)

View file

@ -31,6 +31,7 @@
#include "nm-dbus-glib-types.h"
#include "nm-dispatcher-api.h"
#include "nm-utils.h"
#include "nm-utils-private.h"
/*******************************************/

View file

@ -22,14 +22,6 @@
#ifndef NMC_COMMON_H
#define NMC_COMMON_H
#include <glib.h>
#include <nm-ip4-config.h>
#include <nm-ip6-config.h>
#include <nm-dhcp4-config.h>
#include <nm-dhcp6-config.h>
#include <nm-device.h>
#include "nmcli.h"
gboolean print_ip4_config (NMIP4Config *cfg4, NmCli *nmc, const char *group_prefix, const char *one_field);

View file

@ -33,25 +33,6 @@
#include <readline/readline.h>
#include <readline/history.h>
#include <nm-client.h>
#include <nm-device-ethernet.h>
#include <nm-device-adsl.h>
#include <nm-device-wifi.h>
#if WITH_WIMAX
#include <nm-device-wimax.h>
#endif
#include <nm-device-modem.h>
#include <nm-device-bt.h>
#include <nm-device-olpc-mesh.h>
#include <nm-device-infiniband.h>
#include <nm-device-bond.h>
#include <nm-device-team.h>
#include <nm-device-bridge.h>
#include <nm-device-vlan.h>
#include <nm-remote-settings.h>
#include <nm-vpn-connection.h>
#include <nm-utils.h>
#include "utils.h"
#include "common.h"
#include "settings.h"

View file

@ -29,39 +29,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <nm-client.h>
#include <nm-device.h>
#include <nm-device-ethernet.h>
#include <nm-device-adsl.h>
#include <nm-device-wifi.h>
#include <nm-device-modem.h>
#include <nm-device-bt.h>
#include <nm-device-olpc-mesh.h>
#if WITH_WIMAX
#include <nm-device-wimax.h>
#endif
#include <nm-device-infiniband.h>
#include <nm-device-bond.h>
#include <nm-device-bridge.h>
#include <nm-device-vlan.h>
#include <nm-utils.h>
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include <nm-vpn-connection.h>
#include <nm-setting-connection.h>
#include <nm-setting-wired.h>
#include <nm-setting-adsl.h>
#include <nm-setting-pppoe.h>
#include <nm-setting-wireless.h>
#include <nm-setting-gsm.h>
#include <nm-setting-cdma.h>
#include <nm-setting-bluetooth.h>
#include <nm-setting-olpc-mesh.h>
#if WITH_WIMAX
#include <nm-setting-wimax.h>
#endif
#include <nm-setting-infiniband.h>
#include "utils.h"
#include "common.h"
#include "devices.h"

View file

@ -25,8 +25,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <nm-client.h>
#include <nm-setting-connection.h>
#include "utils.h"
#include "network-manager.h"

View file

@ -33,9 +33,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <nm-client.h>
#include <nm-setting-connection.h>
#include <nm-remote-settings.h>
#include "nmcli.h"
#include "utils.h"

View file

@ -20,10 +20,7 @@
#ifndef NMC_NMCLI_H
#define NMC_NMCLI_H
#include <glib.h>
#include <nm-client.h>
#include <nm-remote-settings.h>
#include <NetworkManager.h>
/* nmcli exit codes */
typedef enum {

View file

@ -25,7 +25,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <nm-utils.h>
#include "utils.h"
#include "common.h"

View file

@ -20,30 +20,6 @@
#ifndef NMC_SETTINGS_H
#define NMC_SETTINGS_H
#include <nm-setting-connection.h>
#include <nm-setting-wired.h>
#include <nm-setting-adsl.h>
#include <nm-setting-8021x.h>
#include <nm-setting-wireless.h>
#include <nm-setting-wireless-security.h>
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include <nm-setting-serial.h>
#include <nm-setting-ppp.h>
#include <nm-setting-pppoe.h>
#include <nm-setting-gsm.h>
#include <nm-setting-cdma.h>
#include <nm-setting-bluetooth.h>
#include <nm-setting-olpc-mesh.h>
#include <nm-setting-vpn.h>
#include <nm-setting-wimax.h>
#include <nm-setting-infiniband.h>
#include <nm-setting-bond.h>
#include <nm-setting-bridge.h>
#include <nm-setting-bridge-port.h>
#include <nm-setting-vlan.h>
#include <nm-setting-dcb.h>
#include "nmcli.h"
#include "utils.h"

View file

@ -20,8 +20,6 @@
#ifndef NMC_UTILS_H
#define NMC_UTILS_H
#include <glib.h>
#include "nmcli.h"
/* === Types === */

View file

@ -40,7 +40,7 @@
#include <glib/gi18n.h>
#include "nm-client.h"
#include <NetworkManager.h>
#define PROGRESS_STEPS 15
#define WAIT_STARTUP_TAG "wait-startup"

View file

@ -19,10 +19,7 @@
#ifndef NM_EDITOR_BINDINGS_H
#define NM_EDITOR_BINDINGS_H
#include <glib-object.h>
#include <nm-connection.h>
#include <nm-setting-wireless-security.h>
#include <nm-setting-vlan.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -28,16 +28,7 @@
#include "config.h"
#include <glib/gi18n.h>
#include <nm-utils.h>
#include <nm-device-bond.h>
#include <nm-device-bridge.h>
#include <nm-device-team.h>
#include <nm-device-ethernet.h>
#include <nm-device-infiniband.h>
#include <nm-device-team.h>
#include <nm-device-vlan.h>
#include <nm-device-wifi.h>
#include <NetworkManager.h>
#include "nm-editor-utils.h"
#if 0

View file

@ -19,8 +19,7 @@
#ifndef NM_EDITOR_UTILS_H
#define NM_EDITOR_UTILS_H
#include <glib-object.h>
#include <nm-remote-settings.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -29,9 +29,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include <nm-access-point.h>
#include <nm-device-wifi.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmtui.h"
#include "nmt-connect-connection-list.h"

View file

@ -41,9 +41,7 @@
#include <linux/if_arp.h>
#include <glib/gi18n-lib.h>
#include <nm-device.h>
#include <nm-device-infiniband.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmtui.h"
#include "nmt-device-entry.h"

View file

@ -21,8 +21,7 @@
#include "nmt-page-grid.h"
#include <nm-connection.h>
#include <nm-device.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -21,7 +21,7 @@
#include "nmt-newt.h"
#include <nm-remote-connection.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -19,7 +19,7 @@
#ifndef NMT_EDITOR_PAGE_H
#define NMT_EDITOR_PAGE_H
#include <nm-connection.h>
#include <NetworkManager.h>
#include "nmt-page-grid.h"

View file

@ -19,7 +19,7 @@
#ifndef NMT_EDITOR_H
#define NMT_EDITOR_H
#include <nm-connection.h>
#include <NetworkManager.h>
#include "nmt-newt.h"

View file

@ -31,7 +31,7 @@
#include <string.h>
#include <dbus/dbus-glib.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmt-mac-entry.h"

View file

@ -30,8 +30,7 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <nm-device.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmt-page-main.h"
#include "nmt-device-entry.h"

View file

@ -26,8 +26,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <nm-device-ethernet.h>
#include "nm-editor-bindings.h"
#include "nmt-page-vlan.h"

View file

@ -31,7 +31,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <nm-utils.h>
#include "nmt-page-wifi.h"
#include "nmt-mac-entry.h"

View file

@ -19,7 +19,7 @@
#ifndef NMT_ROUTE_EDITOR_H
#define NMT_ROUTE_EDITOR_H
#include <nm-connection.h>
#include <NetworkManager.h>
#include "nmt-newt.h"

View file

@ -33,8 +33,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include <NetworkManager.h>
#include "nmt-route-entry.h"
#include "nmt-ip-entry.h"

View file

@ -32,7 +32,8 @@
#include <glib/gi18n-lib.h>
#include <dbus/dbus-glib.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include <nm-utils-private.h>
#include "nmt-route-table.h"
#include "nmt-route-entry.h"

View file

@ -35,8 +35,6 @@
#include <dbus/dbus-glib.h>
#include <glib/gi18n-lib.h>
#include <nm-utils.h>
#include "nmt-secret-agent.h"
#include "nmt-newt.h"

View file

@ -19,7 +19,7 @@
#ifndef NMT_SECRET_AGENT_H
#define NMT_SECRET_AGENT_H
#include <nm-secret-agent.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -27,8 +27,7 @@
#include "config.h"
#include <glib/gi18n-lib.h>
#include <nm-remote-connection.h>
#include <NetworkManager.h>
#include "nmt-slave-list.h"

View file

@ -32,7 +32,6 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include <nm-utils.h>
#include "nmt-newt.h"

View file

@ -28,7 +28,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmtui.h"
#include "nmtui-edit.h"

View file

@ -33,10 +33,7 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <nm-client.h>
#include <nm-connection.h>
#include <nm-remote-settings.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#include "nmt-newt.h"
#include "nm-editor-bindings.h"

View file

@ -19,8 +19,7 @@
#ifndef NMTUI_H
#define NMTUI_H
#include <nm-client.h>
#include <nm-remote-settings.h>
#include <NetworkManager.h>
G_BEGIN_DECLS

View file

@ -29,12 +29,7 @@
#include <glib.h>
#include <dbus/dbus-glib.h>
#include <nm-connection.h>
#include <nm-setting-connection.h>
#include <nm-setting-wired.h>
#include <nm-setting-ip4-config.h>
#include <nm-dbus-interface.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
#define DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT))

View file

@ -28,13 +28,7 @@
*/
#include <glib.h>
#include <nm-remote-settings.h>
#include <nm-connection.h>
#include <nm-setting-connection.h>
#include <nm-setting-wired.h>
#include <nm-setting-ip4-config.h>
#include <nm-utils.h>
#include <NetworkManager.h>
static void
added_cb (NMRemoteSettings *settings,

View file

@ -30,12 +30,7 @@
#include <glib.h>
#include <dbus/dbus-glib.h>
#include <nm-connection.h>
#include <nm-setting-connection.h>
#include <nm-setting-wired.h>
#include <nm-setting-ip4-config.h>
#include <nm-dbus-interface.h>
#include <nm-utils.h>
#include <NetworkManager.h>
#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
#define DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT))

View file

@ -29,12 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <nm-client.h>
#include <nm-device.h>
#include <nm-device-wifi.h>
#include <nm-access-point.h>
#include <nm-dbus-interface.h>
#include <nm-utils.h>
#include <NetworkManager.h>
/* Convert flags to string */
static char *

View file

@ -29,7 +29,7 @@
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <nm-dbus-interface.h>
#include <NetworkManager.h>
#define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))

View file

@ -29,11 +29,7 @@
#include <stdlib.h>
#include <signal.h>
#include <nm-connection.h>
#include <nm-setting-connection.h>
#include <nm-dbus-interface.h>
#include <nm-utils.h>
#include <nm-remote-settings.h>
#include <NetworkManager.h>
/* Global variables */

View file

@ -5,6 +5,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = \
-I${top_srcdir}/include \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)

View file

@ -58,7 +58,6 @@
/**
* SECTION:nm-connection
* @short_description: Describes a connection to specific network or provider
* @include: nm-connection.h
*
* An #NMConnection describes all the settings and configuration values that
* are necessary to configure network devices for operation on a specific

View file

@ -23,6 +23,10 @@
#ifndef NM_CONNECTION_H
#define NM_CONNECTION_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <glib.h>
#include <glib-object.h>
#include <nm-setting.h>

View file

@ -35,7 +35,6 @@
/**
* SECTION:nm-setting-8021x
* @short_description: Describes 802.1x-authenticated connection properties
* @include: nm-setting-8021x.h
*
* The #NMSetting8021x object is a #NMSetting subclass that describes
* properties necessary for connection to 802.1x-authenticated networks, such as

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_8021X_H
#define NM_SETTING_8021X_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -30,7 +30,6 @@
/**
* SECTION:nm-setting-adsl
* @short_description: Describes ADSL-based properties
* @include: nm-setting-adsl.h
*
* The #NMSettingAdsl object is a #NMSetting subclass that describes
* properties of ADSL connections.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_ADSL_H
#define NM_SETTING_ADSL_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -34,7 +34,6 @@
/**
* SECTION:nm-setting-bluetooth
* @short_description: Describes Bluetooth connection properties
* @include: nm-setting-bluetooth.h
*
* The #NMSettingBluetooth object is a #NMSetting subclass that describes
* properties necessary for connection to devices that provide network

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_BLUETOOTH_H
#define NM_SETTING_BLUETOOTH_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include "nm-setting.h"
G_BEGIN_DECLS

View file

@ -37,7 +37,6 @@
/**
* SECTION:nm-setting-bond
* @short_description: Describes connection properties for bonds
* @include: nm-setting-bond.h
*
* The #NMSettingBond object is a #NMSetting subclass that describes properties
* necessary for bond connections.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_BOND_H
#define NM_SETTING_BOND_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -33,7 +33,6 @@
/**
* SECTION:nm-setting-bridge-port
* @short_description: Describes connection properties for bridge ports
* @include: nm-setting-bridge-port.h
*
* The #NMSettingBridgePort object is a #NMSetting subclass that describes
* optional properties that apply to bridge ports.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_BRIDGE_PORT_H
#define NM_SETTING_BRIDGE_PORT_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -36,7 +36,6 @@
/**
* SECTION:nm-setting-bridge
* @short_description: Describes connection properties for bridges
* @include: nm-setting-bridge.h
*
* The #NMSettingBridge object is a #NMSetting subclass that describes properties
* necessary for bridging connections.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_BRIDGE_H
#define NM_SETTING_BRIDGE_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -29,7 +29,6 @@
/**
* SECTION:nm-setting-cdma
* @short_description: Describes CDMA-based mobile broadband properties
* @include: nm-setting-cdma.h
*
* The #NMSettingCdma object is a #NMSetting subclass that describes
* properties that allow connections to IS-95-based mobile broadband

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_CDMA_H
#define NM_SETTING_CDMA_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -32,7 +32,6 @@
/**
* SECTION:nm-setting-connection
* @short_description: Describes general connection properties
* @include: nm-setting-connection.h
*
* The #NMSettingConnection object is a #NMSetting subclass that describes
* properties that apply to all #NMConnection objects, regardless of what type

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_CONNECTION_H
#define NM_SETTING_CONNECTION_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include "nm-setting.h"
G_BEGIN_DECLS

View file

@ -33,7 +33,6 @@
/**
* SECTION:nm-setting-dcb
* @short_description: Connection properties for Data Center Bridging
* @include: nm-setting-dcb.h
*
* The #NMSettingDcb object is a #NMSetting subclass that describes properties
* for enabling and using Data Center Bridging (DCB) on Ethernet networks.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_DCB_H
#define NM_SETTING_DCB_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -27,7 +27,6 @@
/**
* SECTION:nm-setting-generic
* @short_description: Describes connection properties for generic devices
* @include: nm-setting-generic.h
*
* The #NMSettingGeneric object is a #NMSetting subclass that describes
* optional properties that apply to "generic" devices (ie, devices that

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_GENERIC_H
#define NM_SETTING_GENERIC_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -30,7 +30,6 @@
/**
* SECTION:nm-setting-gsm
* @short_description: Describes GSM/3GPP-based mobile broadband properties
* @include: nm-setting-gsm.h
*
* The #NMSettingGsm object is a #NMSetting subclass that describes
* properties that allow connections to 3GPP-based mobile broadband

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_GSM_H
#define NM_SETTING_GSM_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -34,7 +34,6 @@
/**
* SECTION:nm-setting-infiniband
* @short_description: Describes connection properties for IP-over-InfiniBand networks
* @include: nm-setting-infiniband.h
*
* The #NMSettingInfiniband object is a #NMSetting subclass that describes properties
* necessary for connection to IP-over-InfiniBand networks.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_INFINIBAND_H
#define NM_SETTING_INFINIBAND_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -35,7 +35,6 @@
/**
* SECTION:nm-setting-ip4-config
* @short_description: Describes IPv4 addressing, routing, and name service properties
* @include: nm-setting-ip4-config.h
*
* The #NMSettingIP4Config object is a #NMSetting subclass that describes
* properties related to IPv4 addressing, routing, and Domain Name Service

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_IP4_CONFIG_H
#define NM_SETTING_IP4_CONFIG_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include "nm-setting.h"
G_BEGIN_DECLS

View file

@ -33,7 +33,6 @@
/**
* SECTION:nm-setting-ip6-config
* @short_description: Describes IPv6 addressing, routing, and name service properties
* @include: nm-setting-ip6-config.h
*
* The #NMSettingIP6Config object is a #NMSetting subclass that describes
* properties related to IPv6 addressing, routing, and Domain Name Service

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_IP6_CONFIG_H
#define NM_SETTING_IP6_CONFIG_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <arpa/inet.h>
#include "nm-setting.h"

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_OLPC_MESH_H
#define NM_SETTING_OLPC_MESH_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -29,7 +29,6 @@
* SECTION:nm-setting-ppp
* @short_description: Describes connection properties for devices/networks
* that require PPP to deliver IP capability
* @include: nm-setting-ppp.h
*
* The #NMSettingPpp object is a #NMSetting subclass that describes properties
* necessary for connection to networks that require PPP transport, like PPPoE

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_PPP_H
#define NM_SETTING_PPP_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -30,7 +30,6 @@
/**
* SECTION:nm-setting-pppoe
* @short_description: Describes PPPoE connection properties
* @include: nm-setting-pppoe.h
*
* The #NMSettingPppoe object is a #NMSetting subclass that describes
* properties necessary for connection to networks that require PPPoE connections

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_PPPOE_H
#define NM_SETTING_PPPOE_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -30,7 +30,6 @@
* SECTION:nm-setting-serial
* @short_description: Describes connection properties for devices that use
* serial communications
* @include: nm-setting-serial.h
*
* The #NMSettingSerial object is a #NMSetting subclass that describes
* properties necessary for connections that may use serial communications,

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_SERIAL_H
#define NM_SETTING_SERIAL_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -32,7 +32,6 @@
/**
* SECTION:nm-setting-team-port
* @short_description: Describes connection properties for team ports
* @include: nm-setting-team-port.h
*
* The #NMSettingTeamPort object is a #NMSetting subclass that describes
* optional properties that apply to team ports.

View file

@ -21,6 +21,10 @@
#ifndef NM_SETTING_TEAM_PORT_H
#define NM_SETTING_TEAM_PORT_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -33,7 +33,6 @@
/**
* SECTION:nm-setting-team
* @short_description: Describes connection properties for teams
* @include: nm-setting-team.h
*
* The #NMSettingTeam object is a #NMSetting subclass that describes properties
* necessary for team connections.

View file

@ -21,6 +21,10 @@
#ifndef NM_SETTING_TEAM_H
#define NM_SETTING_TEAM_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -34,7 +34,6 @@
/**
* SECTION:nm-setting-vlan
* @short_description: Describes connection properties for VLAN interfaces
* @include: nm-setting-vlan.h
*
* The #NMSettingVlan object is a #NMSetting subclass that describes properties
* necessary for connection to VLAN interfaces.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_VLAN_H
#define NM_SETTING_VLAN_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include "nm-setting.h"
#include <linux/if_vlan.h>

View file

@ -34,7 +34,6 @@
/**
* SECTION:nm-setting-vpn
* @short_description: Describes connection properties for Virtual Private Networks
* @include: nm-setting-vpn.h
*
* The #NMSettingVpn object is a #NMSetting subclass that describes properties
* necessary for connection to Virtual Private Networks. NetworkManager uses

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_VPN_H
#define NM_SETTING_VPN_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -32,7 +32,6 @@
/**
* SECTION:nm-setting-wimax
* @short_description: Describes 802.16e Mobile WiMAX connection properties
* @include: nm-setting-wimax.h
*
* The #NMSettingWimax object is a #NMSetting subclass that describes properties
* necessary for connection to 802.16e Mobile WiMAX networks.

View file

@ -22,6 +22,10 @@
#ifndef NM_SETTING_WIMAX_H
#define NM_SETTING_WIMAX_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -36,7 +36,6 @@
/**
* SECTION:nm-setting-wired
* @short_description: Describes connection properties for Ethernet-based networks
* @include: nm-setting-wired.h
*
* The #NMSettingWired object is a #NMSetting subclass that describes properties
* necessary for connection to Ethernet networks.

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_WIRED_H
#define NM_SETTING_WIRED_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -37,7 +37,6 @@
* SECTION:nm-setting-wireless-security
* @short_description: Describes connection properties for Wi-Fi networks that
* use WEP, LEAP, WPA or WPA2/RSN security
* @include: nm-setting-wireless-security.h
*
* The #NMSettingWirelessSecurity object is a #NMSetting subclass that describes
* properties necessary for connection to encrypted Wi-Fi networks.

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_WIRELESS_SECURITY_H
#define NM_SETTING_WIRELESS_SECURITY_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
G_BEGIN_DECLS

View file

@ -37,7 +37,6 @@
/**
* SECTION:nm-setting-wireless
* @short_description: Describes connection properties for 802.11 Wi-Fi networks
* @include: nm-setting-wireless.h
*
* The #NMSettingWireless object is a #NMSetting subclass that describes properties
* necessary for connection to 802.11 Wi-Fi networks.

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_WIRELESS_H
#define NM_SETTING_WIRELESS_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <nm-setting.h>
#include <nm-setting-wireless-security.h>
#include <nm-dbus-interface.h>

View file

@ -32,7 +32,6 @@
/**
* SECTION:nm-setting
* @short_description: Describes related configuration information
* @include: nm-setting.h
*
* Each #NMSetting contains properties that describe configuration that applies
* to a specific network layer (like IPv4 or IPv6 configuration) or device type

View file

@ -23,6 +23,10 @@
#ifndef NM_SETTING_H
#define NM_SETTING_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <glib.h>
#include <glib-object.h>

View file

@ -37,7 +37,6 @@
/**
* SECTION:nm-utils
* @short_description: Utility functions
* @include: nm-utils.h
*
* A collection of utility functions for working with SSIDs, IP addresses, Wi-Fi
* access points and devices, among other things.

View file

@ -21,6 +21,10 @@
#ifndef NM_UTILS_H
#define NM_UTILS_H
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include <glib.h>
#include "nm-connection.h"

Some files were not shown because too many files have changed in this diff Show more