From 41a92208365813e28e955cb41c1bb82fcd2ec8ba8d7f876531f7259160a1026d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 14 Nov 2007 11:08:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=44 --- gdm-tab-triggers-enter.patch | 43 ++++++++++++++++++++++++++++++++++++ gdm.changes | 7 ++++++ gdm.spec | 11 ++++++--- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 gdm-tab-triggers-enter.patch diff --git a/gdm-tab-triggers-enter.patch b/gdm-tab-triggers-enter.patch new file mode 100644 index 0000000..b25aa0d --- /dev/null +++ b/gdm-tab-triggers-enter.patch @@ -0,0 +1,43 @@ +Index: gui/gdmlogin.c +=================================================================== +--- gui/gdmlogin.c (révision 5348) ++++ gui/gdmlogin.c (copie de travail) +@@ -2094,6 +2094,16 @@ + const char *login_string; + + /* ++ * Allow tab to trigger enter; but not -tab ++ */ ++ if ((event->keyval == GDK_Tab || ++ event->keyval == GDK_KP_Tab) && ++ (event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) == 0) { ++ gdm_login_enter (entry); ++ return TRUE; ++ } ++ ++ /* + * Set ok button to sensitive only if there are characters in + * the entry field + */ +Index: gui/greeter/greeter_item_pam.c +=================================================================== +--- gui/greeter/greeter_item_pam.c (révision 5348) ++++ gui/greeter/greeter_item_pam.c (copie de travail) +@@ -183,6 +183,17 @@ + const char *login_string; + GtkWidget *entry = GNOME_CANVAS_WIDGET (entry_info->item)->widget; + ++ /* ++ * Allow tab to trigger enter; but not -tab ++ */ ++ if ((event->keyval == GDK_Tab || ++ event->keyval == GDK_KP_Tab) && ++ (event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) == 0) ++ { ++ greeter_item_pam_login (GTK_ENTRY (entry), entry_info); ++ return TRUE; ++ } ++ + if (gtk_ok_button != NULL) + { + /* diff --git a/gdm.changes b/gdm.changes index cc9737f..0bfa74a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 14 01:13:01 CET 2007 - hpj@suse.de + +- Removed second --with-atspi-dir from configure. +- Added gdm-tab-triggers-enter.patch, which fixes Novell bug + #334446. + ------------------------------------------------------------------- Tue Nov 13 15:06:06 CET 2007 - rodrigo@suse.de diff --git a/gdm.spec b/gdm.spec index 64e8283..4964c29 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 35 +Release: 37 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -61,6 +61,7 @@ Patch44: gdm-language-save.patch Patch45: gdm-2.20.0-wait-for-restart.patch # PATCH-FIX-UPSTREAM abuild.patch maw@novell.com -- already fixed in gdm trunk, will go away when we upgrade to 2.21 Patch46: abuild.patch +Patch47: gdm-tab-triggers-enter.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -120,6 +121,7 @@ gnome-patch-translation-prepare %patch44 %patch45 -p1 %patch46 -p1 +%patch47 gnome-patch-translation-update %build @@ -134,8 +136,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" --with-atspi-dir=%{_prefix}/lib/at-spi \ --enable-ipv6\ --disable-scrollkeeper\ - --enable-secureremote \ - --with-atspi-dir=%{_prefix}/lib/at-spi + --enable-secureremote make %{?jobs:-j%jobs} %install @@ -262,6 +263,10 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %files lang -f %{name}.lang %changelog +* Wed Nov 14 2007 - hpj@suse.de +- Removed second --with-atspi-dir from configure. +- Added gdm-tab-triggers-enter.patch, which fixes Novell bug + [#334446]. * Tue Nov 13 2007 - rodrigo@suse.de - Added --with-atspi-dir to configure to get accessible login (#337428)