summaryrefslogtreecommitdiff
path: root/src/nm-active-connection.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-07-17 17:06:44 -0400
committerDan Winship <danw@gnome.org>2014-07-23 10:56:26 -0400
commitb28f6526c27b920827416315f13ca051bf5a644d (patch)
treedc8a924222fc59fe15091558f23d02c576dd3a0c /src/nm-active-connection.h
parentb7c7832ae87054bdf4138d0c509a3a31504f69cf (diff)
downloadNetworkManager-b28f6526c27b920827416315f13ca051bf5a644d.tar.gz
core: fill in nm-types.h, clean out other headers
Clean up some of the cross-includes between headers (which made it so that, eg, if you included NetworkManagerUtils.h in a test program, you would need to build the test with -I$(top_srcdir)/src/platform, and if you included nm-device.h you'd need $(POLKIT_CFLAGS)) by moving all GObject struct definitions for src/ and src/settings/ into nm-types.h (which already existed to solve the NMDevice/NMActRequest circular references). Update various .c files to explicitly include the headers they used to get implicitly, and remove some now-unnecessary -I options from Makefiles.
Diffstat (limited to 'src/nm-active-connection.h')
-rw-r--r--src/nm-active-connection.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index 0d96c87236..2609ed9ddf 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -24,7 +24,6 @@
#include <glib-object.h>
#include "nm-types.h"
#include "nm-connection.h"
-#include "nm-auth-subject.h"
#define NM_TYPE_ACTIVE_CONNECTION (nm_active_connection_get_type ())
#define NM_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection))
@@ -57,9 +56,9 @@
#define NM_ACTIVE_CONNECTION_INT_MASTER "int-master"
#define NM_ACTIVE_CONNECTION_INT_MASTER_READY "int-master-ready"
-typedef struct {
+struct _NMActiveConnection {
GObject parent;
-} NMActiveConnection;
+};
typedef struct {
GObjectClass parent;