From: Jin Yoon <jinny.yoon@samsung.com>
Date: Tue, 12 Mar 2013 01:14:31 +0000 (+0900)
Subject: Merge some features with the private
X-Git-Tag: submit/tizen_2.1/20130424.223356~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9335c4ce094928e5d657ccfe0646ba963f4c6b73;p=apps%2Fhome%2Fmenu-screen.git

Merge some features with the private
---

diff --git a/data/edje/all_apps_portrait.edc b/data/edje/all_apps_portrait.edc
index fe5f0ef..466ebd3 100644
--- a/data/edje/all_apps_portrait.edc
+++ b/data/edje/all_apps_portrait.edc
@@ -46,18 +46,18 @@ collections {
 					visible: 0;
 				}
 			}
-            part {
-                name: "index";
-                type: SWALLOW;
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                    align: 0.5 0.5;
+			part {
+				name: "index";
+				type: SWALLOW;
+				mouse_events: 0;
+				description {
+					state: "default" 0.0;
+					align: 0.5 0.5;
 					rel1 { relative: 0.2 0.0; to, "index_bg";}
 					rel2 { relative: 0.8 1.0; to, "index_bg";}
 					visible: 1;
-                }
-            }
+				}
+			}
 			part {
 				name: "button_edit";
 				type: SWALLOW;
@@ -71,7 +71,7 @@ collections {
 					visible: 1;
 				}
 			}
-            part {
+			part {
 				name: "content_bg";
 				type: RECT;
 				scale: 1;
@@ -92,7 +92,7 @@ collections {
 				mouse_events: 1;
 				description {
 					state: "default" 0.0;
-                    align: 0.5 0.0;
+					align: 0.5 0.0;
 					rel1 { relative: 0.0 0.0; to, "content_bg";}
 					rel2 { relative: 1.0 1.0; to, "content_bg";}
 					visible: 1;
diff --git a/src/item.c b/src/item.c
index dd00558..6ebfde8 100644
--- a/src/item.c
+++ b/src/item.c
@@ -464,7 +464,12 @@ static Evas_Object *_add_icon_image(Evas_Object *item, const char *icon_file)
 {
 	Evas_Object *icon;
 
+	retv_if(NULL == item, NULL);
+	retv_if(NULL == icon_file, NULL);
+
 	icon = elm_icon_add(item);
+	retv_if(NULL == icon, NULL);
+
 	if (elm_image_file_set(icon, icon_file, NULL) == EINA_FALSE) {
 		_E("Icon file is not accessible (%s)", icon_file);
 		evas_object_del(icon);
@@ -485,6 +490,10 @@ static Evas_Object *_add_icon_image(Evas_Object *item, const char *icon_file)
 static Evas_Object *_add_edje_icon(Evas_Object *item, const char *icon_file)
 {
 	Evas_Object *icon;
+
+	retv_if(NULL == item, NULL);
+	retv_if(NULL == icon_file, NULL);
+
 	if (access(icon_file, R_OK) != 0) {
 		_E("Failed to get an icon");
 		return NULL;
@@ -525,6 +534,9 @@ HAPI void item_update(Evas_Object *item, app_info_t *ai)
 {
 	Evas_Object *icon = NULL;
 
+	ret_if(NULL == item);
+	ret_if(NULL == ai);
+
 	if (!ai->image) {
 		if (0 != access(ai->icon, R_OK)) {
 			_E("Failed to access to [%s]", ai->icon);
@@ -602,6 +614,7 @@ HAPI Evas_Object *item_create(Evas_Object *scroller, app_info_t* ai)
 
 	bg = evas_object_rectangle_add(menu_screen_get_evas());
 	if (!bg) {
+		_E("Cannot add an rectangle");
 		evas_object_del(item);
 		return NULL;
 	}
diff --git a/src/page_scroller.c b/src/page_scroller.c
index 37b2e87..25362cc 100644
--- a/src/page_scroller.c
+++ b/src/page_scroller.c
@@ -873,7 +873,7 @@ HAPI Evas_Object *page_scroller_create(Evas_Object *tab, Evas_Object *index, pag
 	evas_object_show(box);
 	evas_object_show(scroller);
 
-	if (vconf_notify_key_changed("memory/menuscreen/desktop", _desktop_cb, scroller) < 0) {
+	if (vconf_notify_key_changed(VCONFKEY_AIL_INFO_STATE, _desktop_cb, scroller) < 0) {
 		_E("Failed to register a desktop change event handler");
 	}
 
@@ -955,7 +955,7 @@ HAPI void page_scroller_destroy(Evas_Object *scroller)
 	evas_object_event_callback_del(box, EVAS_CALLBACK_DEL, _evas_object_event_del_cb);
 	evas_object_event_callback_del(scroller, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb);
 
-	if (vconf_ignore_key_changed("memory/menuscreen/desktop", _desktop_cb) < 0) {
+	if (vconf_ignore_key_changed(VCONFKEY_AIL_INFO_STATE, _desktop_cb) < 0) {
 		_E("Failed to ignore the desktop event");
 	}