Revise private vconf key name

diff --git a/debian/changelog b/debian/changelog
index 0d3241ce087ef31b2ad26a0d1e52f75e9cc42df3..35d6a1c8ef9ea1048b8ef758e00dc6d1baed853e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+net-config (0.1.81) unstable; urgency=low
+
+  * Revise private vconf key name
+  * Git: slp/pkgs/n/net-config
+  * Tag: net-config_0.1.81
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Tue, 15 May 2012 13:54:28 +0900
+
 net-config (0.1.80) unstable; urgency=low
 
   * Revise unnecessary funtions

diff --git a/debian/net-config.postinst b/debian/net-config.postinst
index a3f5f597486a926d1f1d53c6a4ef6d34a7f120fd..3b4df3cb7fe1f093a438ce7d7480293a9c52774f 100644 (file)
--- a/debian/net-config.postinst
+++ b/debian/net-config.postinst
@@ -24,7 +24,8 @@ vconftool set -t int db/dnet/statistics/wifi/totalsnt "0"
 vconftool set -t int db/dnet/statistics/wifi/totalrcv "0"
 vconftool set -t int db/dnet/statistics/wifi/lastsnt "0"
 vconftool set -t int db/dnet/statistics/wifi/lastrcv "0"
-vconftool set -t int db/wifi/LastPowerOnState "0"
+
+vconftool set -t int file/private/wifi/last_power_state "0"
 
 #Change File Permission
 #Resource

diff --git a/include/wifi.h b/include/wifi.h
index 53db14900743bac64622ca1b976ee7dacab823cb..09616013895a2fc0531c47c52be0a73b21fcf4d4 100644 (file)
--- a/include/wifi.h
+++ b/include/wifi.h
@@ -42,7 +42,7 @@ typedef struct NetconfigWifiClass NetconfigWifiClass;
 #define NETCONFIG_IS_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NETCONFIG_TYPE_WIFI))
 #define NETCONFIG_WIFI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), NETCONFIG_TYPE_WIFI, NetconfigWifiClass))
 
-#define VCONF_WIFI_LAST_POWER_ON_STATE "db/wifi/LastPowerOnState"
+#define VCONF_WIFI_LAST_POWER_STATE "file/private/wifi/last_power_state"
 
 enum netconfig_wifi_power_state {
        WIFI_POWER_OFF = 0x00,

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index d4f883ef384914e621f43a084c8bce5c7828737a..24ef73a011d200011f0e4c01e55252f7de9b54af 100644 (file)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -2,7 +2,7 @@
 
 Name:       net-config
 Summary:    TIZEN Network Configuration Module
-Version:    0.1.80
+Version:    0.1.81
 Release:    1
 Group:      System/Network
 License:    Apache License Version 2.0
@@ -85,7 +85,8 @@ vconftool set -t int db/dnet/statistics/wifi/totalsnt "0"
 vconftool set -t int db/dnet/statistics/wifi/totalrcv "0"
 vconftool set -t int db/dnet/statistics/wifi/lastsnt "0"
 vconftool set -t int db/dnet/statistics/wifi/lastrcv "0"
-vconftool set -t int db/wifi/LastPowerOnState "0"
+
+vconftool set -t int file/private/wifi/last_power_state "0"
 
 #Change File Permission
 #Resource

diff --git a/src/wifi-power.c b/src/wifi-power.c
index 74773e10cb99ed362819eefdf2975020969bffbc..6edd88dfaf14c4f59aace28209a316a7bc02cf57 100644 (file)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -443,7 +443,7 @@ static void __netconfig_wifi_pm_state_mode(keynode_t* node,
 
 static void __netconfig_wifi_power_configuration(void)
 {
-       int wifi_last_state = 0;
+       int wifi_last_power_state = 0;
 
        vconf_notify_key_changed(VCONFKEY_SETAPPL_FLIGHT_MODE_BOOL,
                        __netconfig_wifi_airplane_mode, NULL);
@@ -451,9 +451,9 @@ static void __netconfig_wifi_power_configuration(void)
        vconf_notify_key_changed(VCONFKEY_PM_STATE,
                        __netconfig_wifi_pm_state_mode, NULL);
 
-       vconf_get_int(VCONF_WIFI_LAST_POWER_ON_STATE, &wifi_last_state);
+       vconf_get_int(VCONF_WIFI_LAST_POWER_STATE, &wifi_last_power_state);
 
-       if (wifi_last_state == WIFI_POWER_ON) {
+       if (wifi_last_power_state == WIFI_POWER_ON) {
                DBG("Turn Wi-Fi on automatically");
 
                __netconfig_wifi_try_to_load_driver();

diff --git a/src/wifi-state.c b/src/wifi-state.c
index d1db0fa556e8333b86327679e6d6abc2ca4c0ebf..e46ab9e6f65a527f90ce680e73af4e4e9d87a9fc 100644 (file)
--- a/src/wifi-state.c
+++ b/src/wifi-state.c
@@ -308,7 +308,7 @@ void netconfig_wifi_update_power_state(gboolean powered)
 
                        vconf_set_int(VCONFKEY_NETWORK_WIFI_STATE, VCONFKEY_NETWORK_WIFI_NOT_CONNECTED);
 
-                       vconf_set_int(VCONF_WIFI_LAST_POWER_ON_STATE, WIFI_POWER_ON);
+                       vconf_set_int(VCONF_WIFI_LAST_POWER_STATE, WIFI_POWER_ON);
 
                        vconf_set_int(VCONFKEY_WIFI_STATE, VCONFKEY_WIFI_UNCONNECTED);
 
@@ -322,7 +322,7 @@ void netconfig_wifi_update_power_state(gboolean powered)
 
                        vconf_set_int(VCONFKEY_NETWORK_WIFI_STATE, VCONFKEY_NETWORK_WIFI_OFF);
 
-                       vconf_set_int(VCONF_WIFI_LAST_POWER_ON_STATE, WIFI_POWER_OFF);
+                       vconf_set_int(VCONF_WIFI_LAST_POWER_STATE, WIFI_POWER_OFF);
 
                        vconf_set_int(VCONFKEY_WIFI_STATE, VCONFKEY_WIFI_OFF);
                }