colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all/trivial: unify construct-only property comments

Browse Source 
Unify marking GObject properties that are G_PARAM_CONSTRUCT_ONLY
with a comment

    /* construct-only */
This commit is contained in:
Thomas Haller
2017-03-08 13:43:56 +01:00
parent 556b7c3b45
commit ab6e370195
12 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-glib/nm-device.c
View File

@@ -519,7 +519,7 @@ set_property (GObject *object,
switch (prop_id) { switch (prop_id) {
case PROP_DEVICE_TYPE: case PROP_DEVICE_TYPE:
/* Construct only */ /* construct-only */
priv->device_type = g_value_get_uint (value); priv->device_type = g_value_get_uint (value);
break; break;
case PROP_MANAGED: case PROP_MANAGED:

4
libnm-glib/nm-object.c
View File

@@ -369,11 +369,11 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_DBUS_CONNECTION: case PROP_DBUS_CONNECTION:
/* Construct only */ /* construct-only */
priv->connection = g_value_dup_boxed (value); priv->connection = g_value_dup_boxed (value);
break; break;
case PROP_DBUS_PATH: case PROP_DBUS_PATH:
/* Construct only */ /* construct-only */
priv->path = g_value_dup_string (value); priv->path = g_value_dup_string (value);
break; break;
default: default:

2
libnm-glib/nm-remote-connection.c
View File

@@ -796,7 +796,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_BUS: case PROP_BUS:
case PROP_DBUS_CONNECTION: case PROP_DBUS_CONNECTION:
/* Construct only */ /* construct-only */
/* priv->bus is set from either of two properties so that it (a) remains /* priv->bus is set from either of two properties so that it (a) remains
* backwards compatible with the previous "bus" property, and that (b) * backwards compatible with the previous "bus" property, and that (b)
* it can be created just like an NMObject using the "dbus-connection", * it can be created just like an NMObject using the "dbus-connection",

2
libnm-glib/nm-remote-settings.c
View File

@@ -1429,7 +1429,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_BUS: case PROP_BUS:
/* Construct only */ /* construct-only */
priv->bus = g_value_dup_boxed (value); priv->bus = g_value_dup_boxed (value);
if (!priv->bus) if (!priv->bus)
priv->bus = _nm_dbus_new_connection (NULL); priv->bus = _nm_dbus_new_connection (NULL);

2
libnm-glib/nm-vpn-plugin.c
View File

@@ -799,7 +799,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_DBUS_SERVICE_NAME: case PROP_DBUS_SERVICE_NAME:
/* Construct-only */ /* construct-only */
priv->dbus_service_name = g_value_dup_string (value); priv->dbus_service_name = g_value_dup_string (value);
break; break;
case PROP_STATE: case PROP_STATE:

4
libnm/nm-object.c
View File

@@ -1200,13 +1200,13 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_DBUS_OBJECT: case PROP_DBUS_OBJECT:
/* Construct only */ /* construct-only */
priv->object = g_value_dup_object (value); priv->object = g_value_dup_object (value);
if (!priv->object) if (!priv->object)
g_return_if_reached (); g_return_if_reached ();
break; break;
case PROP_DBUS_OBJECT_MANAGER: case PROP_DBUS_OBJECT_MANAGER:
/* Construct only */ /* construct-only */
priv->object_manager = g_value_dup_object (value); priv->object_manager = g_value_dup_object (value);
break; break;
default: default:

2
libnm/nm-vpn-plugin-old.c
View File

@@ -1025,7 +1025,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_DBUS_SERVICE_NAME: case PROP_DBUS_SERVICE_NAME:
/* Construct-only */ /* construct-only */
priv->dbus_service_name = g_value_dup_string (value); priv->dbus_service_name = g_value_dup_string (value);
break; break;
case PROP_STATE: case PROP_STATE:

4
libnm/nm-vpn-service-plugin.c
View File

@@ -1047,11 +1047,11 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_DBUS_SERVICE_NAME: case PROP_DBUS_SERVICE_NAME:
/* Construct-only */ /* construct-only */
priv->dbus_service_name = g_value_dup_string (value); priv->dbus_service_name = g_value_dup_string (value);
break; break;
case PROP_DBUS_WATCH_PEER: case PROP_DBUS_WATCH_PEER:
/* Construct-only */ /* construct-only */
priv->dbus_watch_peer = g_value_get_boolean (value); priv->dbus_watch_peer = g_value_get_boolean (value);
break; break;
case PROP_STATE: case PROP_STATE:

6
src/devices/bluetooth/nm-device-bt.c
View File

@@ -1029,15 +1029,15 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_BT_NAME: case PROP_BT_NAME:
/* Construct only */ /* construct-only */
priv->name = g_value_dup_string (value); priv->name = g_value_dup_string (value);
break; break;
case PROP_BT_CAPABILITIES: case PROP_BT_CAPABILITIES:
/* Construct only */ /* construct-only */
priv->capabilities = g_value_get_uint (value); priv->capabilities = g_value_get_uint (value);
break; break;
case PROP_BT_DEVICE: case PROP_BT_DEVICE:
/* Construct only */ /* construct-only */
priv->bt_device = g_value_dup_object (value); priv->bt_device = g_value_dup_object (value);
g_signal_connect (priv->bt_device, "removed", G_CALLBACK (bluez_device_removed), object); g_signal_connect (priv->bt_device, "removed", G_CALLBACK (bluez_device_removed), object);
break; break;

8
src/devices/wwan/nm-modem.c
View File

@@ -1447,15 +1447,15 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_PATH: case PROP_PATH:
/* Construct only */ /* construct-only */
priv->path = g_value_dup_string (value); priv->path = g_value_dup_string (value);
break; break;
case PROP_DRIVER: case PROP_DRIVER:
/* Construct only */ /* construct-only */
priv->driver = g_value_dup_string (value); priv->driver = g_value_dup_string (value);
break; break;
case PROP_CONTROL_PORT: case PROP_CONTROL_PORT:
/* Construct only */ /* construct-only */
priv->control_port = g_value_dup_string (value); priv->control_port = g_value_dup_string (value);
break; break;
case PROP_DATA_PORT: case PROP_DATA_PORT:
@@ -1463,7 +1463,7 @@ set_property (GObject *object, guint prop_id,
priv->data_port = g_value_dup_string (value); priv->data_port = g_value_dup_string (value);
break; break;
case PROP_UID: case PROP_UID:
/* Construct only */ /* construct-only */
priv->uid = g_value_dup_string (value); priv->uid = g_value_dup_string (value);
break; break;
case PROP_IP4_METHOD: case PROP_IP4_METHOD:

6
src/nm-auth-subject.c
View File

@@ -290,9 +290,9 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
const char *str; const char *str;
gulong id; gulong id;
/* all properties are construct-only */
switch (prop_id) { switch (prop_id) {
case PROP_SUBJECT_TYPE: case PROP_SUBJECT_TYPE:
/* construct-only */
i = g_value_get_int (value); 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)); g_return_if_fail (NM_IN_SET (i, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS));
subject_type = i; subject_type = i;
@@ -300,6 +300,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
g_return_if_fail (priv->subject_type == subject_type); g_return_if_fail (priv->subject_type == subject_type);
break; break;
case PROP_UNIX_PROCESS_DBUS_SENDER: case PROP_UNIX_PROCESS_DBUS_SENDER:
/* construct-only */
if ((str = g_value_get_string (value))) { if ((str = g_value_get_string (value))) {
priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS;
g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS);
@@ -307,6 +308,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
} }
break; break;
case PROP_UNIX_PROCESS_PID: case PROP_UNIX_PROCESS_PID:
/* construct-only */
if ((id = g_value_get_ulong (value)) != G_MAXULONG) { if ((id = g_value_get_ulong (value)) != G_MAXULONG) {
priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS;
g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS);
@@ -314,6 +316,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
} }
break; break;
case PROP_UNIX_PROCESS_UID: case PROP_UNIX_PROCESS_UID:
/* construct-only */
if ((id = g_value_get_ulong (value)) != G_MAXULONG) { if ((id = g_value_get_ulong (value)) != G_MAXULONG) {
priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS;
g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS);
@@ -407,7 +410,6 @@ nm_auth_subject_class_init (NMAuthSubjectClass *config_class)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (config_class); GObjectClass *object_class = G_OBJECT_CLASS (config_class);
/* virtual methods */
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->set_property = set_property; object_class->set_property = set_property;
object_class->constructed = constructed; object_class->constructed = constructed;

6
src/nm-config-data.c
View File

@@ -1437,15 +1437,17 @@ set_property (GObject *object,
NMConfigData *self = NM_CONFIG_DATA (object); NMConfigData *self = NM_CONFIG_DATA (object);
NMConfigDataPrivate *priv = NM_CONFIG_DATA_GET_PRIVATE (self); NMConfigDataPrivate *priv = NM_CONFIG_DATA_GET_PRIVATE (self);
/* This type is immutable. All properties are construct only. */
switch (prop_id) { switch (prop_id) {
case PROP_CONFIG_MAIN_FILE: case PROP_CONFIG_MAIN_FILE:
/* construct-only */
priv->config_main_file = g_value_dup_string (value); priv->config_main_file = g_value_dup_string (value);
break; break;
case PROP_CONFIG_DESCRIPTION: case PROP_CONFIG_DESCRIPTION:
/* construct-only */
priv->config_description = g_value_dup_string (value); priv->config_description = g_value_dup_string (value);
break; break;
case PROP_KEYFILE_USER: case PROP_KEYFILE_USER:
/* construct-only */
priv->keyfile_user = g_value_dup_boxed (value); priv->keyfile_user = g_value_dup_boxed (value);
if ( priv->keyfile_user if ( priv->keyfile_user
&& !_nm_keyfile_has_values (priv->keyfile_user)) { && !_nm_keyfile_has_values (priv->keyfile_user)) {
@@ -1454,6 +1456,7 @@ set_property (GObject *object,
} }
break; break;
case PROP_KEYFILE_INTERN: case PROP_KEYFILE_INTERN:
/* construct-only */
priv->keyfile_intern = g_value_dup_boxed (value); priv->keyfile_intern = g_value_dup_boxed (value);
if ( priv->keyfile_intern if ( priv->keyfile_intern
&& !_nm_keyfile_has_values (priv->keyfile_intern)) { && !_nm_keyfile_has_values (priv->keyfile_intern)) {
@@ -1462,6 +1465,7 @@ set_property (GObject *object,
} }
break; break;
case PROP_NO_AUTO_DEFAULT: case PROP_NO_AUTO_DEFAULT:
/* construct-only */
{ {
char **value_arr = g_value_get_boxed (value); char **value_arr = g_value_get_boxed (value);
guint i, j = 0; guint i, j = 0;