Merge "show NFC on emulator" into 2.0_beta

diff --git a/include/setting-debug.h b/include/setting-debug.h
index f7a45ec..f83b404 100755 (executable)
--- a/include/setting-debug.h
+++ b/include/setting-debug.h
@@ -89,7 +89,7 @@
 /*#endif*/
 
 #define SUPPORT_APP_ROATION                    0
-#define SUPPORT_LCD_TIMEOUT_KEEPING            0
+#define SUPPORT_LCD_TIMEOUT_KEEPING            1
 #define USE_DEVICE_SET_DISPLAY_BRT             1
 
 #define  LOW_BATTERY_DO_NOTHING                        1       /**< 1 : turn the low batter handlding off */

diff --git a/packaging/settings.spec b/packaging/settings.spec
index 83ae1a1..1ccbf8f 100755 (executable)
--- a/packaging/settings.spec
+++ b/packaging/settings.spec
@@ -191,7 +191,7 @@ GOPTION="-g 6514"
 %else
        vconftool $GOPTION set -t int db/setting/lcd_backlight_normal "0"
 %endif
-       #vconftool $GOPTION set -t int db/setting/lcd_timeout_normal_backup "30"
+       vconftool $GOPTION set -t int db/setting/lcd_timeout_normal_backup "30"
 
        #brightness
        vconftool $GOPTION set -t int db/setting/Brightness "-1"

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index 22d3135..a7b5909 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -1140,7 +1140,7 @@ static void __setting_about_main_device_name_clicked(void *data, Evas_Object *ob
        int mobile_ap_status = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
        int err = -1;
        int ret = setting_get_int_slp_key(INT_SLP_SETTING_MOBILE_AP_STATUS, &mobile_ap_status, &err);
-       setting_retm_if(ret == SETTING_RETURN_FAIL, "Get vconf failed");
+       //setting_retm_if(ret == SETTING_RETURN_FAIL, "Get vconf failed");
 
        if (!elm_object_focus_get(obj)) {
                elm_object_focus_set(obj, EINA_TRUE);

diff --git a/setting-common/include/setting-common-general-func.h b/setting-common/include/setting-common-general-func.h
index 1742a5d..b3406af 100755 (executable)
--- a/setting-common/include/setting-common-general-func.h
+++ b/setting-common/include/setting-common-general-func.h
@@ -87,7 +87,7 @@ extern bool isEmptyStr(const char *str);
 extern int safeStrLen(const char *str);
 extern bool get_substring_int(const char **ipStr, int *ipValue, char delim);
 extern bool is_ip_string(const char *ipstr);
-extern int setting_invoke_reset_function(char *lib_name, service_h service, void *ext);
+extern int setting_invoke_reset_function(char *ug_name, service_h service, void *ext);
 extern int excuteCmd(char* exec_path, int option_num, ...);
 extern void create_fontlink(const char *linkpath, const char *linkname,
                    const char *fontfilepath, const char *fontfilename);

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 18cbe02..b6e051e 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -677,13 +677,29 @@ bool is_ip_string(const char *ipstr)
        return TRUE;
 }
 
-int setting_invoke_reset_function(char *lib_name, service_h service, void *ext)
+int setting_invoke_reset_function(char *ug_name, service_h service, void *ext)
 {
-       SETTING_TRACE("Enter %s with lib_name:%s", __FUNCTION__, lib_name);
+       SETTING_TRACE("Enter %s with ug_name:%s", __FUNCTION__, ug_name);
        int (*reset) (service_h pair, void *ptr);
        int ret = OPERATE_LIB_SUCESS;
 
-       void *handle = dlopen(lib_name, RTLD_LAZY);
+       //1.first do exist-checking in /opt/ug/lib
+       char ug_file[PATH_MAX + 1];
+       snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, ug_name);
+       struct stat st;
+       if(stat(ug_file, &st) != 0) { 
+
+               //2.if it does not exit in /opt/ug/lib, then do exist-checking in /usr/ug/lib
+               memset(ug_file, 0x00, PATH_MAX + 1);
+               snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH_USR, ug_name);
+               if(stat(ug_file, &st) != 0) {
+                       //both not exist,skip it
+                       SETTING_TRACE_ERROR(" libug-%s.so is *NOT* present, so skip it..\n", ug_name);
+                       return OPERATE_LIB_SUCESS;
+               }
+       }
+       //-------------------------------------------------------------------------------------
+       void *handle = dlopen(ug_file, RTLD_LAZY);
        if (!handle) {
                SETTING_TRACE_ERROR(" >>>>>>>>>>> %s", dlerror());
                return LOAD_LIB_FAILED;

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index 48378b4..e8fbcc2 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -379,7 +379,7 @@ static int setting_reset_display_lc_screen(void)
        SETTING_TRACE_BEGIN;
        int ret = 0;
        ret += vconf_set_str(VCONFKEY_IDLE_LOCK_BGSET, IMG_DEFAULT_HOME_SCREEN);
-       ret += setting_invoke_reset_function("/opt/ug/lib/libug-setting-lock.so", 0, NULL);
+       ret += setting_invoke_reset_function("setting-lock", 0, NULL);
        return ret;
 }
 
