]>
Commit | Line | Data |
---|---|---|
3b6dc651 JR |
1 | From 152304f3fd2ebd04ca6d49c62dce4ddd2269326a Mon Sep 17 00:00:00 2001 |
2 | From: Frederic Crozat <fcrozat@suse.com> | |
3 | Date: Fri, 20 Jul 2012 11:07:29 +0200 | |
4 | Subject: [PATCH] Revert "libply: remove the unused SPLASH_MODE_SUSPEND and | |
5 | SPLASH_MODE_RESUME" | |
6 | ||
7 | This reverts commit 02c596757753589f7e49d26eab2759d552f24671. | |
8 | ||
9 | Conflicts: | |
10 | src/libply-splash-core/ply-boot-splash-plugin.h | |
11 | src/plugins/splash/script/script-lib-plymouth.c | |
12 | --- | |
13 | src/libply-splash-core/ply-boot-splash-plugin.h | 2 ++ | |
14 | src/plugins/splash/script/script-lib-plymouth.c | 6 ++++++ | |
15 | 2 files changed, 8 insertions(+) | |
16 | ||
d28fae29 JB |
17 | --- plymouth-0.9.2/src/libply-splash-core/ply-boot-splash-plugin.h.orig 2015-05-24 21:36:57.996946648 +0200 |
18 | +++ plymouth-0.9.2/src/libply-splash-core/ply-boot-splash-plugin.h 2015-05-24 21:40:09.206938626 +0200 | |
19 | @@ -38,6 +38,8 @@ | |
3b6dc651 | 20 | { |
d28fae29 JB |
21 | PLY_BOOT_SPLASH_MODE_BOOT_UP, |
22 | PLY_BOOT_SPLASH_MODE_SHUTDOWN, | |
23 | + PLY_BOOT_SPLASH_MODE_SUSPEND, | |
24 | + PLY_BOOT_SPLASH_MODE_RESUME, | |
25 | PLY_BOOT_SPLASH_MODE_UPDATES, | |
26 | PLY_BOOT_SPLASH_MODE_INVALID | |
3b6dc651 | 27 | } ply_boot_splash_mode_t; |
d28fae29 JB |
28 | --- plymouth-0.9.2/src/plugins/splash/script/script-lib-plymouth.c.orig 2015-05-24 21:36:57.996946648 +0200 |
29 | +++ plymouth-0.9.2/src/plugins/splash/script/script-lib-plymouth.c 2015-05-24 21:41:42.316934720 +0200 | |
30 | @@ -70,6 +70,12 @@ | |
31 | case PLY_BOOT_SPLASH_MODE_SHUTDOWN: | |
32 | obj = script_obj_new_string ("shutdown"); | |
33 | break; | |
34 | + case PLY_BOOT_SPLASH_MODE_SUSPEND: | |
35 | + obj = script_obj_new_string ("suspend"); | |
36 | + break; | |
37 | + case PLY_BOOT_SPLASH_MODE_RESUME: | |
38 | + obj = script_obj_new_string ("resume"); | |
39 | + break; | |
40 | case PLY_BOOT_SPLASH_MODE_UPDATES: | |
41 | obj = script_obj_new_string ("updates"); | |
42 | break; |