system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: don't use generated glib enum for NMAuthSubjectType

Browse source
This commit is contained in:
Thomas Haller 2016-10-22 13:02:15 +02:00
parent 5657d4dffb
commit 931a5b4f1c
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1133,7 +1133,6 @@ src_libNetworkManagerBase_la_LIBADD = \
src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
src_libNetworkManager_la_SOURCES_enum = \
src/nm-auth-subject.h \
src/platform/nm-platform.h \
src/nm-types.h \
$(NULL)
@ -1319,6 +1318,7 @@ src_libNetworkManager_la_SOURCES = \
src/nm-auth-manager.c \
src/nm-auth-manager.h \
src/nm-auth-subject.c \
src/nm-auth-subject.h \
src/nm-auth-utils.c \
src/nm-auth-utils.h \
src/nm-manager.c \

25
src/nm-auth-subject.c
View file

@ -213,7 +213,7 @@ _new_unix_process (GDBusMethodInvocation *context,
g_return_val_if_fail (pid > 0 && pid <= MIN (G_MAXINT, G_MAXINT32), NULL);
self = NM_AUTH_SUBJECT (g_object_new (NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE, NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
NM_AUTH_SUBJECT_SUBJECT_TYPE, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
NM_AUTH_SUBJECT_UNIX_PROCESS_DBUS_SENDER, dbus_sender,
NM_AUTH_SUBJECT_UNIX_PROCESS_PID, (gulong) pid,
NM_AUTH_SUBJECT_UNIX_PROCESS_UID, (gulong) uid,
@ -252,7 +252,7 @@ NMAuthSubject *
nm_auth_subject_new_internal (void)
{
return NM_AUTH_SUBJECT (g_object_new (NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE, NM_AUTH_SUBJECT_TYPE_INTERNAL,
NM_AUTH_SUBJECT_SUBJECT_TYPE, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL,
NULL));
}
@ -265,7 +265,7 @@ get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
switch (prop_id) {
case PROP_SUBJECT_TYPE:
g_value_set_enum (value, priv->subject_type);
g_value_set_int (value, priv->subject_type);
break;
case PROP_UNIX_PROCESS_DBUS_SENDER:
g_value_set_string (value, priv->unix_process.dbus_sender);
@ -287,14 +287,16 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
{
NMAuthSubjectPrivate *priv = NM_AUTH_SUBJECT_GET_PRIVATE ((NMAuthSubject *) object);
NMAuthSubjectType subject_type;
int i;
const char *str;
gulong id;
/* all properties are construct-only */
switch (prop_id) {
case PROP_SUBJECT_TYPE:
subject_type = g_value_get_enum (value);
g_return_if_fail (subject_type != NM_AUTH_SUBJECT_TYPE_INVALID);
i = g_value_get_int (value);
g_return_if_fail (NM_IN_SET (i, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS));
subject_type = i;
priv->subject_type |= subject_type;
g_return_if_fail (priv->subject_type == subject_type);
break;
@ -414,12 +416,13 @@ nm_auth_subject_class_init (NMAuthSubjectClass *config_class)
g_object_class_install_property
(object_class, PROP_SUBJECT_TYPE,
g_param_spec_enum (NM_AUTH_SUBJECT_SUBJECT_TYPE, "", "",
NM_TYPE_AUTH_SUBJECT_TYPE,
NM_AUTH_SUBJECT_TYPE_INVALID,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
g_param_spec_int (NM_AUTH_SUBJECT_SUBJECT_TYPE, "", "",
NM_AUTH_SUBJECT_TYPE_INVALID,
NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
NM_AUTH_SUBJECT_TYPE_INVALID,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_UNIX_PROCESS_DBUS_SENDER,