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

2008-07-02 Dan Williams <dcbw@redhat.com>

Browse Source 
* introspection/nm-active-connection.xml
	  introspection/nm-vpn-connection.xml
	  libnm-glib/nm-active-connection.c
	  src/nm-activation-request.c
	  src/nm-active-connection.h
	  src/vpn-manager/nm-vpn-connection.c
		- Remove "SharedServiceName" and "SharedConnection" bits from the D-Bus
			and libnm-glib API since sharing didn't get implemented that way



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3797 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-07-02 13:00:14 +00:00
parent 6f22c03c1b
commit 5348be4d0b
7 changed files with 11 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nm-activation-request.c
View File

@@ -55,7 +55,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
NMConnection *connection;
char *specific_object;
NMConnection *shared_connection;
NMDevice *device;
gboolean user_requested;
@@ -71,8 +70,6 @@ enum {
PROP_SERVICE_NAME,
PROP_CONNECTION,
PROP_SPECIFIC_OBJECT,
PROP_SHARED_SERVICE_NAME,
PROP_SHARED_CONNECTION,
PROP_DEVICES,
PROP_STATE,
PROP_DEFAULT,
@@ -158,9 +155,6 @@ dispose (GObject *object)
CONNECTION_GET_SECRETS_CALL_TAG, NULL);
g_object_unref (priv->connection);
if (priv->shared_connection)
g_object_unref (priv->shared_connection);
out:
G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
}
@@ -196,15 +190,6 @@ get_property (GObject *object, guint prop_id,
else
g_value_set_boxed (value, "/");
break;
case PROP_SHARED_SERVICE_NAME:
nm_active_connection_scope_to_value (priv->shared_connection, value);
break;
case PROP_SHARED_CONNECTION:
if (priv->shared_connection)
g_value_set_boxed (value, nm_connection_get_path (priv->shared_connection));
else
g_value_set_boxed (value, "/");
break;
case PROP_DEVICES:
devices = g_ptr_array_sized_new (1);
g_ptr_array_add (devices, g_strdup (nm_device_get_udi (priv->device)));
@@ -259,20 +244,6 @@ nm_act_request_class_init (NMActRequestClass *req_class)
"Specific object",
DBUS_TYPE_G_OBJECT_PATH,
G_PARAM_READABLE));
g_object_class_install_property
(object_class, PROP_SHARED_SERVICE_NAME,
g_param_spec_string (NM_ACTIVE_CONNECTION_SHARED_SERVICE_NAME,
"Shared service name",
"Shared service name",
NULL,
G_PARAM_READABLE));
g_object_class_install_property
(object_class, PROP_SHARED_CONNECTION,
g_param_spec_boxed (NM_ACTIVE_CONNECTION_SHARED_CONNECTION,
"Shared connection",
"Shared connection",
DBUS_TYPE_G_OBJECT_PATH,
G_PARAM_READABLE));
g_object_class_install_property
(object_class, PROP_DEVICES,
g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,