Enable flight mode in BT model.

Change-Id: I7919da19ec4fd28744451de1502cc81ddd3a781e
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/setting-connection.c b/src/setting-connection.c
index 4c9bbd71960cc6767a04ac5bc23a4228b3b622aa..5656ebcac1f134ad090d4195b928590b0e4f328e 100644 (file)
--- a/src/setting-connection.c
+++ b/src/setting-connection.c
@@ -558,7 +558,10 @@ void _flight_mode_cb(void *data, Evas_Object *obj, void *event_info)
                char buf[__SETTING_BUF_SIZE__] = {0,};
 
                char *font_setting = "<text_class=tizen><align=center>%s</align></text_class>";
-               snprintf(buf, sizeof(buf) - 1, font_setting, _("WDS_ST_TPOP_FLIGHT_MODE_DISABLES_CALLS_MESSAGING_AND_ALL_CONNECTIONS_TO_USE_WI_FI_AND_BLUETOOTH_GO_TO_SETTINGS"));
+               if (is_supported_telephony)
+                       snprintf(buf, sizeof(buf) - 1, font_setting, _("WDS_ST_TPOP_FLIGHT_MODE_DISABLES_CALLS_MESSAGING_AND_ALL_CONNECTIONS_TO_USE_WI_FI_AND_BLUETOOTH_GO_TO_SETTINGS"));
+               else
+                       snprintf(buf, sizeof(buf) - 1, font_setting, "Flight mode disables all connections. To use Wi-Fi and Bluetooth, go to Settings.");
 
                Evas_Object *layout;
                layout = elm_layout_add(popup);
@@ -762,8 +765,7 @@ Evas_Object *_create_connection_list(void *data)
        for (idx = 0; idx < CONNECT_TOP_MENU_SIZE; idx++) {
                if(!is_supported_telephony) {
                        if(connection_menu_its[idx].type == SETTING_CONNECTION_DATAUSAGE ||
-                               connection_menu_its[idx].type == SETTING_CONNECTION_MOBILE_NETWORKS ||
-                               connection_menu_its[idx].type == SETTING_CONNECTION_FLIGHT_MODE)
+                               connection_menu_its[idx].type == SETTING_CONNECTION_MOBILE_NETWORKS)
                                continue;
                }
 

diff --git a/src/setting-mobile-networks.c b/src/setting-mobile-networks.c
index 50131ec9330750527bf2a5ea1d1b15b8368e7179..83b892c0245674e9a4112048ff9252f3c185f2a8 100644 (file)
--- a/src/setting-mobile-networks.c
+++ b/src/setting-mobile-networks.c
@@ -949,7 +949,8 @@ Evas_Object* _update_network_operator_list(void *data)
        text_f->func.text_get = _gl_found_network_operator_title_get;
        text_f->func.del = _mobile_networks_gl_del;
 
-       for (idx = 0; idx < g_plmn_info.networks_count; idx++) {
+       int net_count = (int)g_plmn_info.networks_count;
+       for (idx = 0; idx < net_count; idx++) {
 
                itc_tmp = text_f;