diff options
36 files changed, 150 insertions, 133 deletions
diff --git a/libnm/Makefile.am b/libnm/Makefile.am index e3945b88b6..458aee8860 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -51,6 +51,7 @@ libnminclude_HEADERS = \ nm-object.h \ nm-remote-connection.h \ nm-secret-agent.h \ + nm-types.h \ nm-vpn-connection.h \ nm-vpn-plugin.h \ nm-vpn-plugin-ui-interface.h \ diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h index 1062388d09..53935e5fa9 100644 --- a/libnm/nm-access-point.h +++ b/libnm/nm-access-point.h @@ -26,11 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include <nm-dbus-interface.h> -#include <nm-connection.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -55,9 +51,9 @@ G_BEGIN_DECLS #define NM_ACCESS_POINT_HW_ADDRESS "hw-address" -typedef struct { +struct _NMAccessPoint { NMObject parent; -} NMAccessPoint; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index 2c6c2ec8f8..80ab449355 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -31,6 +31,10 @@ #include "nm-vpn-connection.h" #include "nm-glib-compat.h" #include "nm-dbus-helpers.h" +#include "nm-dhcp4-config.h" +#include "nm-dhcp6-config.h" +#include "nm-ip4-config.h" +#include "nm-ip6-config.h" static GType _nm_active_connection_decide_type (GVariant *value); diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h index 09fe891edb..2b0d6821c1 100644 --- a/libnm/nm-active-connection.h +++ b/libnm/nm-active-connection.h @@ -26,15 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" -#include <nm-connection.h> -#include <nm-dbus-interface.h> -#include "nm-ip4-config.h" -#include "nm-dhcp4-config.h" -#include "nm-ip6-config.h" -#include "nm-dhcp6-config.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -61,9 +53,9 @@ G_BEGIN_DECLS #define NM_ACTIVE_CONNECTION_VPN "vpn" #define NM_ACTIVE_CONNECTION_MASTER "master" -typedef struct { +struct _NMActiveConnection { NMObject parent; -} NMActiveConnection; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 9ecb77a1cf..87b01d62b0 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -31,6 +31,7 @@ #include "nm-core-internal.h" #include "nm-active-connection.h" #include "nm-vpn-connection.h" +#include "nm-remote-connection.h" #include "nm-object-cache.h" #include "nm-glib-compat.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 99de7e003a..64bd0a0d32 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -26,15 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include <gio/gio.h> - -#include <nm-dbus-interface.h> -#include "nm-device.h" -#include "nm-active-connection.h" -#include "nm-remote-connection.h" -#include "nm-vpn-connection.h" +#include <nm-types.h> G_BEGIN_DECLS @@ -159,9 +151,9 @@ typedef enum { #define NM_CLIENT_ERROR nm_client_error_quark () GQuark nm_client_error_quark (void); -typedef struct { +struct _NMClient { GObject parent; -} NMClient; +}; typedef struct { GObjectClass parent; diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h index 3c175f0f86..d76f35a891 100644 --- a/libnm/nm-device-adsl.h +++ b/libnm/nm-device-adsl.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -53,9 +53,9 @@ GQuark nm_device_adsl_error_quark (void); #define NM_DEVICE_ADSL_CARRIER "carrier" -typedef struct { +struct _NMDeviceAdsl { NMDevice parent; -} NMDeviceAdsl; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h index 8e1522af2a..e8ffd8e633 100644 --- a/libnm/nm-device-bond.h +++ b/libnm/nm-device-bond.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -57,9 +57,9 @@ GQuark nm_device_bond_error_quark (void); #define NM_DEVICE_BOND_CARRIER "carrier" #define NM_DEVICE_BOND_SLAVES "slaves" -typedef struct { +struct _NMDeviceBond { NMDevice parent; -} NMDeviceBond; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h index 05c6ea72c5..4ec490e13f 100644 --- a/libnm/nm-device-bridge.h +++ b/libnm/nm-device-bridge.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -57,9 +57,9 @@ GQuark nm_device_bridge_error_quark (void); #define NM_DEVICE_BRIDGE_CARRIER "carrier" #define NM_DEVICE_BRIDGE_SLAVES "slaves" -typedef struct { +struct _NMDeviceBridge { NMDevice parent; -} NMDeviceBridge; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h index 5861e812a8..b6c6045ead 100644 --- a/libnm/nm-device-bt.h +++ b/libnm/nm-device-bt.h @@ -26,8 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-dbus-interface.h" -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -63,9 +62,9 @@ GQuark nm_device_bt_error_quark (void); #define NM_DEVICE_BT_NAME "name" #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities" -typedef struct { +struct _NMDeviceBt { NMDevice parent; -} NMDeviceBt; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h index 68a8f40104..caea242c87 100644 --- a/libnm/nm-device-ethernet.h +++ b/libnm/nm-device-ethernet.h @@ -26,7 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -61,9 +61,9 @@ GQuark nm_device_ethernet_error_quark (void); #define NM_DEVICE_ETHERNET_SPEED "speed" #define NM_DEVICE_ETHERNET_CARRIER "carrier" -typedef struct { +struct _NMDeviceEthernet { NMDevice parent; -} NMDeviceEthernet; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h index d6160be671..be0d932d93 100644 --- a/libnm/nm-device-generic.h +++ b/libnm/nm-device-generic.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -54,9 +54,9 @@ GQuark nm_device_generic_error_quark (void); #define NM_DEVICE_GENERIC_HW_ADDRESS "hw-address" #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description" -typedef struct { +struct _NMDeviceGeneric { NMDevice parent; -} NMDeviceGeneric; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h index 279af5026f..ac15410afa 100644 --- a/libnm/nm-device-infiniband.h +++ b/libnm/nm-device-infiniband.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -58,9 +58,9 @@ GQuark nm_device_infiniband_error_quark (void); #define NM_DEVICE_INFINIBAND_HW_ADDRESS "hw-address" #define NM_DEVICE_INFINIBAND_CARRIER "carrier" -typedef struct { +struct _NMDeviceInfiniband { NMDevice parent; -} NMDeviceInfiniband; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h index 22e2195035..dd5b2656ea 100644 --- a/libnm/nm-device-modem.h +++ b/libnm/nm-device-modem.h @@ -26,7 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -57,9 +57,9 @@ GQuark nm_device_modem_error_quark (void); #define NM_DEVICE_MODEM_MODEM_CAPABILITIES "modem-capabilities" #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities" -typedef struct { +struct _NMDeviceModem { NMDevice parent; -} NMDeviceModem; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h index 69097b063c..c1bb7a9e28 100644 --- a/libnm/nm-device-olpc-mesh.h +++ b/libnm/nm-device-olpc-mesh.h @@ -25,8 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" -#include "nm-device-wifi.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -56,9 +55,9 @@ GQuark nm_device_olpc_mesh_error_quark (void); #define NM_DEVICE_OLPC_MESH_COMPANION "companion" #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel" -typedef struct { +struct _NMDeviceOlpcMesh { NMDevice parent; -} NMDeviceOlpcMesh; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h index 3cb4e358ed..f8b9548b00 100644 --- a/libnm/nm-device-team.h +++ b/libnm/nm-device-team.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -57,9 +57,9 @@ GQuark nm_device_team_error_quark (void); #define NM_DEVICE_TEAM_CARRIER "carrier" #define NM_DEVICE_TEAM_SLAVES "slaves" -typedef struct { +struct _NMDeviceTeam { NMDevice parent; -} NMDeviceTeam; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h index 574e13c7e9..379364beba 100644 --- a/libnm/nm-device-vlan.h +++ b/libnm/nm-device-vlan.h @@ -25,7 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -61,9 +61,9 @@ GQuark nm_device_vlan_error_quark (void); #define NM_DEVICE_VLAN_CARRIER "carrier" #define NM_DEVICE_VLAN_VLAN_ID "vlan-id" -typedef struct { +struct _NMDeviceVlan { NMDevice parent; -} NMDeviceVlan; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 84c8288e0e..1d0cd39aa7 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -30,6 +30,7 @@ #include <nm-utils.h> #include "nm-device-wifi.h" +#include "nm-access-point.h" #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-object-cache.h" diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h index bb9788cc07..7947f6959f 100644 --- a/libnm/nm-device-wifi.h +++ b/libnm/nm-device-wifi.h @@ -26,8 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" -#include "nm-access-point.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -71,9 +70,9 @@ GQuark nm_device_wifi_error_quark (void); #define NM_DEVICE_WIFI_CAPABILITIES "wireless-capabilities" #define NM_DEVICE_WIFI_ACCESS_POINTS "access-points" -typedef struct { +struct _NMDeviceWifi { NMDevice parent; -} NMDeviceWifi; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index ec16279191..dfb6fbe53d 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -29,6 +29,7 @@ #include <nm-utils.h> #include "nm-device-wimax.h" +#include "nm-wimax-nsp.h" #include "nm-object-private.h" #include "nm-object-cache.h" #include "nm-core-internal.h" diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h index 36b13e4f69..ea76547b15 100644 --- a/libnm/nm-device-wimax.h +++ b/libnm/nm-device-wimax.h @@ -26,8 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-device.h" -#include "nm-wimax-nsp.h" +#include <nm-device.h> G_BEGIN_DECLS @@ -66,9 +65,9 @@ GQuark nm_device_wimax_error_quark (void); #define NM_DEVICE_WIMAX_BSID "bsid" #define NM_DEVICE_WIMAX_NSPS "nsps" -typedef struct { +struct _NMDeviceWimax { NMDevice parent; -} NMDeviceWimax; +}; typedef struct { NMDeviceClass parent; diff --git a/libnm/nm-device.c b/libnm/nm-device.c index f523fdf1f2..e1cadb1ae8 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -25,6 +25,7 @@ #include <gudev/gudev.h> #include "nm-dbus-interface.h" +#include "nm-active-connection.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" #include "nm-device-wifi.h" @@ -40,6 +41,10 @@ #include "nm-device-generic.h" #include "nm-device.h" #include "nm-device-private.h" +#include "nm-dhcp4-config.h" +#include "nm-dhcp6-config.h" +#include "nm-ip4-config.h" +#include "nm-ip6-config.h" #include "nm-object-private.h" #include "nm-object-cache.h" #include "nm-remote-connection.h" diff --git a/libnm/nm-device.h b/libnm/nm-device.h index f19c675ffe..5af1e07b29 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -26,16 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" -#include "nm-dbus-interface.h" -#include "nm-ip4-config.h" -#include "nm-dhcp4-config.h" -#include "nm-ip6-config.h" -#include "nm-dhcp6-config.h" -#include "nm-connection.h" -#include "nm-active-connection.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -84,9 +75,9 @@ GQuark nm_device_error_quark (void); #define NM_DEVICE_PHYSICAL_PORT_ID "physical-port-id" #define NM_DEVICE_MTU "mtu" -typedef struct { +struct _NMDevice { NMObject parent; -} NMDevice; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h index 306327843d..90152c8f63 100644 --- a/libnm/nm-dhcp4-config.h +++ b/libnm/nm-dhcp4-config.h @@ -26,9 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -38,9 +36,9 @@ G_BEGIN_DECLS #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) -typedef struct { +struct _NMDhcp4Config { NMObject parent; -} NMDhcp4Config; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index f5c43017f4..53bd45eeb7 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -26,9 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -38,9 +36,9 @@ G_BEGIN_DECLS #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) -typedef struct { +struct _NMDhcp6Config { NMObject parent; -} NMDhcp6Config; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h index ce65fd8cbd..a933a5e277 100644 --- a/libnm/nm-ip4-config.h +++ b/libnm/nm-ip4-config.h @@ -26,9 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -39,9 +37,9 @@ G_BEGIN_DECLS #define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG)) #define NM_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) -typedef struct { +struct _NMIP4Config { NMObject parent; -} NMIP4Config; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h index 385bfdf73e..2c98633411 100644 --- a/libnm/nm-ip6-config.h +++ b/libnm/nm-ip6-config.h @@ -26,9 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -39,9 +37,9 @@ G_BEGIN_DECLS #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG)) #define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) -typedef struct { +struct _NMIP6Config { NMObject parent; -} NMIP6Config; +}; typedef struct { NMObjectClass parent; diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h index 6b74b44483..430b038e03 100644 --- a/libnm/nm-manager.h +++ b/libnm/nm-manager.h @@ -22,8 +22,8 @@ #ifndef __NM_MANAGER_H__ #define __NM_MANAGER_H__ -#include "nm-client.h" -#include "nm-object.h" +#include <nm-object.h> +#include <nm-client.h> G_BEGIN_DECLS diff --git a/libnm/nm-object.h b/libnm/nm-object.h index 69232364f4..829c539229 100644 --- a/libnm/nm-object.h +++ b/libnm/nm-object.h @@ -26,9 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <gio/gio.h> - -#include <nm-version.h> +#include <nm-types.h> G_BEGIN_DECLS @@ -58,9 +56,9 @@ GQuark nm_object_error_quark (void); #define NM_OBJECT_PATH "path" #define NM_OBJECT_DBUS_CONNECTION "dbus-connection" -typedef struct { +struct _NMObject { GObject parent; -} NMObject; +}; typedef struct { GObjectClass parent; diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index 6631e01b0a..191a8c3fa9 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -26,7 +26,6 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <nm-connection.h> #include <nm-object.h> G_BEGIN_DECLS @@ -58,9 +57,9 @@ GQuark nm_remote_connection_error_quark (void); #define NM_REMOTE_CONNECTION_UNSAVED "unsaved" #define NM_REMOTE_CONNECTION_VISIBLE "visible" -typedef struct { +struct _NMRemoteConnection { NMObject parent; -} NMRemoteConnection; +}; typedef struct { NMObjectClass parent_class; diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 12e5450375..2c2dd597e6 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -25,6 +25,7 @@ #include "nm-remote-settings.h" #include "nm-client.h" +#include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h index bed6a495e4..dbe39abe5e 100644 --- a/libnm/nm-remote-settings.h +++ b/libnm/nm-remote-settings.h @@ -22,10 +22,7 @@ #ifndef __NM_REMOTE_SETTINGS_H__ #define __NM_REMOTE_SETTINGS_H__ -#include <gio/gio.h> #include <nm-object.h> -#include <nm-connection.h> -#include <nm-remote-connection.h> G_BEGIN_DECLS diff --git a/libnm/nm-secret-agent.h b/libnm/nm-secret-agent.h index 90fcc7d7e1..6b88699005 100644 --- a/libnm/nm-secret-agent.h +++ b/libnm/nm-secret-agent.h @@ -25,8 +25,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <gio/gio.h> -#include <nm-connection.h> +#include <nm-types.h> G_BEGIN_DECLS @@ -72,9 +71,9 @@ typedef enum { #define NM_SECRET_AGENT_REGISTERED "registered" #define NM_SECRET_AGENT_CAPABILITIES "capabilities" -typedef struct { +struct _NMSecretAgent { GObject parent; -} NMSecretAgent; +}; /** * NMSecretAgentGetSecretsFunc: diff --git a/libnm/nm-types.h b/libnm/nm-types.h new file mode 100644 index 0000000000..940a329454 --- /dev/null +++ b/libnm/nm-types.h @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2014 Red Hat, Inc. + */ + +#ifndef __NM_TYPES_H__ +#define __NM_TYPES_H__ + +#include <gio/gio.h> + +#include <nm-dbus-interface.h> +#include <nm-connection.h> + +typedef struct _NMAccessPoint NMAccessPoint; +typedef struct _NMActiveConnection NMActiveConnection; +typedef struct _NMClient NMClient; +typedef struct _NMDevice NMDevice; +typedef struct _NMDeviceAdsl NMDeviceAdsl; +typedef struct _NMDeviceBond NMDeviceBond; +typedef struct _NMDeviceBridge NMDeviceBridge; +typedef struct _NMDeviceBt NMDeviceBt; +typedef struct _NMDeviceEthernet NMDeviceEthernet; +typedef struct _NMDeviceGeneric NMDeviceGeneric; +typedef struct _NMDeviceInfiniband NMDeviceInfiniband; +typedef struct _NMDeviceModem NMDeviceModem; +typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh; +typedef struct _NMDeviceTeam NMDeviceTeam; +typedef struct _NMDeviceVlan NMDeviceVlan; +typedef struct _NMDeviceWifi NMDeviceWifi; +typedef struct _NMDeviceWimax NMDeviceWimax; +typedef struct _NMDhcp4Config NMDhcp4Config; +typedef struct _NMDhcp6Config NMDhcp6Config; +typedef struct _NMIP4Config NMIP4Config; +typedef struct _NMIP6Config NMIP6Config; +typedef struct _NMObject NMObject; +typedef struct _NMRemoteConnection NMRemoteConnection; +typedef struct _NMSecretAgent NMSecretAgent; +typedef struct _NMVpnConnection NMVpnConnection; +typedef struct _NMWimaxNsp NMWimaxNsp; + +#endif /* NM_TYPES_H */ diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 86a78d2e0b..349de41ea5 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -26,10 +26,8 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-active-connection.h" -#include "nm-vpn-dbus-interface.h" +#include <nm-active-connection.h> +#include <nm-vpn-dbus-interface.h> G_BEGIN_DECLS @@ -43,9 +41,9 @@ G_BEGIN_DECLS #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" #define NM_VPN_CONNECTION_BANNER "banner" -typedef struct { +struct _NMVpnConnection { NMActiveConnection parent; -} NMVpnConnection; +}; typedef struct { NMActiveConnectionClass parent; diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h index 3cae3fc263..710639e784 100644 --- a/libnm/nm-wimax-nsp.h +++ b/libnm/nm-wimax-nsp.h @@ -26,10 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include <nm-dbus-interface.h> -#include "nm-object.h" +#include <nm-object.h> G_BEGIN_DECLS @@ -51,9 +48,9 @@ typedef enum { NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3 } NMWimaxNspNetworkType; -typedef struct { +struct _NMWimaxNsp { NMObject parent; -} NMWimaxNsp; +}; typedef struct { NMObjectClass parent; |