- Update to latest snapshot

gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch

@@ -1,25 +0,0 @@
-Index: gui/simple-greeter/gdm-greeter-login-window.c
-===================================================================
---- gdm-2.21.9/gui/simple-greeter/gdm-greeter-login-window.c	(revision 5897)
-+++ gdm-2.21.9/gui/simple-greeter/gdm-greeter-login-window.c	(working copy)
-@@ -178,16 +178,16 @@ capslock_update (GdmGreeterLoginWindow *
- static gboolean
- is_capslock_on (void)
- {
--        unsigned int states;
-+        XkbStateRec states;
-         Display     *dsp;
- 
-         dsp = GDK_DISPLAY ();
- 
--        if (XkbGetIndicatorState (dsp, XkbUseCoreKbd, &states) != Success) {
--                return FALSE;
-+        if (XkbGetState (dsp, XkbUseCoreKbd, &states) != Success) {
-+              return FALSE;
-         }
- 
--        return (states & ShiftMask) != 0;
-+        return (states.locked_mods & LockMask) != 0;
- }
- 
- static void

gdm-2.21.9-dont-steal-all-keypresses.patch

@@ -1,59 +0,0 @@
---- gdm-2.21.9/gui/simple-greeter/gdm-greeter-login-window.c	(revision 5896)
-+++ gdm-2.21.9/gui/simple-greeter/gdm-greeter-login-window.c	(working copy)
-@@ -1325,10 +1325,21 @@ static gboolean
- gdm_greeter_login_window_key_press_event (GtkWidget   *widget,
-                                           GdkEventKey *event)
- {
-+        GdmGreeterLoginWindow *login_window;
-+        gboolean               capslock_on;
-+
-+        login_window = GDM_GREETER_LOGIN_WINDOW (widget);
-+
-         if (event->keyval == GDK_Escape) {
-                 reset_dialog (GDM_GREETER_LOGIN_WINDOW (widget));
-         }
- 
-+        capslock_on = is_capslock_on ();
-+
-+        if (capslock_on != login_window->priv->caps_lock_on) {
-+                capslock_update (login_window, capslock_on);
-+        }
-+
-         return GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->key_press_event (widget, event);
- }
- 
-@@ -1581,22 +1592,6 @@ gdm_greeter_login_window_class_init (Gdm
-         g_type_class_add_private (klass, sizeof (GdmGreeterLoginWindowPrivate));
- }
- 
--static gint
--window_key_press (GtkWidget             *widget,
--                  GdkEventKey           *event,
--                  GdmGreeterLoginWindow *login_window)
--{
--        gboolean capslock_on;
--
--        capslock_on = is_capslock_on ();
--
--        if (capslock_on != login_window->priv->caps_lock_on) {
--                capslock_update (login_window, capslock_on);
--        }
--
--        return TRUE;
--}
--
- static void
- on_gconf_key_changed (GConfClient           *client,
-                       guint                  cnxn_id,
-@@ -1659,11 +1654,6 @@ gdm_greeter_login_window_init (GdmGreete
-                                                                   login_window,
-                                                                   NULL,
-                                                                   NULL);
--
--        g_signal_connect (login_window, "key_press_event",
--                          G_CALLBACK (window_key_press),
--                          login_window);
--
- }
- 
- static void

gdm.spec

@@ -19,7 +19,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.21.9
-Release: 0.2008.02.29.3%{?dist}
+Release: 0.2008.03.10.1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -89,10 +89,6 @@ BuildRequires: gnome-panel-devel
 
 Requires: audit-libs >= %{libauditver}
 
-Patch0: gdm-2.21.9-dont-steal-all-keypresses.patch
-Patch1: gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch
-Patch2:	gdm-2.21.9-signal.patch
-
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -113,10 +109,6 @@ multiple simulanteous logged in users.
 %prep
 %setup -q
 
-%patch0 -p1 -b .dont-steal-all-keypresses
-%patch1 -p1 -b .check-capslock-state-not-capslock-light-state
-%patch2 -p1 -b .signal
-
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -124,9 +116,6 @@ cp -f %{SOURCE1} data/gdm
 cp -f %{SOURCE2} data/gdm-autologin
 cp -f %{SOURCE3} utils/gdmsetup-pam
 
-intltoolize --force
-autoreconf
-
 %configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-console-helper \
 	   --disable-scrollkeeper  \
@@ -311,6 +300,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Mar 10 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.9-0.2008.03.10.1
+- Update to latest snapshot
+
 * Fri Mar 7 2008 David Woodhouse <dwmw2@redhat.com> - 1:2.21.9-0.2008.02.29.3
 - Fix endianness breakage in signal pipes (#436333)
 

sources

@@ -1 +1 @@
-7e8c358319a47254882f2504d24ce53c  gdm-2.21.9.tar.gz
+7e2fed99bab30b4f571dab578b465be9  gdm-2.21.9.tar.gz