From c9eb9615cee9b13e535497cdc708aa8ffc042189 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Tue, 31 May 2011 17:43:48 +0200
Subject: [PATCH] property: Remove HOSTNAME and DOMAINNAME

---
 include/element.h  |  3 ---
 include/property.h |  3 ---
 src/element.c      | 25 +------------------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/include/element.h b/include/element.h
index 05a51d5..2e944d3 100644
--- a/include/element.h
+++ b/include/element.h
@@ -86,9 +86,6 @@ struct connman_element {
 	};
 
 	GHashTable *properties;
-
-	gchar *hostname;
-	gchar *domainname;
 };
 
 struct connman_element *connman_element_create(const char *name);
diff --git a/include/property.h b/include/property.h
index 876908d..8fed172 100644
--- a/include/property.h
+++ b/include/property.h
@@ -40,9 +40,6 @@ extern "C" {
 enum connman_property_id {
 	CONNMAN_PROPERTY_ID_INVALID = 0,
 
-	CONNMAN_PROPERTY_ID_HOSTNAME,
-	CONNMAN_PROPERTY_ID_DOMAINNAME,
-
 	CONNMAN_PROPERTY_ID_IPV6_METHOD,
 	CONNMAN_PROPERTY_ID_IPV6_ADDRESS,
 	CONNMAN_PROPERTY_ID_IPV6_PREFIXLEN,
diff --git a/src/element.c b/src/element.c
index 050efae..0d796fa 100644
--- a/src/element.c
+++ b/src/element.c
@@ -623,8 +623,6 @@ void connman_element_unref(struct connman_element *element)
 			element->destruct(element);
 		free_children(element);
 		free_properties(element);
-		g_free(element->hostname);
-		g_free(element->domainname);
 		g_free(element->devname);
 		g_free(element->path);
 		g_free(element->name);
@@ -707,28 +705,7 @@ static int set_static_array_property(struct connman_element *element,
 int connman_element_get_value(struct connman_element *element,
 				enum connman_property_id id, void *value)
 {
-	if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
-		return -EINVAL;
-
-	switch (id) {
-	case CONNMAN_PROPERTY_ID_HOSTNAME:
-		if (element->hostname == NULL)
-			return connman_element_get_value(element->parent,
-								id, value);
-		*((char **) value) = element->hostname;
-		break;
-	case CONNMAN_PROPERTY_ID_DOMAINNAME:
-		if (element->domainname == NULL)
-			return connman_element_get_value(element->parent,
-								id, value);
-		*((char **) value) = element->domainname;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
+	return -EINVAL;
 }
 
 static gboolean get_static_property(struct connman_element *element,
-- 
2.7.4