summaryrefslogtreecommitdiff
path: root/src/nm-rfkill-manager.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-rfkill-manager.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-rfkill-manager.h')
-rw-r--r--src/nm-rfkill-manager.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h
index b26261b83f..a507421855 100644
--- a/src/nm-rfkill-manager.h
+++ b/src/nm-rfkill-manager.h
@@ -21,6 +21,8 @@
#include <glib-object.h>
+#include "nm-types.h"
+
#ifndef NM_RFKILL_MANAGER_H
#define NM_RFKILL_MANAGER_H
@@ -51,9 +53,9 @@ typedef enum {
#define NM_IS_RFKILL_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_RFKILL_MANAGER))
#define NM_RFKILL_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_RFKILL_MANAGER, NMRfkillManagerClass))
-typedef struct {
+struct _NMRfkillManager {
GObject parent;
-} NMRfkillManager;
+};
typedef struct {
GObjectClass parent;