Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta

diff --git a/resource/setting.cfg b/resource/setting.cfg
index f4a4bc8..09d9b76 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -240,7 +240,7 @@
         "is_resetable" : 1
       },
       {
-        "key_name" : "Web Applications",
+        "key_name" : "Web applications",
         "icon_path" : "/opt/ug/res/icons/ug-webapp-common-efl/WebApplication.png",
         "ug_args" : "webapp-common-efl",
         "pos" : 1,

diff --git a/setting-common/include/setting-common-resource.h b/setting-common/include/setting-common-resource.h
index fd19f6f..7112067 100755 (executable)
--- a/setting-common/include/setting-common-resource.h
+++ b/setting-common/include/setting-common-resource.h
@@ -133,7 +133,7 @@
 #define KeyStr_DownloadedAPPs          "IDS_ST_BODY_DOWNLOADED_APPLICATIONS"
 #define KeyStr_AppsInformation         "IDS_ST_BODY_APPLICATION_INFO"
 #define KeyStr_ManageApps              "IDS_ST_BODY_MANAGE_APPLICATIONS"
-#define KeyStr_WebApps                 "Web Applications"
+#define KeyStr_WebApps                 "Web applications"
 
 #define KeyStr_MoreConnect             "IDS_ST_BODY_MORE_CONNECTIVITY_SETTINGS"
 #define KeyStr_MoreSystem              "IDS_ST_BODY_MORE_SYSTEM_SETTINGS"

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 7ca2f5d..96664d5 100755 (executable)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -1131,12 +1131,6 @@ const char *setting_network_get_act_str(TelNetworkSystemType_t type)
        }
 }
 
-
-void __default_tapi_response_cb(TapiHandle *handle, int result, void *data, void *user_data)
-{
-}
-
-
 UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
@@ -1160,7 +1154,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
        if (tapi_handle) {
                SETTING_TRACE_DEBUG("tel_init sucessfull");
                //1.tel_select_network_automatic
-               int tapi_ret = tel_select_network_automatic(tapi_handle, __default_tapi_response_cb, NULL);
+               int tapi_ret = tel_select_network_automatic(tapi_handle, NULL, NULL);
                if (tapi_ret != TAPI_API_SUCCESS) {
                        ret++;
                        SETTING_TRACE_ERROR("tel_select_network_automatic. tapi_ret=%d", tapi_ret);
@@ -1169,7 +1163,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
                //2.tel_set_network_band
                tapi_ret = tel_set_network_band(tapi_handle, TAPI_NETWORK_BAND_MODE_ONLY,
                                                TAPI_NETWORK_BAND_TYPE_ANY,
-                                                __default_tapi_response_cb, NULL);
+                                                NULL, NULL);
                if (tapi_ret != TAPI_API_SUCCESS) {
                        ret++;
                        SETTING_TRACE_ERROR("tel_set_network_band. tapi_ret=%d", tapi_ret);
@@ -1190,7 +1184,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
        }
 
        //Reset connections info..
-       //  -> need to cowork with CSC
+       //   -> need to cowork with CSC
        //ret += excuteCmd("/usr/bin/dbus-send", 1, NET_CON_RESET_DBUS_PARA);
 
        SETTING_TRACE_END;

diff --git a/src/setting-main.c b/src/setting-main.c
index cc013a6..6333b2f 100755 (executable)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -640,7 +640,9 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
                            && SETTING_VIEW_MAIN == ad->view_load
                            && MAIN_PROFILE_PREFERRED == ad->profile_type) {
 
-                               ad->more_connective_menus[idx_second_menu++] = keyStr;
+                               if (is_ug_installed_by_ug_args(ug_args)) {
+                                       ad->more_connective_menus[idx_second_menu++] = keyStr;
+                               }
                        }
 
                        if (Cfg_Item_Pos_Level_All == inputPos) {
@@ -690,7 +692,7 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
 
        //end group , only display in setting main view
 #if SUPPORT_MORE_ITEM_FUNCTION
-               if (SETTING_VIEW_MAIN == ad->view_load && MAIN_PROFILE_PREFERRED == ad->profile_type)
+               if (SETTING_VIEW_MAIN == ad->view_load && MAIN_PROFILE_PREFERRED == ad->profile_type && idx_second_menu > 0)
                {
                        char sub_text[MAX_COMMON_BUFFER_LEN] = {0, };
                        int idx = 0;
@@ -803,7 +805,10 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object
                            && Cfg_Item_Pos_Level1 == tmpPos
                            && SETTING_VIEW_MAIN == ad->view_load
                            && MAIN_PROFILE_PREFERRED == ad->profile_type) {
+
+                           if (is_ug_installed_by_ug_args(ug_args)) {
                                ad->more_system_menus[idx_second_menu++] = keyStr;
+                           }
                        }
 
                        if (Cfg_Item_Pos_Level_All == inputPos) {
@@ -876,7 +881,7 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object
        }
        //end group, only display in setting main view
 #if SUPPORT_MORE_ITEM_FUNCTION
-               if (SETTING_VIEW_MAIN == ad->view_load && MAIN_PROFILE_PREFERRED == ad->profile_type)
+               if (SETTING_VIEW_MAIN == ad->view_load && MAIN_PROFILE_PREFERRED == ad->profile_type && idx_second_menu > 0)
                {
                        char sub_text[MAX_COMMON_BUFFER_LEN] = {0, };
                        int idx = 0;