[Bug] Modify the logic when destroying ug-image-viewer in setting > wallpaper.

[apps/core/preloaded/settings.git] / setting-display / src / setting-display.c

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index 48378b4..c3a82f9 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -59,9 +59,9 @@ setting_view *__get_display_view_to_load(service_h service)
                return &setting_view_display_wallpaper;
        } else {
                setting_view_node_table_register(&setting_view_display_main, NULL);
-               setting_view_node_table_register(&setting_view_display_brightness,
+               setting_view_node_table_register(&setting_view_display_screen_mode,
                                                 &setting_view_display_main);
-               setting_view_node_table_register(&setting_view_display_smart_screen,
+               setting_view_node_table_register(&setting_view_display_brightness,
                                                 &setting_view_display_main);
                return &setting_view_display_main;
        }
@@ -103,7 +103,7 @@ static void *setting_display_ug_on_create(ui_gadget_h ug,
 
        SettingDisplayUG *displayUG = priv;
        displayUG->ug = ug;
-       appcore_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
+       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
 
        displayUG->win_main_layout = (Evas_Object *) ug_get_parent_layout(ug);
        displayUG->win_get = (Evas_Object *) ug_get_window();
@@ -177,7 +177,7 @@ static void setting_display_ug_on_destroy(ui_gadget_h ug, service_h service,
        if (&setting_view_display_main == displayUG->view_to_load) {
                setting_view_destroy(&setting_view_display_brightness,
                                     displayUG);
-               setting_view_destroy(&setting_view_display_smart_screen, displayUG);
+               setting_view_destroy(&setting_view_display_screen_mode, displayUG);
                setting_view_destroy(&setting_view_display_main, displayUG);
        } else if (&setting_view_display_wallpaper == displayUG->view_to_load) {
                setting_view_destroy(&setting_view_display_wallpaper,
@@ -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;
 }
 
@@ -415,9 +415,6 @@ static int setting_reset_display_main(void)
        ret += vconf_set_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, FALSE);//battery percent
        setting_reset_launch_effect();
 
-       // smart screen
-       ret += vconf_set_int(VCONFKEY_PM_SMARTSTAY_STATUS, 0);
-       ret += vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, FALSE);
        return ret;
 }
 
@@ -438,7 +435,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();