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

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2008-07-02 Dan Williams <dcbw@redhat.com>
* 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
2008-07-02 Dan Williams <dcbw@redhat.com> 2008-07-02 Dan Williams <dcbw@redhat.com>
* src/nm-device-wifi.c * src/nm-device-wifi.c

6
introspection/nm-active-connection.xml
View File

@@ -11,12 +11,6 @@
<property name="SpecificObject" type="o" access="read"> <property name="SpecificObject" type="o" access="read">
<tp:docstring>A specific object associated with the active connection.</tp:docstring> <tp:docstring>A specific object associated with the active connection.</tp:docstring>
</property> </property>
<property name="SharedServiceName" type="s" access="read">
<tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring>
</property>
<property name="SharedConnection" type="o" access="read">
<tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring>
</property>
<property name="Devices" type="ao" access="read"> <property name="Devices" type="ao" access="read">
<tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring> <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
</property> </property>

6
introspection/nm-vpn-connection.xml
View File

@@ -11,12 +11,6 @@
<property name="SpecificObject" type="o" access="read"> <property name="SpecificObject" type="o" access="read">
<tp:docstring>A specific object associated with the active connection.</tp:docstring> <tp:docstring>A specific object associated with the active connection.</tp:docstring>
</property> </property>
<property name="SharedServiceName" type="s" access="read">
<tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring>
</property>
<property name="SharedConnection" type="o" access="read">
<tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring>
</property>
<property name="Devices" type="ao" access="read"> <property name="Devices" type="ao" access="read">
<tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring> <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
</property> </property>

66
libnm-glib/nm-active-connection.c
View File

