From dae0c5c627768070d4679145cd8a439422f7f5c8 Mon Sep 17 00:00:00 2001 From: Hyejin Kim Date: Mon, 29 Oct 2012 19:27:03 +0900 Subject: [PATCH] change usb mode name --- setting-connectivity/src/setting-connectivity-usb.c | 16 ++++++++-------- setting-connectivity/src/setting-connectivity.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/setting-connectivity/src/setting-connectivity-usb.c b/setting-connectivity/src/setting-connectivity-usb.c index 8330453..354bac3 100755 --- a/setting-connectivity/src/setting-connectivity-usb.c +++ b/setting-connectivity/src/setting-connectivity-usb.c @@ -191,7 +191,7 @@ static void setting_connectivity_popup_cb(void *data, Evas_Object *obj, } else if (POPUP_RESPONSE_CANCEL == response_type) { // NO SETTING_TRACE("keeping_debug: UNSET\n"); - ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); // set to zero elm_check_state_set(ad->debug_mode->eo_check, 0); @@ -221,7 +221,7 @@ static void setting_connectivity_main_chk_usb_debug_cb(void *data, Evas_Object * { switch (g_selMode) { - case SETTING_USB_SAMSUNG_KIES: + case SETTING_USB_DEFAULT_MODE: /* not USB debug mode */ load_usb_connection_popup(ad); break; @@ -230,7 +230,7 @@ static void setting_connectivity_main_chk_usb_debug_cb(void *data, Evas_Object * } // set default state - //int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + //int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); //setting_retm_if(ret != 0, "fail to set vconf"); elm_check_state_set(ad->debug_mode->eo_check, 0); } @@ -251,7 +251,7 @@ static void setting_connectivity_main_chk_usb_debug_cb(void *data, Evas_Object * _("IDS_COM_SK_CANCEL")); } else { // set default state - int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); setting_retm_if(ret != 0, "fail to set vconf"); elm_check_state_set(ad->debug_mode->eo_check, 0); } @@ -330,7 +330,7 @@ static void setting_connectivity_usb_mouse_up_Gendial_list_cb(void *data, { switch (g_selMode) { - case SETTING_USB_SAMSUNG_KIES: + case SETTING_USB_DEFAULT_MODE: /* not USB debug mode */ load_usb_connection_popup(ad); break; @@ -339,7 +339,7 @@ static void setting_connectivity_usb_mouse_up_Gendial_list_cb(void *data, } // set default state - int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); setting_retm_if(ret != 0, "fail to set vconf"); elm_check_state_set(list_item->eo_check, 0); } @@ -363,7 +363,7 @@ static void setting_connectivity_usb_mouse_up_Gendial_list_cb(void *data, _("IDS_COM_SK_CANCEL")); } else { // set default state - int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); setting_retm_if(ret != 0, "fail to set vconf"); elm_check_state_set(list_item->eo_check, 0); } @@ -963,7 +963,7 @@ static void usb_connection_response_cb(void *data, Evas_Object *obj, void *event SettingConnectivityUG *ad = (SettingConnectivityUG *)data; g_curMode = SETTING_USB_NONE_MODE; - g_selMode = SETTING_USB_SAMSUNG_KIES; + g_selMode = SETTING_USB_DEFAULT_MODE; ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, g_selMode); setting_retm_if(ret != 0, "vconf_set_int(VCONF_SETAPPL_USB_SEL_MODE_INT)\n"); diff --git a/setting-connectivity/src/setting-connectivity.c b/setting-connectivity/src/setting-connectivity.c index 43ce75e..4de0d55 100755 --- a/setting-connectivity/src/setting-connectivity.c +++ b/setting-connectivity/src/setting-connectivity.c @@ -307,7 +307,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv) #if SUPPORT_RUN_SYSTEM_COMMAND ret += excuteCmd(SETTING_POSTINST_FILE, 1, "usbconnectivity"); #else - ret += vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + ret += vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); /* Resetting VCONFKEY_SETAPPL_USB_MODE_INT (current mode) is not necessary. * If USB cable is removed, the key value is SETTING_USB_NONE_MODE by USB-setting. * If USB cable is connected, the key value is changed by selected mode. */ @@ -344,6 +344,6 @@ void set_usb_mode_default() SETTING_TRACE_BEGIN; int ret = -1; - ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_SAMSUNG_KIES); + ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE); SETTING_TRACE_END; } -- 2.7.4