NetworkManager r3797 - in trunk: . introspection libnm-glib src src/vpn-manager

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jul  2 13:00:14 2008
New Revision: 3797
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3797&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/introspection/nm-active-connection.xml
   trunk/introspection/nm-vpn-connection.xml
   trunk/libnm-glib/nm-active-connection.c
   trunk/src/nm-activation-request.c
   trunk/src/nm-active-connection.h
   trunk/src/vpn-manager/nm-vpn-connection.c

Modified: trunk/introspection/nm-active-connection.xml
==============================================================================
--- trunk/introspection/nm-active-connection.xml	(original)
+++ trunk/introspection/nm-active-connection.xml	Wed Jul  2 13:00:14 2008
@@ -11,12 +11,6 @@
     <property name="SpecificObject" type="o" access="read">
       <tp:docstring>A specific object associated with the active connection.</tp:docstring>
     </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">
       <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
     </property>

Modified: trunk/introspection/nm-vpn-connection.xml
==============================================================================
--- trunk/introspection/nm-vpn-connection.xml	(original)
+++ trunk/introspection/nm-vpn-connection.xml	Wed Jul  2 13:00:14 2008
@@ -11,12 +11,6 @@
     <property name="SpecificObject" type="o" access="read">
       <tp:docstring>A specific object associated with the active connection.</tp:docstring>
     </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">
       <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
     </property>

Modified: trunk/libnm-glib/nm-active-connection.c
==============================================================================
--- trunk/libnm-glib/nm-active-connection.c	(original)
+++ trunk/libnm-glib/nm-active-connection.c	Wed Jul  2 13:00:14 2008
@@ -26,8 +26,6 @@
 	NMConnectionScope scope;
 	char *connection;
 	char *specific_object;
-	char *shared_service_name;
-	char *shared_connection;
 	GPtrArray *devices;
 	NMActiveConnectionState state;
 	gboolean is_default;
@@ -38,8 +36,6 @@
 	PROP_SERVICE_NAME,
 	PROP_CONNECTION,
 	PROP_SPECIFIC_OBJECT,
-	PROP_SHARED_SERVICE_NAME,
-	PROP_SHARED_CONNECTION,
 	PROP_DEVICES,
 	PROP_STATE,
 	PROP_DEFAULT,
@@ -50,8 +46,6 @@
 #define DBUS_PROP_SERVICE_NAME "ServiceName"
 #define DBUS_PROP_CONNECTION "Connection"
 #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_STATE "State"
 #define DBUS_PROP_DEFAULT "Default"
@@ -141,40 +135,6 @@
 	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 *
 nm_active_connection_get_devices (NMActiveConnection *connection)
 {
@@ -268,8 +228,6 @@
 	g_free (priv->service_name);
 	g_free (priv->connection);
 	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);
 }
@@ -292,12 +250,6 @@
 	case PROP_SPECIFIC_OBJECT:
 		g_value_set_boxed (value, nm_active_connection_get_specific_object (self));
 		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:
 		g_value_set_boxed (value, nm_active_connection_get_devices (self));
 		break;
@@ -346,8 +298,6 @@
 		{ NM_ACTIVE_CONNECTION_SERVICE_NAME,        demarshal_service,           &priv->service_name },
 		{ 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_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_STATE,               nm_object_demarshal_generic, &priv->state },
 		{ NM_ACTIVE_CONNECTION_DEFAULT,             nm_object_demarshal_generic, &priv->is_default },
@@ -425,22 +375,6 @@
 						      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
 		(object_class, PROP_DEVICES,
 		 g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,
 						       "Devices",

Modified: trunk/src/nm-activation-request.c
==============================================================================
--- trunk/src/nm-activation-request.c	(original)
+++ trunk/src/nm-activation-request.c	Wed Jul  2 13:00:14 2008
@@ -55,7 +55,6 @@
 typedef struct {
 	NMConnection *connection;
 	char *specific_object;
-	NMConnection *shared_connection;
 	NMDevice *device;
 	gboolean user_requested;
 
@@ -71,8 +70,6 @@
 	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 @@
 	                   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 @@
 		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 @@
 							  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",

Modified: trunk/src/nm-active-connection.h
==============================================================================
--- trunk/src/nm-active-connection.h	(original)
+++ trunk/src/nm-active-connection.h	Wed Jul  2 13:00:14 2008
@@ -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"

Modified: trunk/src/vpn-manager/nm-vpn-connection.c
==============================================================================
--- trunk/src/vpn-manager/nm-vpn-connection.c	(original)
+++ trunk/src/vpn-manager/nm-vpn-connection.c	Wed Jul  2 13:00:14 2008
@@ -91,8 +91,6 @@
 	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 @@
 	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 @@
 							  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",