plymouth-restore-suspend.patch

   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
  17 diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
  18 index 2d73d66..1a67526 100644
  19 --- a/src/libply-splash-core/ply-boot-splash-plugin.h
  20 +++ b/src/libply-splash-core/ply-boot-splash-plugin.h
  21 @@ -38,6 +38,8 @@ typedef enum
  22  {
  23    PLY_BOOT_SPLASH_MODE_BOOT_UP,
  24    PLY_BOOT_SPLASH_MODE_SHUTDOWN,
  25 +  PLY_BOOT_SPLASH_MODE_SUSPEND,
  26 +  PLY_BOOT_SPLASH_MODE_RESUME,
  27    PLY_BOOT_SPLASH_MODE_UPDATES,
  28    PLY_BOOT_SPLASH_MODE_INVALID
  29  } ply_boot_splash_mode_t;
  30 diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
  31 index 5c648a6..eb7791e 100644
  32 --- a/src/plugins/splash/script/script-lib-plymouth.c
  33 +++ b/src/plugins/splash/script/script-lib-plymouth.c
  34 @@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state,
  35        case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
  36          obj = script_obj_new_string ("shutdown");
  37          break;
  38 +      case PLY_BOOT_SPLASH_MODE_SUSPEND:
  39 +        obj = script_obj_new_string ("suspend");
  40 +        break;
  41 +      case PLY_BOOT_SPLASH_MODE_RESUME:
  42 +        obj = script_obj_new_string ("resume");
  43 +       break;
  44        case PLY_BOOT_SPLASH_MODE_UPDATES:
  45          obj = script_obj_new_string ("updates");
  46          break;
  47 --
  48 1.7.10.4
  49