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

core: remove assume from nm-activation-request

Browse Source 
Whether an active connection is assumed or connected from scratch is
only important during nm_device_activate(). When the activation process
is set up, there's no difference from any other active connection.

Acked-by: Dan Winship <danw@gnome.org>
Acked-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Pavel Šimerda
2013-06-26 00:39:46 +02:00
parent 34d28376ed
commit 5affa446aa
6 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nm-active-connection.c
View File

@@ -50,7 +50,6 @@ typedef struct {
gboolean user_requested;
gulong user_uid;
gboolean assumed;
NMDevice *master;
} NMActiveConnectionPrivate;
@@ -70,7 +69,6 @@ enum {
PROP_INT_DEVICE,
PROP_INT_USER_REQUESTED,
PROP_INT_USER_UID,
PROP_INT_ASSUMED,
PROP_INT_MASTER,
LAST_PROP
@@ -227,14 +225,6 @@ nm_active_connection_get_user_uid (NMActiveConnection *self)
return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->user_uid;
}
gboolean
nm_active_connection_get_assumed (NMActiveConnection *self)
{
g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), FALSE);
return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->assumed;
}
NMDevice *
nm_active_connection_get_device (NMActiveConnection *self)
{
@@ -281,9 +271,6 @@ set_property (GObject *object, guint prop_id,
case PROP_INT_USER_UID:
priv->user_uid = g_value_get_ulong (value);
break;
case PROP_INT_ASSUMED:
priv->assumed = g_value_get_boolean (value);
break;
case PROP_INT_MASTER:
g_warn_if_fail (priv->master == NULL);
priv->master = g_value_dup_object (value);
@@ -478,13 +465,6 @@ nm_active_connection_class_init (NMActiveConnectionClass *ac_class)
0, G_MAXULONG, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_INT_ASSUMED,
g_param_spec_boolean (NM_ACTIVE_CONNECTION_INT_ASSUMED,
"Assumed",
"Assumed",
FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_INT_MASTER,
g_param_spec_object (NM_ACTIVE_CONNECTION_INT_MASTER,
"Internal master device",