@@ -26,8 +26,6 @@ typedef struct {
NMConnectionScope scope; NMConnectionScope scope;
char *connection; char *connection;
char *specific_object; char *specific_object;
char *shared_service_name;
char *shared_connection;
GPtrArray *devices; GPtrArray *devices;
NMActiveConnectionState state; NMActiveConnectionState state;
gboolean is_default; gboolean is_default;
@@ -38,8 +36,6 @@ enum {
PROP_SERVICE_NAME, PROP_SERVICE_NAME,
PROP_CONNECTION, PROP_CONNECTION,
PROP_SPECIFIC_OBJECT, PROP_SPECIFIC_OBJECT,
PROP_SHARED_SERVICE_NAME,
PROP_SHARED_CONNECTION,
PROP_DEVICES, PROP_DEVICES,
PROP_STATE, PROP_STATE,
PROP_DEFAULT, PROP_DEFAULT,
@@ -50,8 +46,6 @@ enum {
#define DBUS_PROP_SERVICE_NAME "ServiceName" #define DBUS_PROP_SERVICE_NAME "ServiceName"
#define DBUS_PROP_CONNECTION "Connection" #define DBUS_PROP_CONNECTION "Connection"
#define DBUS_PROP_SPECIFIC_OBJECT "SpecificObject" #define DBUS_PROP_SPECIFIC_OBJECT "SpecificObject"
#define DBUS_PROP_SHARED_SERVICE_NAME "SharedServiceName"
#define DBUS_PROP_SHARED_CONNECTION "SharedConnection"
#define DBUS_PROP_DEVICES "Devices" #define DBUS_PROP_DEVICES "Devices"
#define DBUS_PROP_STATE "State" #define DBUS_PROP_STATE "State"
#define DBUS_PROP_DEFAULT "Default" #define DBUS_PROP_DEFAULT "Default"
@@ -141,40 +135,6 @@ nm_active_connection_get_specific_object (NMActiveConnection *connection)
return priv->specific_object; return priv->specific_object;
} }
const char *
nm_active_connection_get_shared_service_name (NMActiveConnection *connection)
{
NMActiveConnectionPrivate *priv;
g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (connection), NULL);
priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
if (!priv->shared_service_name) {
priv->shared_service_name = nm_object_get_string_property (NM_OBJECT (connection),
NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
DBUS_PROP_SHARED_SERVICE_NAME);
}
return priv->shared_service_name;
}
const char *
nm_active_connection_get_shared_connection (NMActiveConnection *connection)
{
NMActiveConnectionPrivate *priv;
g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (connection), NULL);
priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
if (!priv->shared_connection) {
priv->shared_connection = nm_object_get_string_property (NM_OBJECT (connection),
NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
DBUS_PROP_SHARED_CONNECTION);
}
return priv->shared_connection;
}
const GPtrArray * const GPtrArray *
nm_active_connection_get_devices (NMActiveConnection *connection) nm_active_connection_get_devices (NMActiveConnection *connection)
{ {
@@ -268,8 +228,6 @@ finalize (GObject *object)
g_free (priv->service_name); g_free (priv->service_name);
g_free (priv->connection); g_free (priv->connection);
g_free (priv->specific_object); g_free (priv->specific_object);
g_free (priv->shared_service_name);
g_free (priv->shared_service_name);
G_OBJECT_CLASS (nm_active_connection_parent_class)->finalize (object); G_OBJECT_CLASS (nm_active_connection_parent_class)->finalize (object);
} }
@@ -292,12 +250,6 @@ get_property (GObject *object,
case PROP_SPECIFIC_OBJECT: case PROP_SPECIFIC_OBJECT:
g_value_set_boxed (value, nm_active_connection_get_specific_object (self)); g_value_set_boxed (value, nm_active_connection_get_specific_object (self));
break; break;
case PROP_SHARED_SERVICE_NAME:
g_value_set_string (value, nm_active_connection_get_shared_service_name (self));
break;
case PROP_SHARED_CONNECTION:
g_value_set_boxed (value, nm_active_connection_get_shared_connection (self));
break;
case PROP_DEVICES: case PROP_DEVICES:
g_value_set_boxed (value, nm_active_connection_get_devices (self)); g_value_set_boxed (value, nm_active_connection_get_devices (self));
break; break;
@@ -346,8 +298,6 @@ register_for_property_changed (NMActiveConnection *connection)
{ NM_ACTIVE_CONNECTION_SERVICE_NAME, demarshal_service, &priv->service_name }, { NM_ACTIVE_CONNECTION_SERVICE_NAME, demarshal_service, &priv->service_name },
{ NM_ACTIVE_CONNECTION_CONNECTION, nm_object_demarshal_generic, &priv->connection }, { NM_ACTIVE_CONNECTION_CONNECTION, nm_object_demarshal_generic, &priv->connection },
{ NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, nm_object_demarshal_generic, &priv->specific_object }, { NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, nm_object_demarshal_generic, &priv->specific_object },
{ NM_ACTIVE_CONNECTION_SHARED_SERVICE_NAME, nm_object_demarshal_generic, &priv->shared_service_name },
{ NM_ACTIVE_CONNECTION_SHARED_CONNECTION, nm_object_demarshal_generic, &priv->shared_connection },
{ NM_ACTIVE_CONNECTION_DEVICES, demarshal_devices, &priv->devices }, { NM_ACTIVE_CONNECTION_DEVICES, demarshal_devices, &priv->devices },
{ NM_ACTIVE_CONNECTION_STATE, nm_object_demarshal_generic, &priv->state }, { NM_ACTIVE_CONNECTION_STATE, nm_object_demarshal_generic, &priv->state },
{ NM_ACTIVE_CONNECTION_DEFAULT, nm_object_demarshal_generic, &priv->is_default }, { NM_ACTIVE_CONNECTION_DEFAULT, nm_object_demarshal_generic, &priv->is_default },
@@ -424,22 +374,6 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
NULL, NULL,
G_PARAM_READABLE)); 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_string (NM_ACTIVE_CONNECTION_SHARED_CONNECTION,
"Shared Connection",
"Shared Connection",
NULL,
G_PARAM_READABLE));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DEVICES, (object_class, PROP_DEVICES,
g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,

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

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

2
src/nm-active-connection.h
View File

@@ -28,8 +28,6 @@
#define NM_ACTIVE_CONNECTION_SERVICE_NAME "service-name" #define NM_ACTIVE_CONNECTION_SERVICE_NAME "service-name"
#define NM_ACTIVE_CONNECTION_CONNECTION "connection" #define NM_ACTIVE_CONNECTION_CONNECTION "connection"
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT "specific-object" #define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT "specific-object"
#define NM_ACTIVE_CONNECTION_SHARED_SERVICE_NAME "shared-service-name"
#define NM_ACTIVE_CONNECTION_SHARED_CONNECTION "shared-connection"
#define NM_ACTIVE_CONNECTION_DEVICES "devices" #define NM_ACTIVE_CONNECTION_DEVICES "devices"
#define NM_ACTIVE_CONNECTION_STATE "state" #define NM_ACTIVE_CONNECTION_STATE "state"
#define NM_ACTIVE_CONNECTION_DEFAULT "default" #define NM_ACTIVE_CONNECTION_DEFAULT "default"

22
src/vpn-manager/nm-vpn-connection.c
View File

@@ -91,8 +91,6 @@ enum {
PROP_SERVICE_NAME, PROP_SERVICE_NAME,
PROP_CONNECTION, PROP_CONNECTION,
PROP_SPECIFIC_OBJECT, PROP_SPECIFIC_OBJECT,
PROP_SHARED_SERVICE_NAME,
PROP_SHARED_CONNECTION,
PROP_DEVICES, PROP_DEVICES,
PROP_STATE, PROP_STATE,
PROP_DEFAULT, PROP_DEFAULT,
@@ -1003,12 +1001,6 @@ get_property (GObject *object, guint prop_id,
case PROP_SPECIFIC_OBJECT: case PROP_SPECIFIC_OBJECT:
g_value_set_boxed (value, nm_act_request_get_active_connection_path (priv->act_request)); g_value_set_boxed (value, nm_act_request_get_active_connection_path (priv->act_request));
break; break;
case PROP_SHARED_SERVICE_NAME:
g_value_set_string (value, "");
break;
case PROP_SHARED_CONNECTION:
g_value_set_boxed (value, "/");
break;
case PROP_DEVICES: case PROP_DEVICES:
g_value_take_boxed (value, g_ptr_array_new ()); g_value_take_boxed (value, g_ptr_array_new ());
break; break;
@@ -1068,20 +1060,6 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
"Specific object", "Specific object",
DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_OBJECT_PATH,
G_PARAM_READABLE)); 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 g_object_class_install_property
(object_class, PROP_DEVICES, (object_class, PROP_DEVICES,
g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,