From ac64d14e8dd7c7c8bf10a2e8d9abe2cf381801a7 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 10 Jun 2008 02:02:21 +0000 Subject: [PATCH] 2008-06-09 Dan Williams * src/nm-activation-request.c src/nm-activation-request.h - (nm_act_request_set_shared, nm_act_request_get_shared, nm_act_request_get_device): new functions to facilitate connection sharing git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3736 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/nm-activation-request.c | 37 +++++++++++++++++++++++++++++++------ src/nm-activation-request.h | 6 ++++++ 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2226fb3a8..2bad58cd0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-09 Dan Williams + + * src/nm-activation-request.c + src/nm-activation-request.h + - (nm_act_request_set_shared, nm_act_request_get_shared, + nm_act_request_get_device): new functions to facilitate connection + sharing + 2008-06-09 Dan Williams * src/nm-device.c diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 810e8c3d52..187303e99e 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -55,12 +55,13 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct { NMConnection *connection; char *specific_object; - NMConnection *shared; + NMConnection *shared_connection; NMDevice *device; gboolean user_requested; NMActiveConnectionState state; gboolean is_default; + gboolean shared; char *ac_path; } NMActRequestPrivate; @@ -157,8 +158,8 @@ dispose (GObject *object) CONNECTION_GET_SECRETS_CALL_TAG, NULL); g_object_unref (priv->connection); - if (priv->shared) - g_object_unref (priv->shared); + if (priv->shared_connection) + g_object_unref (priv->shared_connection); out: G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object); @@ -196,11 +197,11 @@ get_property (GObject *object, guint prop_id, g_value_set_boxed (value, "/"); break; case PROP_SHARED_SERVICE_NAME: - nm_active_connection_scope_to_value (priv->shared, value); + nm_active_connection_scope_to_value (priv->shared_connection, value); break; case PROP_SHARED_CONNECTION: - if (priv->shared) - g_value_set_boxed (value, nm_connection_get_path (priv->shared)); + if (priv->shared_connection) + g_value_set_boxed (value, nm_connection_get_path (priv->shared_connection)); else g_value_set_boxed (value, "/"); break; @@ -652,3 +653,27 @@ nm_act_request_get_default (NMActRequest *req) return NM_ACT_REQUEST_GET_PRIVATE (req)->is_default; } +void +nm_act_request_set_shared (NMActRequest *req, gboolean shared) +{ + g_return_if_fail (NM_IS_ACT_REQUEST (req)); + + NM_ACT_REQUEST_GET_PRIVATE (req)->shared = shared; +} + +gboolean +nm_act_request_get_shared (NMActRequest *req) +{ + g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE); + + return NM_ACT_REQUEST_GET_PRIVATE (req)->shared; +} + +GObject * +nm_act_request_get_device (NMActRequest *req) +{ + g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE); + + return G_OBJECT (NM_ACT_REQUEST_GET_PRIVATE (req)->device); +} + diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index a8cb0193d0..1224e9a0ee 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -76,4 +76,10 @@ void nm_act_request_set_default (NMActRequest *req, gboolean is_default gboolean nm_act_request_get_default (NMActRequest *req); +gboolean nm_act_request_get_shared (NMActRequest *req); + +void nm_act_request_set_shared (NMActRequest *req, gboolean shared); + +GObject * nm_act_request_get_device (NMActRequest *req); + #endif /* NM_ACTIVATION_REQUEST_H */