Exit after action

Change-Id: Ie2d1266e086c4523ad7ef7041102ef7f65d166f6
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/src/librui/rui-menu.c b/src/librui/rui-menu.c
index e62128e7bcf3e35a805d2f2b4a6c04dcd1b88d90..fb7698f18a1b6bde6d4c5ba87cb47a6053f143b5 100644 (file)
--- a/src/librui/rui-menu.c
+++ b/src/librui/rui-menu.c
@@ -88,6 +88,9 @@ int rui_menu_action_run(rui_menu *menu)
                ret = system(menu->actions[item_selected].action_handler);
                if (ret < 0)
                        return ret;
+
+               if (menu->actions[item_selected].exit_after_action)
+                       exit(0);
        }
 
        return 1; /* Repaint unconditionally. Just in case. */

diff --git a/src/librui/rui-menu.h b/src/librui/rui-menu.h
index 881c03b5506ad0ba18adf7a1ab6d92eaf68eb615..1bb051aa8efb45edaf85bd864258db243b62d810 100644 (file)
--- a/src/librui/rui-menu.h
+++ b/src/librui/rui-menu.h
@@ -43,6 +43,7 @@ struct rui_menu_t;
 typedef struct {
         int                     screen_switch_to;
         const char             *action_handler;
+       int                     exit_after_action;
 } rui_menu_action;
 
 typedef struct rui_menu_t {

diff --git a/src/system-recovery/recovery-main.c b/src/system-recovery/recovery-main.c
index 3b3db549f0ef8becfe1987e1a52898212b4ac181..1446b79bdb7b7f6f0097c7a06264d473b2dda510 100644 (file)
--- a/src/system-recovery/recovery-main.c
+++ b/src/system-recovery/recovery-main.c
@@ -88,6 +88,8 @@ char *get_action_from_file(void)
 
        ret = fscanf(fp, "%" STR(ACTION_BUFFER_SIZE) "s", buf);
        fclose(fp);
+       unlink(SYSTEM_RECOVERY_ACTION_FILE);
+
        if (ret != 1)
                return NULL;
 

diff --git a/src/system-recovery/recovery-rui.c b/src/system-recovery/recovery-rui.c
index 7a99b4bbc42f3f13045ca2090466f9c3f1da4ce9..777f6919c9fb2179470fb1d119cdbcf8620236f1 100644 (file)
--- a/src/system-recovery/recovery-rui.c
+++ b/src/system-recovery/recovery-rui.c
@@ -390,6 +390,7 @@ static int menu_entry_parse(config_setting_t *root, void *data)
 
                config_setting_lookup_string(node, "label", &menu->items[i]);
                menu->actions[i].screen_switch_to = get_screen_id(node, "screen_switch_to");
+               config_setting_lookup_int(node, "exit_after_action", &menu->actions[i].exit_after_action);
                rui_lookup_setting_value(node, rui_action_handlers, (&menu->actions[i]), action_handler);
        }
 

diff --git a/src/system-recovery/system-recovery.cfg.m4.in b/src/system-recovery/system-recovery.cfg.m4.in
index d1134aabc7a75d318b3b1cd1c9b5129ef81ce410..664c272431240e532813135bfd766c721a68aef6 100644 (file)
--- a/src/system-recovery/system-recovery.cfg.m4.in
+++ b/src/system-recovery/system-recovery.cfg.m4.in
@@ -3,6 +3,7 @@
 m4_define(`confirm_action',`({
             label = "Yes";
             action_handler = "$1";
+            exit_after_action = $2;
         },{
             label = "No";
             screen_switch_to = "BACK";
@@ -142,8 +143,7 @@ menus = {
         style = "common";
         item_selected = 1;
         item_default = 1;
-        actions = confirm_action(`reboot');
-       exit_after_action = 1;
+        actions = confirm_action(`reboot', 0);
     };
     safe = {
         pos_x = 0; // use M4 macros
@@ -151,8 +151,7 @@ menus = {
         style = "common";
         item_selected = 1;
         item_default = 1;
-        actions = confirm_action(`safeboot');
-       exit_after_action = 1;
+        actions = confirm_action(`safeboot', 1);
     };
     factory = {
         pos_x = 0; // use M4 macros
@@ -164,11 +163,11 @@ menus = {
             label = "Yes";
             screen_switch_to = "factory-run";
             action_handler = "factory-reset";
+            exit_after_action = 1;
         },{
             label = "No";
             screen_switch_to = "BACK";
         });
-       exit_after_action = 1;
     };
 };