rpms/plymouth/F-12 keyboard-fixes.patch, NONE, 1.1 plymouth.spec, 1.169, 1.170

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12182

Modified Files:
	plymouth.spec 
Added Files:
	keyboard-fixes.patch 
Log Message:
- Backport keyboard fixes


keyboard-fixes.patch:
 b/src/main.c |   10 ++++++----
 src/main.c   |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE keyboard-fixes.patch ---
>From 1fa4f91a6171fc0585734a766505dbbdd064e175 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Sat, 28 Nov 2009 00:16:22 -0500
Subject: [PATCH 1/2] [main] make keyboard removal idempotent

---
 src/main.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main.c b/src/main.c
index 3b27edf..47b6200 100644
--- a/src/main.c
+++ b/src/main.c
@@ -553,9 +553,12 @@ remove_displays_and_keyboard (state_t *state)
       node = next_node;
     }
 
-  ply_keyboard_stop_watching_for_input (state->keyboard);
-  ply_keyboard_free (state->keyboard);
-  state->keyboard = NULL;
+  if (state->keyboard != NULL)
+    {
+      ply_keyboard_stop_watching_for_input (state->keyboard);
+      ply_keyboard_free (state->keyboard);
+      state->keyboard = NULL;
+    }
 }
 
 static void
-- 
1.6.6


>From 8bb69cd87586af3eb5bfb2b7b56288b031823158 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Sat, 28 Nov 2009 00:24:21 -0500
Subject: [PATCH 2/2] [main] only set keyboard on splash if available

There may be cases where there is no keyboard set.
---
 src/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 47b6200..197c8e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1044,7 +1044,8 @@ add_displays_and_keyboard_to_boot_splash (state_t           *state,
   ply_list_node_t *node;
 
   ply_trace ("setting keyboard on boot splash");
-  ply_boot_splash_set_keyboard (splash, state->keyboard);
+  if (state->keyboard != NULL)
+    ply_boot_splash_set_keyboard (splash, state->keyboard);
 
   node = ply_list_get_first_node (state->pixel_displays);
   while (node != NULL)
-- 
1.6.6



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- plymouth.spec	6 Jan 2010 05:17:08 -0000	1.169
+++ plymouth.spec	25 Jan 2010 18:24:16 -0000	1.170
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.19.1%{?dist}
+Release: 0.2009.29.09.19.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -44,6 +44,7 @@ Patch8: fix-text-ask-for-password.patch
 Patch9: dont-unlink-devnull.patch
 Patch10: fix-hvc0-console.patch
 Patch11: force-raw-mode.patch
+Patch12: keyboard-fixes.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -263,6 +264,7 @@ plugin.
 %patch9 -p1 -b .dont-unlink-devnull
 %patch10 -p1 -b .fix-hvc0-console
 %patch11 -p1 -b .force-raw-mode
+%patch12 -p1 -b .keyboard-fixes
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -484,6 +486,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Jan 25 2010 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.19.2
+- Backport keyboard fixes
+
 * Wed Jan 06 2010 Dave Airlie <airlied at redhat.com> 0.8.0-0.2009.29.09.19.1
 - bump and rebuild for libdrm 2.4.17