Imported Upstream version 1.1.92 upstream/1.1.92

1 files changed, 14 insertions, 103 deletions

diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
index 19de1db6..34ecf8b9 100644
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
-
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* NetworkManager system settings service (ifupdown)
  *
  * Alexander Sack <asac@ubuntu.com>
@@ -36,134 +35,46 @@
 
 G_DEFINE_TYPE (NMIfupdownConnection, nm_ifupdown_connection, NM_TYPE_SETTINGS_CONNECTION)
 
-#define NM_IFUPDOWN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnectionPrivate))
-
-typedef struct {
-	if_block *ifblock;
-} NMIfupdownConnectionPrivate;
-
-enum {
-	PROP_ZERO,
-	PROP_IFBLOCK,
-	_PROP_END,
-};
-
-
 NMIfupdownConnection*
 nm_ifupdown_connection_new (if_block *block)
 {
-	g_return_val_if_fail (block != NULL, NULL);
-
-	return (NMIfupdownConnection *) g_object_new (NM_TYPE_IFUPDOWN_CONNECTION,
-										 NM_IFUPDOWN_CONNECTION_IFBLOCK, block,
-										 NULL);
-}
-
-static gboolean
-supports_secrets (NMSettingsConnection *connection, const char *setting_name)
-{
-	nm_log_info (LOGD_SETTINGS, "supports_secrets() for setting_name: '%s'", setting_name);
-
-	return (strcmp (setting_name, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) == 0);
-}
-
-static void
-nm_ifupdown_connection_init (NMIfupdownConnection *connection)
-{
-}
-
-static GObject *
-constructor (GType type,
-		   guint n_construct_params,
-		   GObjectConstructParam *construct_params)
-{
 	GObject *object;
-	NMIfupdownConnectionPrivate *priv;
 	GError *error = NULL;
 
-	object = G_OBJECT_CLASS (nm_ifupdown_connection_parent_class)->constructor (type, n_construct_params, construct_params);
-	g_return_val_if_fail (object, NULL);
+	g_return_val_if_fail (block != NULL, NULL);
 
-	priv = NM_IFUPDOWN_CONNECTION_GET_PRIVATE (object);
-	if (!priv) {
-		nm_log_warn (LOGD_SETTINGS, "%s.%d - no private instance.", __FILE__, __LINE__);
-		goto err;
-	}
-	if (!priv->ifblock) {
-		nm_log_warn (LOGD_SETTINGS, "(ifupdown) ifblock not provided to constructor.");
-		goto err;
-	}
+	object = g_object_new (NM_TYPE_IFUPDOWN_CONNECTION, NULL);
 
-	if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), priv->ifblock, &error)) {
-		nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: (%d) %s",
+	if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), block, &error)) {
+		nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: %s",
 		             __FILE__,
 		             __LINE__,
-		             error ? error->code : -1,
-		             error && error->message ? error->message : "(unknown)");
-		goto err;
+		             error->message);
+		g_object_unref (object);
+		return NULL;
 	}
 
-	return object;
-
- err:
-	g_object_unref (object);
-	return NULL;
+	return (NMIfupdownConnection *) object;
 }
 
-static void
-set_property (GObject *object, guint prop_id,
-		    const GValue *value, GParamSpec *pspec)
+static gboolean
+supports_secrets (NMSettingsConnection *connection, const char *setting_name)
 {
-	NMIfupdownConnectionPrivate *priv = NM_IFUPDOWN_CONNECTION_GET_PRIVATE (object);
-	g_return_if_fail (priv);
+	nm_log_info (LOGD_SETTINGS, "supports_secrets() for setting_name: '%s'", setting_name);
 
-	switch (prop_id) {
-	case PROP_IFBLOCK:
-		priv->ifblock = g_value_get_pointer (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	return (strcmp (setting_name, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) == 0);
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-		    GValue *value, GParamSpec *pspec)
+nm_ifupdown_connection_init (NMIfupdownConnection *connection)
 {
-	NMIfupdownConnectionPrivate *priv = NM_IFUPDOWN_CONNECTION_GET_PRIVATE (object);
-	g_return_if_fail (priv);
-
-	switch (prop_id) {
-	case PROP_IFBLOCK:
-		g_value_set_pointer (value, priv->ifblock);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
 }
 
 static void
 nm_ifupdown_connection_class_init (NMIfupdownConnectionClass *ifupdown_connection_class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (ifupdown_connection_class);
 	NMSettingsConnectionClass *connection_class = NM_SETTINGS_CONNECTION_CLASS (ifupdown_connection_class);
 
-	g_type_class_add_private (ifupdown_connection_class, sizeof (NMIfupdownConnectionPrivate));
-
-	/* Virtual methods */
-	object_class->constructor  = constructor;
-	object_class->set_property = set_property;
-	object_class->get_property = get_property;
-
 	connection_class->supports_secrets = supports_secrets;
-
-	/* Properties */
-	g_object_class_install_property
-		(object_class, PROP_IFBLOCK,
-		 g_param_spec_pointer (NM_IFUPDOWN_CONNECTION_IFBLOCK, "", "",
-		                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-		                       G_PARAM_STATIC_STRINGS));
 }