common/network: Code cleanup

Change-Id: I7a5150587fd6546cb7540c8cd840b4eef9464232
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index a0ed42fe177b8837d179f5c77979852dbaf1c69a..1482a64f9c6d01e28225e22a912a14c2fdf4bf94 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -70,7 +70,6 @@ ADD_LIBRARY(${LIB_SETTING_COMMON} SHARED
        ./src/setting-common-draw-widget.c
        ./src/setting-common-general-func.c
        ./src/setting-common-init.c
-       ./src/setting-common-resource.c
        ./src/setting-common-view.c
 )
 

diff --git a/setting-common/include/setting-common-resource.h b/setting-common/include/setting-common-resource.h
index 8c6998fe47dfc65a8f11047134672e2efa73561a..f73cbdb027315c7fa905ce1b74902c4dee337cfc 100755 (executable)
--- a/setting-common/include/setting-common-resource.h
+++ b/setting-common/include/setting-common-resource.h
@@ -25,11 +25,10 @@
 #include "setting-common-string.h"
 
 /*////////////////////////// */
-/*/////// IMAGE //////////// */
-/*///////////////////////// */
+/*/////// IMAGES /////////// */
+/*////////////////////////// */
 #define IMG_SETTING    _TZ_SYS_RO_ICONS"/default/small/org.tizen.setting.png"
 
-#define IMG_Joyn       SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
 /* connectivity IMG*/
 #define IMG_WiFi       SETTING_LIST_ICON_PATH_CFG"settings_wifi.png"
 #define IMG_Bluetooth  SETTING_LIST_ICON_PATH_CFG"settings_bluetooth.png"
@@ -57,10 +56,6 @@
 #define IMG_Accounts   SETTING_LIST_ICON_PATH_CFG"settings_account.png"
 #define IMG_Privacy    SETTING_LIST_ICON_PATH_CFG"settings_privacy_and_safety.png"
 
-
-#define IMG_BackupReset \
-       SETTING_LIST_ICON_PATH_CFG"settings_backup_and_reset.png"
-
 /* System IMG */
 #define IMG_LanguageInput \
        SETTING_LIST_ICON_PATH_CFG"settings_language_and_input.png"
@@ -68,193 +63,15 @@
 #define IMG_DateTime   SETTING_LIST_ICON_PATH_CFG"settings_date_and_time.png"
 #define IMG_AboutDevice        SETTING_LIST_ICON_PATH_CFG"settings_about_device.png"
 
-/* ETC IMG */
-#define IMG_Security   SETTING_LIST_ICON_PATH_CFG"settings_security.png"
-#define IMG_NetRestrictionMode SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_NetRestrictionOffMode SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
 /*/////////////////////////////////////////////////////////////////////////// */
-#define IMG_BacklightTime      SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Font               SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_SmartScreen                SETTING_ICON_PATH_CFG"org.tizen.setting.png"
 #define IMG_USBconnection \
        SETTING_LIST_ICON_PATH_CFG"settings_list_developer.png"
