From: Grant Erickson <marathon96@gmail.com>
Date: Mon, 21 May 2012 19:43:50 +0000 (-0700)
Subject: storage: migrate 0.76-era device enabled / powered state
X-Git-Tag: 2.0_alpha~161
X-Git-Url: http://review.tizen.org/git/?p=framework%2Fconnectivity%2Fconnman.git;a=commitdiff_plain;h=9c144117e0cd50aea8de2a1164136e205fd73541

storage: migrate 0.76-era device enabled / powered state

This patch ensures that [device_<type>] Powered=<true|false> device enabled
/ powered state migrates from 0.76-era versions of default.profile.
---

diff --git a/src/storage.c b/src/storage.c
index 5fcec55..5e703eb 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -476,11 +476,19 @@ void __connman_storage_migrate()
 	g_key_file_set_boolean(keyfile, "global",
 					"OfflineMode", val);
 
+	/* Migrate Powered/Enable state key/value pairs from legacy
+	 * settings
+	 */
+
 	val = g_key_file_get_boolean(keyfile_def, "WiFi",
 					"Enable", &error);
 	if (error != NULL) {
 		g_clear_error(&error);
-		val = FALSE;
+		val = g_key_file_get_boolean(keyfile_def, "device_Wireless", "Powered", &error);
+		if (error != NULL) {
+			g_clear_error(&error);
+			val = FALSE;
+		}
 	}
 
 	g_key_file_set_boolean(keyfile, "WiFi",
@@ -490,7 +498,11 @@ void __connman_storage_migrate()
 					"Enable", &error);
 	if (error != NULL) {
 		g_clear_error(&error);
-		val = FALSE;
+		val = g_key_file_get_boolean(keyfile_def, "device_Bluetooth", "Powered", &error);
+		if (error != NULL) {
+			g_clear_error(&error);
+			val = FALSE;
+		}
 	}
 
 	g_key_file_set_boolean(keyfile, "Bluetooth",
@@ -500,7 +512,11 @@ void __connman_storage_migrate()
 					"Enable", &error);
 	if (error != NULL) {
 		g_clear_error(&error);
-		val = FALSE;
+		val = g_key_file_get_boolean(keyfile_def, "device_Ethernet", "Powered", &error);
+		if (error != NULL) {
+			g_clear_error(&error);
+			val = FALSE;
+		}
 	}
 
 	g_key_file_set_boolean(keyfile, "Wired",
@@ -510,7 +526,11 @@ void __connman_storage_migrate()
 					"Enable", &error);
 	if (error != NULL) {
 		g_clear_error(&error);
-		val = FALSE;
+		val = g_key_file_get_boolean(keyfile_def, "device_Cellular", "Powered", &error);
+		if (error != NULL) {
+			g_clear_error(&error);
+			val = FALSE;
+		}
 	}
 
 	g_key_file_set_boolean(keyfile, "Cellular",
@@ -520,7 +540,11 @@ void __connman_storage_migrate()
 					"Enable", &error);
 	if (error != NULL) {
 		g_clear_error(&error);
-		val = FALSE;
+		val = g_key_file_get_boolean(keyfile_def, "device_WiMAX", "Powered", &error);
+		if (error != NULL) {
+			g_clear_error(&error);
+			val = FALSE;
+		}
 	}
 
 	g_key_file_set_boolean(keyfile, "WiMAX",