diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
| commit | 9f612fa9c09bbdc00071d871316da870c6bf0023 (patch) | |
| tree | 9c1be60eceefb3b069df4d2780f9c14967a62edc /src/nm-policy.h | |
| parent | af468d82c62191b070d569257eb2f2ac61da98cc (diff) | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Merge commit 'upstream/0.8.998' into experimental
Diffstat (limited to 'src/nm-policy.h')
| -rw-r--r-- | src/nm-policy.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nm-policy.h b/src/nm-policy.h index 7d99613c..33796bca 100644 --- a/src/nm-policy.h +++ b/src/nm-policy.h @@ -15,22 +15,22 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2004 - 2008 Red Hat, Inc. + * Copyright (C) 2004 - 2010 Red Hat, Inc. * Copyright (C) 2007 - 2008 Novell, Inc. */ -#ifndef NETWORK_MANAGER_POLICY_H -#define NETWORK_MANAGER_POLICY_H +#ifndef NM_POLICY_H +#define NM_POLICY_H -#include "NetworkManager.h" #include "nm-manager.h" #include "nm-vpn-manager.h" -#include "nm-device.h" -#include "nm-activation-request.h" +#include "nm-settings.h" typedef struct NMPolicy NMPolicy; -NMPolicy *nm_policy_new (NMManager *manager, NMVPNManager *vpn_manager); +NMPolicy *nm_policy_new (NMManager *manager, + NMVPNManager *vpn_manager, + NMSettings *settings); void nm_policy_destroy (NMPolicy *policy); -#endif /* NETWORK_MANAGER_POLICY_H */ +#endif /* NM_POLICY_H */ |