-#define IMG_SereenMode         SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Easy_Mode          SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_MutiWindow         SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_BlockingMode       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Firewall           SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_FingerScanner      SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-
-#define IMG_Cloud              SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-/*#define IMG_SystemMonitor    SETTING_ICON_PATH_CFG"org.tizen.setting.png" */
-
-#define IMG_Call       SETTING_LIST_ICON_PATH_CFG"settings_call_setting.png"
-#define IMG_Messages   SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_Email      SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_Contacts   SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_Calendar   SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_Gallery    SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_VoiceRecorder SETTING_OTHER_UG_ICON_PATH"org.tizen.setting.png"
-#define IMG_ReadyToShare SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_KeisOverWifi SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_SBeam      SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_DataUsage  SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Web_Apps   "org.tizen.setting.png"
-/*
-#define IMG_PhoneCalling SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_PhoneCalling_Landscape SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-*/
-
-#define IMG_PhoneCalling SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_PhoneCalling_Landscape SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_DirectCalling_Landscape SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_DirectCalling SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/*#define IMG_PhoneCalling_Landscape
- * SETTING_ICON_PATH_CFG"org.tizen.setting.png" */
-/*#define IMG_VoiceTalk                        vconf_get_str(VCONFKEY_BGSET) */
-#define IMG_PANNING_CENTER     SETTING_ICON_PATH_CFG "org.tizen.setting.png"
-#define IMG_Panning            SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-/*vconf_get_str(VCONFKEY_BGSET) */
-#define IMG_Tilt               SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_MutPause_P    SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_MutPause_L    SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_MutPause_Stop_P SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_MutPause_Stop_L SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_Capture_L     SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_Palm_Capture_P     SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-
-
-
-/* display UG IMG*/
-#define IMG_BRIGTHNESS_LEFT     SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_BRIGHTNESS_RIGHT    SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/* screen timeout IMG*/
-#define IMG_SCREEN_TIMEOUT_LEFT         SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/*     SOUND IMG*/
-#define IMG_SLIDER_BTN_VOLUME01 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_VOLUME02 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_RING_VOLUME \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_NOTI_VOLUME \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_NOTI_VOLUME_MUTE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_NOTI_VOLUME_VIBRATE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_SYSTEM_VOLUME \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_SYSTEM_VOLUME_VIBRATE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-#define IMG_SLIDER_BTN_SYSTEM_VOLUME_MUTE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-
-/*     touch IMG*/
-#define IMG_VIBRATION_ICON_01 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_VIBRATION_ICON_02 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_VIBRATION_ICON_03 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/*     Sensitivity IMG*/
-#define IMG_SENSITIVITY_ICON_01 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_SENSITIVITY_ICON_02 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_SENSITIVITY_PRESSED_ICON_01 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_SENSITIVITY_PRESSED_ICON_02 \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/*     pdf */
-#define PDF_SOURCE_ANNOUNCEMENT \
-       _TZ_SYS_RO_APP"/org.tizen.setting/data/Open_Source_Announcement.pdf"
-
-/* home screen*/
-#define IMG_DEFAULT_HOME_SCREEN \
-       "org.tizen.setting.png"
-
-#define IMG_Noti_Panel SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_QuickCMD SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-
-/* setting image list*/
-#define IMG_SYSTEM_MYFILE_FILE SYSTEM_ICON_PATH"org.tizen.setting.png"
-#define IMG_SYSTEM_MYFILE_MP3  SYSTEM_ICON_PATH"org.tizen.setting.png"
-#define IMG_SYSTEM_MYFILE_VOICE        SYSTEM_ICON_PATH"org.tizen.setting.png"
-#define IMG_SYSTEM_MYFILE_MP4  SYSTEM_ICON_PATH"org.tizen.setting.png"
-#define IMG_SYSTEM_MYFILE_ICON SYSTEM_ICON_PATH"org.tizen.setting.png"
-
-/* IO profile*/
-#define IMG_INOFFICE_HOMESCREEN_PROFILE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_OUTDOOR_HOMESCREEN_PROFILE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_INOFFICE_FONT_PROFILE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_OUTDOOR_FONT_PROFILE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-#define IMG_EMPTY_PROFILE \
-       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/* plug in*/
-#define IMG_GREEN_SWITCH       SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-/*#define IMG_APPS_INFORMATION SETTING_ICON_PATH_CFG"org.tizen.setting.png" */
-#define IMG_NEW_EXCHANGE       "org.tizen.setting.png"
-#define IMG_ICON_EMAIL         "org.tizen.setting.png"
-#define IMG_ICON_SPLITBER_HOR  "org.tizen.setting.png"
-
-#define IMG_SCREEN_MODE                SETTING_ICON_PATH_CFG"org.tizen.setting.png"
-
-/*****/
 
 /****Others****/
 
-/*     network*/
-extern const char *STR_SETTING_MMS_CONNECTIONS;
-extern const char *STR_SETTING_NEW_CONNECTIONS;
-
-/*     phone > langauge*/
-extern const char *STR_SETTING_LANG_ENGLISH;
-extern const char *STR_SETTING_LANG_GERMAN;
-extern const char *STR_SETTING_LANG_DUTCH;
-extern const char *STR_SETTING_LANG_SPAINISH;
-extern const char *STR_SETTING_LANG_PORTUGUESE;
-extern const char *STR_SETTING_LANG_GREEK;
-extern const char *STR_SETTING_LANG_ITALIAN;
-extern const char *STR_SETTING_LANG_FRENCH;
-extern const char *STR_SETTING_LANG_TURKISH;
-extern const char *STR_SETTING_LANG_KOREAN;
-extern const char *STR_SETTING_LANG_JAPAN;
-extern const char *STR_SETTING_LANG_CHINA;
-extern const char *STR_SETTING_LANG_CANTONESE;
-extern const char *STR_SETTING_LANG_TAIWAN;
-extern const char *STR_SETTING_LANG_RUSSIAN;
-
-
 /* uuid as Setting_Cfg_Node_T primary key */
 #define uuid_Connectivity      "1c83e280-3111-42d7-825f-a8f0f2e79577"
