Fri Feb 29 22:05:10 UTC 2008

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14553

Modified Files:
	.cvsignore gdm.spec sources 
Added Files:
	gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch 
	gdm-2.21.9-dont-steal-all-keypresses.patch 
Removed Files:
	2-new-chooser-widget.patch 3-switch-user-chooser-over.patch 
	4-switch-session-chooser-over.patch 
	5-dont-shrink-in-test-program.patch 
	6-session-chooser-in-login-window.patch 
	7-login-window-animation.patch 8-improve-animation.patch 
	gdm-2.21.2-fix-background.patch gdm-2.21.2-hide-guest.patch 
	gdm-2.21.2-use-metacity.patch gdm-2.21.8-validate-dmrc.patch 
Log Message:
- Update to snapshot
- Split user-switcher out


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

--- NEW FILE gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch ---
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:

--- NEW FILE gdm-2.21.9-dont-steal-all-keypresses.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	26 Feb 2008 05:03:33 -0000	1.63
+++ .cvsignore	29 Feb 2008 22:04:23 -0000	1.64
@@ -1 +1 @@
-gdm-2.21.8.tar.gz
+gdm-2.21.9.tar.gz


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- gdm.spec	26 Feb 2008 05:03:33 -0000	1.336
+++ gdm.spec	29 Feb 2008 22:04:23 -0000	1.337
@@ -18,8 +18,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.21.8
-Release: 1%{?dist}
+Version: 2.21.9
+Release: 0.2008.02.29.1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -29,11 +29,7 @@
 Source2: gdm-autologin-pam
 Source3: gdmsetup-pam
 
-Patch1: gdm-2.21.8-fedora-logo.patch
-Patch2: gdm-2.21.8-validate-dmrc.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Prereq: /usr/sbin/useradd
 
 Requires: gtk2 >= 0:%{gtk2_version}
@@ -53,7 +49,7 @@
 Requires: hal >= %{hal_version}
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: PolicyKit-gnome >= %{polkit_version}
-Requires: gnome-settings-daemon
+Requires: gnome-settings-daemon >= 2.21.92
 # since we use it, and pam spams the log if the module is missing
 Requires: gnome-keyring-pam
 Requires(post): scrollkeeper
@@ -93,16 +89,34 @@
 
 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
+
+Patch99: gdm-2.21.8-fedora-logo.patch
+
+%package user-switch-applet
+Summary:   GDM User Switcher Panel Applet
+Group:     User Interface/Desktops
+Requires:  gdm >= 0:2.21.9
+Obsoletes: fast-user-switch-applet
+Provides:  fast-user-switch-applet = %{epoch}:%{version}-%{release}
+
 %description
-Gdm (the GNOME Display Manager) is a highly configurable
-reimplementation of xdm, the X Display Manager. Gdm allows you to log
-into your system with the X Window System running and supports running
-several different X sessions on your local machine at the same time.
+GDM provides the graphical login screen, shown shortly after boot up,
+log out, and when user switching.
+
+%description user-switch-applet
+The GDM user switcher applet provides a mechanism for changing among
+multiple simulanteous logged in users.
 
 %prep
 %setup -q
-%patch1 -p1 -b .fedora-logo
-%patch2 -p1 -b .validate-dmrc
+
+%patch0 -p1 -b .dont-steal-all-keypresses
+%patch1 -p1 -b .check-capslock-state-not-capslock-light-state
+
+
+%patch99 -p1 -b .fedora-logo
 
 %build
 cp -f %{SOURCE1} data/gdm
@@ -141,29 +155,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 
-# remove the gnome session file, since we don't use it anymore
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/gnome.desktop
-
-# remove the other gnome session file, since we put it in gnome-session
-rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
 
-# no dumb flexiserver thing, Xnest is too broken
-rm -f $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver-xnest.desktop
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmsetup.desktop || :
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop || :
-
-desktop-file-install --delete-original       			\
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications          	\
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver.desktop || :
-
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
 find $RPM_BUILD_ROOT -name '*.a' -delete
@@ -283,13 +276,13 @@
 %{_datadir}/pixmaps/faces/*.png
 %{_datadir}/pixmaps/faces/*.jpg
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/gdm
 %{_libexecdir}/*
 %{_sbindir}/*
 %{_bindir}/*
+%{_datadir}/gdm/*.glade
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_libdir}/bonobo/servers/GNOME_GdmUserSwitchApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_GdmUserSwitchApplet.xml
+%dir %{_datadir}/gdm
+%dir %{_datadir}/gdm/autostart
 %dir %{_datadir}/gdm/autostart/LoginWindow
 %dir %{_localstatedir}/log/gdm
 %attr(1750, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
@@ -298,7 +291,18 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1770, root, gdm) %dir %{_localstatedir}/lib/gdm
 
+%files user-switch-applet
+%defattr(-, root, root)
+%{_libexecdir}/gdm-user-switch-applet
+%{_datadir}/gdm/gdm-user-switch-applet.glade
+%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+
 %changelog
+* Fri Feb 29 2008 Ray Strode <rstrode at redhat.com> - 1:2.21.9-0.2008.02.29.1
+- Update to snapshot
+- Split user-switcher out
+
 * Mon Feb 25 2008 Jon McCann <jmccann at redhat.com> - 1:2.21.8-1
 - Update to 2.21.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	26 Feb 2008 05:03:33 -0000	1.73
+++ sources	29 Feb 2008 22:04:23 -0000	1.74
@@ -1 +1 @@
-5eecea9d8466bcab8790699685f28b0b  gdm-2.21.8.tar.gz
+7e8c358319a47254882f2504d24ce53c  gdm-2.21.9.tar.gz


--- 2-new-chooser-widget.patch DELETED ---


--- 3-switch-user-chooser-over.patch DELETED ---


--- 4-switch-session-chooser-over.patch DELETED ---


--- 5-dont-shrink-in-test-program.patch DELETED ---


--- 6-session-chooser-in-login-window.patch DELETED ---


--- 7-login-window-animation.patch DELETED ---


--- 8-improve-animation.patch DELETED ---


--- gdm-2.21.2-fix-background.patch DELETED ---


--- gdm-2.21.2-hide-guest.patch DELETED ---


--- gdm-2.21.2-use-metacity.patch DELETED ---


--- gdm-2.21.8-validate-dmrc.patch DELETED ---


