diff options
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/meson.build | 26 | ||||
| -rw-r--r-- | libnm/nm-device.c | 6 | ||||
| -rw-r--r-- | libnm/nm-property-docs.xml | 4 | ||||
| -rw-r--r-- | libnm/nm-remote-connection.c | 11 | ||||
| -rw-r--r-- | libnm/nm-settings-docs.xml | 4 |
5 files changed, 39 insertions, 12 deletions
diff --git a/libnm/meson.build b/libnm/meson.build index 91fe972e..76c77d0c 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -235,13 +235,31 @@ if enable_introspection generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py') + gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout() + if gi_typelib_path != '' + gi_typelib_path = ':' + gi_typelib_path + endif + gi_typelib_path = meson.current_build_dir() + gi_typelib_path + + ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH').stdout() + if ld_library_path != '' + ld_library_path = ':' + ld_library_path + endif + ld_library_path = meson.current_build_dir() + ld_library_path + + generate_setting_docs_env = [ + 'env', '-i', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path + ] + name = 'nm-property-docs.xml' nm_property_docs = custom_target( name, input: libnm_gir[0], output: name, - command: [generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], - depends: libnm + command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], + depends: libnm_gir ) name = 'nm-settings-docs.xml' @@ -249,8 +267,8 @@ if enable_introspection name, input: libnm_gir[0], output: name, - command: [generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], - depends: libnm + command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], + depends: libnm_gir ) endif diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 57f0bedd..0ae3da53 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1308,11 +1308,11 @@ get_type_name (NMDevice *device) case NM_DEVICE_TYPE_OLPC_MESH: return _("OLPC Mesh"); case NM_DEVICE_TYPE_OVS_INTERFACE: - return _("OpenVSwitch Interface"); + return _("Open vSwitch Interface"); case NM_DEVICE_TYPE_OVS_PORT: - return _("OpenVSwitch Port"); + return _("Open vSwitch Port"); case NM_DEVICE_TYPE_OVS_BRIDGE: - return _("OpenVSwitch Bridge"); + return _("Open vSwitch Bridge"); case NM_DEVICE_TYPE_WIMAX: return _("WiMAX"); case NM_DEVICE_TYPE_MODEM: diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index a857f633..98afd542 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -263,13 +263,13 @@ <property name="rstp-enable" name_upper="RSTP_ENABLE" type="boolean" default="FALSE" description="Enable or disable RSTP." /> <property name="stp-enable" name_upper="STP_ENABLE" type="boolean" default="FALSE" description="Enable or disable STP." /> </setting> - <setting name="ovs-interface" description="OpenVSwitch Interface Settings" name_upper="OVS_INTERFACE" > + <setting name="ovs-interface" description="Open vSwitch Interface Settings" name_upper="OVS_INTERFACE" > <property name="name" name_upper="NAME" type="string" default="ovs-interface" description="The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"." /> <property name="type" name_upper="TYPE" type="string" description="The interface type. Either "internal", or empty." /> </setting> <setting name="ovs-patch" description="OvsPatch Link Settings" name_upper="OVS_PATCH" > <property name="name" name_upper="NAME" type="string" default="ovs-patch" description="The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"." /> - <property name="peer" name_upper="PEER" type="string" description="Specifies the unicast destination IP address of a remote OpenVSwitch bridge port to connect to." /> + <property name="peer" name_upper="PEER" type="string" description="Specifies the unicast destination IP address of a remote Open vSwitch bridge port to connect to." /> </setting> <setting name="ovs-port" description="OvsPort Link Settings" name_upper="OVS_PORT" > <property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0" description="The time port must be inactive in order to be considered down." /> diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 45b804f1..6c1e0924 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -35,6 +35,14 @@ #include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h" +/** + * SECTION:nm-remote-connection + * @short_description: A connection managed by NetworkManager server + * + * A #NMRemoteConnection represents a connection that is exported via + * NetworkManager D-Bus interface. + **/ + static void nm_remote_connection_connection_iface_init (NMConnectionInterface *iface); static void nm_remote_connection_initable_iface_init (GInitableIface *iface); static void nm_remote_connection_async_initable_iface_init (GAsyncInitableIface *iface); @@ -62,7 +70,7 @@ typedef struct { gboolean unsaved; guint32 flags; - const char *filename; + char *filename; gboolean visible; } NMRemoteConnectionPrivate; @@ -939,6 +947,7 @@ dispose (GObject *object) NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (object); g_clear_object (&priv->proxy); + nm_clear_g_free (&priv->filename); G_OBJECT_CLASS (nm_remote_connection_parent_class)->dispose (object); } diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml index f5d7b688..8deac083 100644 --- a/libnm/nm-settings-docs.xml +++ b/libnm/nm-settings-docs.xml @@ -269,13 +269,13 @@ <property name="rstp-enable" name_upper="RSTP_ENABLE" type="boolean" default="FALSE" description="Enable or disable RSTP." /> <property name="stp-enable" name_upper="STP_ENABLE" type="boolean" default="FALSE" description="Enable or disable STP." /> </setting> - <setting name="ovs-interface" description="OpenVSwitch Interface Settings" name_upper="OVS_INTERFACE" > + <setting name="ovs-interface" description="Open vSwitch Interface Settings" name_upper="OVS_INTERFACE" > <property name="name" name_upper="NAME" type="string" default="ovs-interface" description="The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"." /> <property name="type" name_upper="TYPE" type="string" description="The interface type. Either "internal", or empty." /> </setting> <setting name="ovs-patch" description="OvsPatch Link Settings" name_upper="OVS_PATCH" > <property name="name" name_upper="NAME" type="string" default="ovs-patch" description="The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"." /> - <property name="peer" name_upper="PEER" type="string" description="Specifies the unicast destination IP address of a remote OpenVSwitch bridge port to connect to." /> + <property name="peer" name_upper="PEER" type="string" description="Specifies the unicast destination IP address of a remote Open vSwitch bridge port to connect to." /> </setting> <setting name="ovs-port" description="OvsPort Link Settings" name_upper="OVS_PORT" > <property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0" description="The time port must be inactive in order to be considered down." /> |