Merge branch 'master' into tizen_2.1

diff --git a/data/org.tizen.menu-screen.xml.in b/data/org.tizen.menu-screen.xml.in
index 3f421b5..1720dd1 100755 (executable)
--- a/data/org.tizen.menu-screen.xml.in
+++ b/data/org.tizen.menu-screen.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_NAME@" version="1.0.34" install-location="internal-only">
+<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_NAME@" version="1.0.35" install-location="internal-only">
        <label>Menu-screen</label>
        <author email="jinny.yoon@samsung.com" href="www.samsung.com">Jin Yoon</author>
        <author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>

diff --git a/debian/changelog b/debian/changelog
index 8f3123b..f555b97 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+org.tizen.menu-screen (1.0.35) unstable; urgency=low
+
+  * Git: apps/home/menu-screen
+  * Tag: menu-screen_1.0.35
+
+  * Prevent issue : code maintainability
+
+ -- Jin Yoon <jinny.yoon@samsung.com>  Tue, 09 Apr 2013 09:53:46 +0900
+
 org.tizen.menu-screen (1.0.34) unstable; urgency=low
 
   * Git: apps/home/menu-screen

diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec
index b41192c..605c092 100644 (file)
--- a/packaging/org.tizen.menu-screen.spec
+++ b/packaging/org.tizen.menu-screen.spec
@@ -16,7 +16,7 @@
 
 Name:       org.tizen.menu-screen
 Summary:    An utility library of the menu screen
-Version:    1.0.34
+Version:    1.0.35
 Release:    1.1
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License

diff --git a/src/all_apps/shortcut.c b/src/all_apps/shortcut.c
index 395f8e1..72ffaed 100644 (file)
--- a/src/all_apps/shortcut.c
+++ b/src/all_apps/shortcut.c
@@ -133,6 +133,7 @@ HAPI menu_screen_error_e all_apps_shortcut_add_all(Evas_Object *scroller)
 
        Ecore_Idler *idle_timer = NULL;
        idle_timer = ecore_idler_add(_push_items_idler_cb, scroller);
+       retv_if(NULL == idle_timer, MENU_SCREEN_ERROR_FAIL);
 
        return MENU_SCREEN_ERROR_OK;
 }