@@ -438,7 +438,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
                ret += setting_reset_display_lc_screen();*/
 #if SUPPORT_RUN_SYSTEM_COMMAND
                ret += excuteCmd(SETTING_POSTINST_FILE, 1, "wallpaper");
-               ret += setting_invoke_reset_function("/opt/ug/lib/libug-setting-lock.so", service, NULL);
+               ret += setting_invoke_reset_function("setting-lock", service, NULL);
 #else
                ret += setting_reset_home_wallpaper();
                ret += setting_reset_display_lc_screen();

diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c
index b44e0a4..2a7d277 100755 (executable)
--- a/setting-reset/src/setting-reset-settings.c
+++ b/setting-reset/src/setting-reset-settings.c
@@ -165,10 +165,10 @@ bool __reset_all_idler(void *data)
                                path = get_ug_path_from_ug_args((void *)ug_args);
                                svc = get_bundle_from_ug_args((void *)ug_args);
 
-                               if (snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, path) < 0)
-                                       return FALSE;
+                               //if (snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, path) < 0)
+                               //      return FALSE;
 
-                               ret = setting_invoke_reset_function(ug_file, svc, NULL);
+                               ret = setting_invoke_reset_function(path, svc, NULL);
                                //SETTING_TRACE("load %s[plugin_ret:%d]", ug_file, ret);
 
                                if (OPERATE_LIB_SUCESS > ret)
@@ -438,12 +438,9 @@ static void __reset_an_item(Setting_Done_List_Data *list_data,
        {
                char *path = get_ug_path_from_ug_args((void *)ug_args);
                service_h svc = get_bundle_from_ug_args((void *)ug_args);
-               char ug_file[PATH_MAX];
-               if (snprintf(ug_file, PATH_MAX,
-                       "%s/libug-%s.so", SETTING_UG_PATH, path) < 0) return;
 
-               int plugin_ret = setting_invoke_reset_function(ug_file, svc, NULL);
-               SETTING_TRACE("load %s[plugin_ret:%d]", ug_file, plugin_ret);
+               int plugin_ret = setting_invoke_reset_function(path, svc, NULL);
+               SETTING_TRACE("load libug-%s.so[plugin_ret:%d]", path, plugin_ret);
 
                if (LOAD_LIB_FAILED == plugin_ret) // -1
                {
@@ -511,6 +508,15 @@ static Eina_Bool __reset_animator_cb(void *data)
        return ECORE_CALLBACK_RENEW;
 }
 
+bool __reset_delay_idler(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       retv_if(!data, FALSE);
+       SettingResetUG *ad = data;
+       ad->gl_index = 0;
+       ad->animator = ecore_animator_add(__reset_animator_cb, ad);
+       return FALSE;
+}
 
 static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data)
 {
@@ -545,8 +551,10 @@ static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data
                                 "list_process",
                                 NULL, NULL, NULL, 0, 1, 1);
 
-       ad->gl_index = 0;
-       ad->animator = ecore_animator_add(__reset_animator_cb, ad);
+       //ad->gl_index = 0;
+       //ad->animator = ecore_animator_add(__reset_animator_cb, ad);
+       //Don't append any item until the popup is fully showed up
+       ecore_idler_add((Ecore_Task_Cb) __reset_delay_idler, ad);
 
        /* reset sel_all item */
        elm_check_state_set(list_data->select_all_checkbox, 0);

diff --git a/src/setting.c b/src/setting.c
index 0275f49..375eb4d 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
        elm_init(argc, argv);
 #if SUPPORT_GL_ENGINE
        // opengl_x11 or software_x11
-       elm_config_engine_set("software_x11");
+       elm_config_preferred_engine_set("software_x11");
 #endif
 
        //fprintf(stderr, "[TIME] 1. aul_launch -> main :: Setting main : %d msec \n", appcore_measure_time_from("APP_START_TIME"));