From b1564de8db23db28f4f70f55ad517b3aa7d528e2 Mon Sep 17 00:00:00 2001 From: Kim Kibum Date: Fri, 27 Apr 2012 13:25:59 +0900 Subject: [PATCH] Tizen souce update --- debian/changelog | 9 +++++++++ include/menu_screen.h | 3 +++ packaging/org.tizen.menu-screen.spec | 2 +- src/all_apps/layout.c | 1 + src/menu_screen.c | 21 +++++++++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5af380b..d40609f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +menu-screen (1.0.11) unstable; urgency=low + + * Git: shared/pkgs/m/menu-screen + * Tag: menu-screen_1.0.11 + + * [Add] Exit with idle-time language changing + + -- Jin Yoon Fri, 20 Apr 2012 11:47:30 +0900 + menu-screen (1.0.10) unstable; urgency=low * Git: shared/pkgs/m/menu-screen diff --git a/include/menu_screen.h b/include/menu_screen.h index 1ed1fb8..88993de 100644 --- a/include/menu_screen.h +++ b/include/menu_screen.h @@ -17,12 +17,15 @@ #include #include +#include extern int menu_screen_get_root_width(void); extern int menu_screen_get_root_height(void); extern double menu_screen_get_yscale(void); extern Evas *menu_screen_get_evas(void); extern Evas_Object *menu_screen_get_win(void); +extern bool menu_screen_get_done(void); +extern void menu_screen_set_done(bool is_done); #endif //__MENU_SCREEN_H__ diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec index 9b53266..0fde987 100644 --- a/packaging/org.tizen.menu-screen.spec +++ b/packaging/org.tizen.menu-screen.spec @@ -4,7 +4,7 @@ Name: org.tizen.menu-screen Summary: An utility library of the menu screen -Version: 1.0.10 +Version: 1.0.11 Release: 1.1 Group: TO_BE/FILLED_IN License: Samsung Proprietary License diff --git a/src/all_apps/layout.c b/src/all_apps/layout.c index 4dccc83..f30de6b 100644 --- a/src/all_apps/layout.c +++ b/src/all_apps/layout.c @@ -74,6 +74,7 @@ ERROR: all_apps_list_destroy(list); evas_object_data_del(all_apps, "list"); page_scroller_bring_in(scroller, 0); + menu_screen_set_done(true); return ECORE_CALLBACK_CANCEL; } diff --git a/src/menu_screen.c b/src/menu_screen.c index 51f34c3..9c657ae 100644 --- a/src/menu_screen.c +++ b/src/menu_screen.c @@ -50,11 +50,13 @@ static struct { Evas *evas; Ecore_Evas *ee; Evas_Object *win; + bool is_done; } menu_screen_info = { .state = APP_STATE_PAUSE, .evas = NULL, .ee = NULL, .win = NULL, + .is_done = false, }; @@ -94,6 +96,20 @@ Evas_Object *menu_screen_get_win(void) +bool menu_screen_get_done(void) +{ + return menu_screen_info.is_done; +} + + + +void menu_screen_set_done(bool is_done) +{ + menu_screen_info.is_done = is_done; +} + + + static menu_screen_error_e _create_canvas(char *name, char *title) { Ecore_X_Atom ATOM_WM_WINDOW_ROLE; @@ -378,6 +394,10 @@ static void _language_changed_cb(void *data) _D("Language is changed"); + if (false == menu_screen_info.is_done) { + elm_exit(); + } + layout = evas_object_data_get(menu_screen_info.win, "layout"); ret_if(NULL == layout); all_apps = evas_object_data_get(layout, "all_apps"); @@ -409,6 +429,7 @@ static void _language_changed_cb(void *data) if (!name) { _D("Faield to get name for %s", item_get_package(item)); + ail_package_destroy_appinfo(ai); continue; } -- 2.34.1