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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3797 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

3 files changed, 0 insertions, 53 deletions

diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 63b8c993f5..1df968fa43 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -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)));
@@ -260,20 +245,6 @@ nm_act_request_class_init (NMActRequestClass *req_class)
 							  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,
 							  "Devices",
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index d63eaf8a9b..9b197add60 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -28,8 +28,6 @@
 #define NM_ACTIVE_CONNECTION_SERVICE_NAME "service-name"
 #define NM_ACTIVE_CONNECTION_CONNECTION "connection"
 #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_STATE "state"
 #define NM_ACTIVE_CONNECTION_DEFAULT "default"
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index a75937046f..50f8540ede 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -91,8 +91,6 @@ enum {
 	PROP_SERVICE_NAME,
 	PROP_CONNECTION,
 	PROP_SPECIFIC_OBJECT,
-	PROP_SHARED_SERVICE_NAME,
-	PROP_SHARED_CONNECTION,
 	PROP_DEVICES,
 	PROP_STATE,
 	PROP_DEFAULT,
@@ -1003,12 +1001,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SPECIFIC_OBJECT:
 		g_value_set_boxed (value, nm_act_request_get_active_connection_path (priv->act_request));
 		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:
 		g_value_take_boxed (value, g_ptr_array_new ());
 		break;
@@ -1069,20 +1061,6 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
 							  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,
 							  "Devices",