X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=setting-reset%2Fsrc%2Fsetting-reset-settings.c;h=31ac049c9ac6ff9d83a77fd1294461e02912e794;hb=HEAD;hp=e8452c17e8f671de3e3d25287c590638e415c9b6;hpb=0baa03273ed12786ec5fce10c3ef2cd2794dcc5a;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c
index e8452c1..31ac049 100755
--- a/setting-reset/src/setting-reset-settings.c
+++ b/setting-reset/src/setting-reset-settings.c
@@ -1,22 +1,18 @@
 /*
  * setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an AS IS BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 #include <setting-cfg.h>
 #include <setting-reset-settings.h>
@@ -306,6 +302,8 @@ static int setting_reset_settings_create(void *cb)
 					continue; /* hide Network in Emulator*/
 				} else if (!safeStrCmp(KeyStr_Bluetooth, item_name)) {
 					continue; /* hide Bluetooth in Emulator*/
+				} else if (!safeStrCmp(KeyStr_DateTime, item_name)) {
+					continue; /* hide Date&Time in Emulator*/
 				} else if (!safeStrCmp(KeyStr_Security, item_name)) {
 					continue; /* hide Security in Emulator*/
 				} else if (!safeStrCmp(KeyStr_Memory, item_name)) {
@@ -392,6 +390,8 @@ static int setting_reset_settings_destroy(void *cb)
 		ad->reset_all_idler = NULL;
 	}
 
+	ad->pop_btn = NULL;
+
 	elm_naviframe_item_pop(ad->navi_bar);
 	setting_view_reset_settings.is_create = 0;
 
@@ -502,6 +502,9 @@ static void __reset_an_item(Setting_Done_List_Data *list_data,
 							 (char *)item_name,
 							 (char *)result_str, NULL);
 			ecore_idler_add((Ecore_Task_Cb) __delay_reset_location, item_data);
+
+			service_destroy(svc);
+			FREE(path);
 			return;
 		}
 
@@ -552,11 +555,11 @@ static Eina_Bool __reset_animator_cb(void *data)
 			evas_object_del(ad->pop_progress);
 			ad->pop_progress = NULL;
 		}
-		Evas_Object *btn = elm_object_part_content_get(ad->notify, "button1");
-		if (btn)
+		//Evas_Object *btn = elm_object_part_content_get(ad->notify, "button1");
+		if (ad->pop_btn)
 		{
-			setting_enable_evas_object(btn);
-			setting_undo_dim_evas_object(btn, TRUE);
+			setting_enable_evas_object(ad->pop_btn);
+			setting_undo_dim_evas_object(ad->pop_btn, TRUE);
 		}
 
 		Evas_Object *genlist = elm_object_content_get(ad->notify);
@@ -614,6 +617,7 @@ static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data
 	elm_object_style_set(btn, "popup_button/default");
 	setting_disable_evas_object(btn);
 	setting_dim_evas_object(btn, TRUE);
+	ad->pop_btn = btn;
 
 	Evas_Object *genlist = elm_genlist_add(ad->notify);
 	elm_object_style_set(genlist, "dialogue");
@@ -701,7 +705,7 @@ setting_reset_settings_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
 	case UG_MODE_FULLVIEW:
 		evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
 						 EVAS_HINT_EXPAND);
-		elm_win_resize_object_add(ad->win_get, base);
+		//elm_win_resize_object_add(ad->win_get, base);
 		evas_object_show(base);
 		break;
 	default: