diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-07 10:11:46 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:39 -0400 |
| commit | dc1b76432b10d0cfd074db45c0b115b149f746a2 (patch) | |
| tree | cbc2bd85289c577543770f9f59f76980a78bef23 /include | |
| parent | 9a930b3e892e4becaf6917883e7a311e487bc42f (diff) | |
| download | NetworkManager-dc1b76432b10d0cfd074db45c0b115b149f746a2.tar.gz | |
include: drop nm-settings-flags.h, move NMSecretAgentGetSecretsFlags
For some reason, the flags used by o.fd.NM.SecretAgent.GetSecrets were
defined as both NMSecretAgentGetSecretsFlags in
libnm{,-glib}/nm-secret-agent.h, and then separately as
NMSettingsGetSecretsFlags in include/nm-settings-flags.h.
(NMSettingsGetSecretsFlags also had an additional internal-use-only
value, but that was added later after the duplication already
existed.)
Fix this by moving NMSecretAgentGetSecretsFlags from libnm to
nm-dbus-interface.h, adding the internal-use-only value to it as well,
updating the core code to use that, and then removing
nm-settings-flags.h.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | include/nm-settings-flags.h | 37 |
2 files changed, 0 insertions, 38 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index f7667c56a8..6e84a5b63a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ nm-glib-compat.h \ nm-gvaluearray-compat.h \ nm-test-utils.h \ - nm-settings-flags.h \ nm-utils-internal.h CLEANFILES=nm-version.h diff --git a/include/nm-settings-flags.h b/include/nm-settings-flags.h deleted file mode 100644 index 360f13922a..0000000000 --- a/include/nm-settings-flags.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* - * 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 2011 Red Hat, Inc. - */ - -#ifndef NM_SETTINGS_FLAGS_H -#define NM_SETTINGS_FLAGS_H - -/* NOTE: these values should match the NM_SECRET_AGENT_GET_SECRETS_FLAGS in - * the nm-secret-agent.xml introspection file; except ONLY_SYSTEM which is - * internal to NM. - */ -typedef enum { - NM_SETTINGS_GET_SECRETS_FLAG_NONE = 0x0, - NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1, - NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW = 0x2, - NM_SETTINGS_GET_SECRETS_FLAG_USER_REQUESTED = 0x4, - - /* Internal only to NM */ - NM_SETTINGS_GET_SECRETS_FLAG_ONLY_SYSTEM = 0x80000000 -} NMSettingsGetSecretsFlags; - -#endif /* NM_SETTINGS_FLAGS_H */ |