-#define uuid_Joyn              "7a837bc3-06c0-7d9f-2ef8-49ebaa4aae2a"
 #define uuid_WiFi              "14cd6b4c-9133-c571-c11f-8cbca16a025a"
-#define uuid_DownloadBooster   "4984d3de-c8c7-11e3-9436-7446a08e0712"
 #define uuid_Bluetooth         "beaf505a-d83c-938d-e9f5-44a5638e75db"
 #define uuid_MobileAP          "1a9b3432-f7a9-0391-134e-03c5a8cab5ba"
 #define uuid_FlightMode                "0f357cea-91bf-0485-2a8b-53569b490827"

diff --git a/setting-common/src/setting-common-resource.c b/setting-common/src/setting-common-resource.c
deleted file mode 100644 (file)
index 99e1593..0000000
--- a/setting-common/src/setting-common-resource.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * 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.
- *
- */
-
-#define EXPORT_PUBLIC __attribute__((visibility("default")))
-
-/* network*/
-const EXPORT_PUBLIC char *STR_SETTING_MMS_CONNECTIONS =
-               "IDS_ST_BODY_MMS_CONNECTIONS";
-const EXPORT_PUBLIC char *STR_SETTING_NEW_CONNECTIONS =
-               "IDS_ST_HEADER_CREATE_CONNECTION";
-

diff --git a/setting-network/include/setting-network.h b/setting-network/include/setting-network.h
index 98e60b74aecf76178345b40ddb18f79670f28e86..7ebabea6c01e771b9e95417d092e13085986df6f 100644 (file)
--- a/setting-network/include/setting-network.h
+++ b/setting-network/include/setting-network.h
@@ -48,6 +48,7 @@
 
 #define TIME_TO_TURN_OFF_3G 2
 
+#define  STR_SETTING_MMS_CONNECTIONS "IDS_ST_BODY_MMS_CONNECTIONS"
 /*for new metwork mode */
 /*"GSM/WCDMA (auto connect)" */
 #define Keystr_NetBrand_Auto "IDS_CST_OPT_GSM_WCDMA_HAUTO_CONNECT"

diff --git a/setting-network/src/setting-network-con-list.c b/setting-network/src/setting-network-con-list.c
index 9200223799090a99509c63e26a888df6921bb6d2..89ccfd967b2dada0f4bfe06a18732a8dc019cb1c 100644 (file)
--- a/setting-network/src/setting-network-con-list.c
+++ b/setting-network/src/setting-network-con-list.c
@@ -52,7 +52,7 @@ static void move_more_ctxpopup(Evas_Object *ctxpopup)
        Evas_Coord w, h;
        int pos = -1;
 
-       /* We convince the top widget is a window */
+       /* We assume the top widget is a window */
        win = elm_object_top_widget_get(ctxpopup);
        elm_win_screen_size_get(win, NULL, NULL, &w, &h);
        pos = elm_win_rotation_get(win);
@@ -658,9 +658,8 @@ static void setting_network_con_list_click_softkey_create_cb(void *data,
 {
        SETTING_TRACE_BEGIN;
        /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
        SettingNetwork *ad = (SettingNetwork *)data;
+       ret_if(!ad);
 
        FREE(ad->access_name);
        setting_view_change(&setting_view_network_con_list,

diff --git a/setting-network/src/setting-network-connection-create.c b/setting-network/src/setting-network-connection-create.c
index 44fba427b6f3d7cdd8d00f374aacdcede58a18e1..d8d5805d168bec2b71ff6d4a698505d3d25abafb 100755 (executable)
--- a/setting-network/src/setting-network-connection-create.c
+++ b/setting-network/src/setting-network-connection-create.c
@@ -31,6 +31,7 @@
 #define URL_HEAD "http://"
 #define INTERNET "IDS_ST_BODY_CONNECTIONSETTINGS_INTERNET"
 #define PLUS_MMS "+ MMS"
+#define STR_SETTING_NEW_CONNECTIONS "IDS_ST_HEADER_CREATE_CONNECTION"
 
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);