From 591985f93d4b5fee54ed8011eadc61b311bba81f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 5 Nov 2006 19:36:52 +0000 Subject: [PATCH] 2.17.1 --- .cvsignore | 2 +- gdm-2.17.1-desensitize-entry.patch | 39 ++++++++++++++++++++++++++++++ gdm.spec | 21 ++++++---------- sources | 2 +- 4 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 gdm-2.17.1-desensitize-entry.patch diff --git a/.cvsignore b/.cvsignore index 16f8d71..465318f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gdm-2.17.0.tar.bz2 +gdm-2.17.1.tar.bz2 diff --git a/gdm-2.17.1-desensitize-entry.patch b/gdm-2.17.1-desensitize-entry.patch new file mode 100644 index 0000000..9ec65f0 --- /dev/null +++ b/gdm-2.17.1-desensitize-entry.patch @@ -0,0 +1,39 @@ +--- gdm-2.17.1/gui/gdmlogin.c.desensitize-entry 2006-11-05 14:22:49.000000000 -0500 ++++ gdm-2.17.1/gui/gdmlogin.c 2006-11-05 14:24:05.000000000 -0500 +@@ -1776,7 +1776,7 @@ + curuser = NULL; + } + +- gtk_widget_set_sensitive (entry, TRUE); ++ gtk_widget_set_sensitive (entry, FALSE); + gtk_widget_set_sensitive (ok_button, FALSE); + gtk_widget_set_sensitive (start_again_button, FALSE); + +--- gdm-2.17.1/gui/greeter/greeter_item_pam.c.desensitize-entry 2006-11-05 14:22:49.000000000 -0500 ++++ gdm-2.17.1/gui/greeter/greeter_item_pam.c 2006-11-05 14:22:50.000000000 -0500 +@@ -291,11 +291,20 @@ + { + entry = GNOME_CANVAS_WIDGET (entry_info->item)->widget; + +- gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible); +- gtk_widget_set_sensitive (GTK_WIDGET (entry), TRUE); +- gtk_entry_set_max_length (GTK_ENTRY (entry), entry_len); +- gtk_entry_set_text (GTK_ENTRY (entry), ""); +- gtk_widget_grab_focus (entry); ++ if (message != NULL && strcmp (message, "") != 0) ++ { ++ gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible); ++ gtk_widget_set_sensitive (GTK_WIDGET (entry), TRUE); ++ gtk_entry_set_max_length (GTK_ENTRY (entry), entry_len); ++ gtk_entry_set_text (GTK_ENTRY (entry), ""); ++ gtk_widget_grab_focus (entry); ++ } ++ else ++ { ++ gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible); ++ gtk_entry_set_text (GTK_ENTRY (entry), "..."); ++ gtk_widget_set_sensitive (GTK_WIDGET (entry), FALSE); ++ } + } + + messages_to_give = FALSE; diff --git a/gdm.spec b/gdm.spec index e83aa67..c43104f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -15,8 +15,8 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.17.0 -Release: 2%{?dist} +Version: 2.17.1 +Release: 1%{?dist} Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -39,8 +39,8 @@ Patch7: gdm-2.8.0.2-merge-resources.patch Patch12: gdm-2.13.0.4-audit-login.patch # http://bugzilla.gnome.org/show_bug.cgi?id=347798 -Patch19: gdm-2.15.5-move-default-message.patch -Patch20: gdm-2.15.5-reset-pam.patch +Patch19: gdm-2.17.1-move-default-message.patch +Patch20: gdm-2.17.1-reset-pam.patch Patch21: gdm-2.16.0-security-tokens.patch # http://bugzilla.gnome.org/show_bug.cgi?id=347871 @@ -49,13 +49,7 @@ Patch24: gdm-2.16.0-wtmp.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=203917 Patch25: gdm-2.16.0-indic-langs.patch -Patch28: gdm-2.16.0-desensitize-entry.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=362853 -Patch29: gdm-2.16.0-photo-setup-help.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=345434 -Patch30: gdm-2.17.0-a11y-launch.patch +Patch28: gdm-2.17.1-desensitize-entry.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -127,8 +121,6 @@ several different X sessions on your local machine at the same time. %patch24 -p1 -b .wtmp %patch25 -p1 -b .indic-langs %patch28 -p1 -b .desensitize-entry -%patch29 -p1 -b .photo-setup-help -%patch30 -p0 -b .a11y-launch %build cp -f %{SOURCE1} config/gdm @@ -317,6 +309,9 @@ fi %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Sun Nov 5 2006 Matthias Clasen - 1:2.17.1-1 +- Update to 2.17.1 + * Thu Oct 26 2006 Matthias Clasen - 1:2.17.0-2 - Fix a crash with launching a11y support diff --git a/sources b/sources index 5233dce..9b9d58c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f05a52b520021d18e4d4d86b1c57b85 gdm-2.17.0.tar.bz2 +a56733aa192d903265334c9b0a1b12b9 gdm-2.17.1.tar.bz2