From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 19 Dec 2009 21:35:58 +0000 (-0800)
Subject: Include current configuration into settings
X-Git-Tag: 0.48~70
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=5495626fc2c90e68e58507a2afc4c4c40c74c49a;p=platform%2Fupstream%2Fconnman.git

Include current configuration into settings
---

diff --git a/src/service.c b/src/service.c
index 0fb4453..03f364b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -385,10 +385,11 @@ static void apn_changed(struct connman_service *service)
 
 static void append_settings(DBusMessageIter *iter, void *user_data)
 {
-	const char *str = "dhcp";
+	struct connman_service *service = user_data;
 
-	connman_dbus_dict_append_basic(iter, "Method",
-						DBUS_TYPE_STRING, &str);
+	if (service->ipconfig != NULL)
+		__connman_ipconfig_append_ipv4(service->ipconfig,
+							iter, "IPv4.");
 }
 
 static void settings_changed(struct connman_service *service)
@@ -531,10 +532,6 @@ static DBusMessage *get_properties(DBusConnection *conn,
 	connman_dbus_dict_append_dict(&dict, "Settings",
 						append_settings, service);
 
-	if (service->ipconfig != NULL)
-		__connman_ipconfig_append_ipv4(service->ipconfig,
-							&dict, "IPv4.");
-
 	connman_dbus_dict_close(&array, &dict);
 
 	return reply;