From a5936ff974f4950b4598c8be972acd0a7c605d61 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Wed, 2 Dec 2015 15:12:05 +0900 Subject: [PATCH] [ACR-456]Add enumeration for network status - update dnet.xml file and generate the relervant header - update current status Signed-off-by: hyunuktak Signed-off-by: MyoungJune Park Change-Id: I6c479e93f23cdeb8f318d7aa7080040ab115dae6 --- data/vconf-internal-dnet-keys.xml | 1 + include/vconf-internal-dnet-keys.h | 3 ++- include/vconf-internal-indicator-keys.h | 2 -- include/vconf-internal-keys.h | 1 - include/vconf-internal-myfile-keys.h | 39 --------------------------------- packaging/vconf-internal-keys.spec | 2 +- 6 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 include/vconf-internal-myfile-keys.h diff --git a/data/vconf-internal-dnet-keys.xml b/data/vconf-internal-dnet-keys.xml index 059a7bc..d655e56 100644 --- a/data/vconf-internal-dnet-keys.xml +++ b/data/vconf-internal-dnet-keys.xml @@ -12,6 +12,7 @@ VCONFKEY_NETWORK_WIFI VCONFKEY_NETWORK_ETHERNET VCONFKEY_NETWORK_BLUETOOTH + VCONFKEY_NETWORK_DEFAULT_PROXY diff --git a/include/vconf-internal-dnet-keys.h b/include/vconf-internal-dnet-keys.h index 7b61356..3072d02 100644 --- a/include/vconf-internal-dnet-keys.h +++ b/include/vconf-internal-dnet-keys.h @@ -26,7 +26,8 @@ enum { VCONFKEY_NETWORK_CELLULAR, VCONFKEY_NETWORK_WIFI, VCONFKEY_NETWORK_ETHERNET, - VCONFKEY_NETWORK_BLUETOOTH + VCONFKEY_NETWORK_BLUETOOTH, + VCONFKEY_NETWORK_DEFAULT_PROXY }; #define VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND "memory/dnet/network_config" diff --git a/include/vconf-internal-indicator-keys.h b/include/vconf-internal-indicator-keys.h index ae776c5..fe68eff 100644 --- a/include/vconf-internal-indicator-keys.h +++ b/include/vconf-internal-indicator-keys.h @@ -3,8 +3,6 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Hakjoo Ko - * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/include/vconf-internal-keys.h b/include/vconf-internal-keys.h index b5da1fd..310126a 100644 --- a/include/vconf-internal-keys.h +++ b/include/vconf-internal-keys.h @@ -25,7 +25,6 @@ #include "vconf-internal-mobile-hotspot-keys.h" #include "vconf-internal-moved-from.h" #include "vconf-internal-msg-keys.h" -#include "vconf-internal-myfile-keys.h" #include "vconf-internal-nfc-keys.h" #include "vconf-internal-pm-keys.h" #include "vconf-internal-setting-keys.h" diff --git a/include/vconf-internal-myfile-keys.h b/include/vconf-internal-myfile-keys.h deleted file mode 100644 index cf7a6e8..0000000 --- a/include/vconf-internal-myfile-keys.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * vconf-internal-keys - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Hakjoo Ko - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef __VCONF_INTERNAL_MYFILE_KEYS_H__ -#define __VCONF_INTERNAL_MYFILE_KEYS_H__ -#ifdef USE_NONCREATED_VCONF_KEY -#warning using non-created vconf-key ----- please make sure this key is in use actually -#endif -#define VCONFKEY_MFAPP_PREFIX "db/myfile" - -#ifdef USE_NONCREATED_VCONF_KEY -#warning using non-created vconf-key ----- please make sure this key is in use actually -#endif -#define VCONFKEY_MFAPP_CURRENT_FOLDER_STR "db/myfile/current_folder" - -#ifdef USE_NONCREATED_VCONF_KEY -#warning using non-created vconf-key ----- please make sure this key is in use actually -#endif -#define VCONFKEY_MFAPP_PERMISSION_COPY_BOOL "db/myfile/permission_copy" - -#endif /* __VCONF_INTERNAL_MYFILE_KEYS_H__ */ diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec index b87ab48..0e4401b 100755 --- a/packaging/vconf-internal-keys.spec +++ b/packaging/vconf-internal-keys.spec @@ -1,6 +1,6 @@ Name: vconf-internal-keys Summary: Internal shared keys for vconf -Version: 0.0.155 +Version: 0.0.156 Release: 0 Group: Application Framework/Configuration License: Apache-2.0 -- 2.7.4