diff options
author | Dan Winship <danw@gnome.org> | 2014-07-17 17:06:44 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-07-23 10:56:26 -0400 |
commit | b28f6526c27b920827416315f13ca051bf5a644d (patch) | |
tree | dc8a924222fc59fe15091558f23d02c576dd3a0c /src/nm-manager.h | |
parent | b7c7832ae87054bdf4138d0c509a3a31504f69cf (diff) | |
download | NetworkManager-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-manager.h')
-rw-r--r-- | src/nm-manager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 81eefc7b00..40c61b2f23 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -25,9 +25,9 @@ #include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> -#include "nm-device.h" -#include "nm-settings.h" -#include "nm-auth-subject.h" + +#include "nm-types.h" +#include "nm-connection.h" #define NM_TYPE_MANAGER (nm_manager_get_type ()) #define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager)) @@ -77,9 +77,9 @@ typedef enum { #define NM_MANAGER_ACTIVE_CONNECTION_REMOVED "active-connection-removed" -typedef struct { +struct _NMManager { GObject parent; -} NMManager; +}; typedef struct { GObjectClass parent; |