From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 4 Jun 2018 00:07:45 +0200 Subject: New upstream version 1.11.4 --- libnm/nm-remote-connection.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'libnm/nm-remote-connection.c') diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 80bf179d..bd60c413 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -50,6 +50,7 @@ G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_OBJEC enum { PROP_0, PROP_UNSAVED, + PROP_FLAGS, PROP_VISIBLE, LAST_PROP @@ -59,6 +60,7 @@ typedef struct { NMDBusSettingsConnection *proxy; gboolean unsaved; + guint32 flags; gboolean visible; } NMRemoteConnectionPrivate; @@ -101,7 +103,7 @@ update2_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) * * Asynchronously calls the Update2() D-Bus method. * - * Since: 1.10.2 + * Since: 1.12 **/ void nm_remote_connection_update2 (NMRemoteConnection *connection, @@ -651,6 +653,22 @@ nm_remote_connection_get_unsaved (NMRemoteConnection *connection) return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->unsaved; } +/** + * nm_remote_connection_get_flags: + * @connection: the #NMRemoteConnection + * + * Returns: the flags of the connection of type #NMSettingsConnectionFlags. + * + * Since: 1.12 + **/ +NMSettingsConnectionFlags +nm_remote_connection_get_flags (NMRemoteConnection *connection) +{ + g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); + + return (NMSettingsConnectionFlags) NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->flags; +} + /** * nm_remote_connection_get_visible: * @connection: the #NMRemoteConnection @@ -741,6 +759,7 @@ init_dbus (NMObject *object) NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (object); const NMPropertiesInfo property_info[] = { { NM_REMOTE_CONNECTION_UNSAVED, &priv->unsaved }, + { NM_REMOTE_CONNECTION_FLAGS, &priv->flags }, { NULL }, }; @@ -871,6 +890,9 @@ get_property (GObject *object, guint prop_id, case PROP_UNSAVED: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->unsaved); break; + case PROP_FLAGS: + g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); + break; case PROP_VISIBLE: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->visible); break; @@ -928,6 +950,21 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * NMRemoteConnection:flags: + * + * The flags of the connection as unsigned integer. The values + * correspond to the #NMSettingsConnectionFlags enum. + * + * Since: 1.12 + **/ + g_object_class_install_property + (object_class, PROP_FLAGS, + g_param_spec_uint (NM_REMOTE_CONNECTION_FLAGS, "", "", + 0, G_MAXUINT32, 0, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + /** * NMRemoteConnection:visible: * -- cgit 1.3.0-6-gf8a5 From 069cb5c3a525ebcc19cc2927964258acaca87b13 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 17 Jun 2018 14:54:10 +0200 Subject: New upstream version 1.11.90 --- libnm/nm-remote-connection.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'libnm/nm-remote-connection.c') diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index bd60c413..45b804f1 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -51,6 +51,7 @@ enum { PROP_0, PROP_UNSAVED, PROP_FLAGS, + PROP_FILENAME, PROP_VISIBLE, LAST_PROP @@ -61,6 +62,7 @@ typedef struct { gboolean unsaved; guint32 flags; + const char *filename; gboolean visible; } NMRemoteConnectionPrivate; @@ -669,6 +671,22 @@ nm_remote_connection_get_flags (NMRemoteConnection *connection) return (NMSettingsConnectionFlags) NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->flags; } +/** + * nm_remote_connection_get_filename: + * @connection: the #NMRemoteConnection + * + * Returns: file that stores the connection in case the connection is file-backed. + * + * Since: 1.12 + **/ +const char * +nm_remote_connection_get_filename (NMRemoteConnection *connection) +{ + g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); + + return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->filename; +} + /** * nm_remote_connection_get_visible: * @connection: the #NMRemoteConnection @@ -760,6 +778,7 @@ init_dbus (NMObject *object) const NMPropertiesInfo property_info[] = { { NM_REMOTE_CONNECTION_UNSAVED, &priv->unsaved }, { NM_REMOTE_CONNECTION_FLAGS, &priv->flags }, + { NM_REMOTE_CONNECTION_FILENAME, &priv->filename }, { NULL }, }; @@ -893,6 +912,9 @@ get_property (GObject *object, guint prop_id, case PROP_FLAGS: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); break; + case PROP_FILENAME: + g_value_set_string (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->filename); + break; case PROP_VISIBLE: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->visible); break; @@ -965,6 +987,21 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * NMRemoteConnection:filename: + * + * File that stores the connection in case the connection is + * file-backed. + * + * Since: 1.12 + **/ + g_object_class_install_property + (object_class, PROP_FILENAME, + g_param_spec_string (NM_REMOTE_CONNECTION_FILENAME, "", "", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + /** * NMRemoteConnection:visible: * -- cgit 1.3.0-6-gf8a5 From 429393567647935d9123e21fd27a7529d50255eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 1 Jul 2018 20:58:23 +0200 Subject: New upstream version 1.12.0 --- libnm/nm-remote-connection.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libnm/nm-remote-connection.c') 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); } -- cgit 1.3.0-6-gf8a5