From cb8ccae5fdb9a5c6cd2b15c651fbf1081ec6ce16 Mon Sep 17 00:00:00 2001 From: Danny Jeongseok Seo Date: Thu, 19 Jul 2012 13:31:35 +0900 Subject: [PATCH] Revise private vconf key name --- debian/changelog | 8 ++++++++ debian/net-config.postinst | 3 ++- include/wifi.h | 2 +- packaging/net-config.spec | 5 +++-- src/wifi-power.c | 6 +++--- src/wifi-state.c | 4 ++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d3241c..35d6a1c 100644 --- 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 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 a3f5f59..3b4df3c 100644 --- 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 53db149..0961601 100644 --- 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 d4f883e..24ef73a 100644 --- 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 74773e1..6edd88d 100644 --- 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 d1db0fa..e46ab9e 100644 --- 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); } -- 2.7.4