diff --git a/gdm-2.20.0-allow-escape.patch b/gdm-2.20.0-allow-escape.patch deleted file mode 100644 index 3c58c23..0000000 --- a/gdm-2.20.0-allow-escape.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up gdm-2.20.0/gui/gdmlogin.c.allow-escape gdm-2.20.0/gui/gdmlogin.c ---- gdm-2.20.0/gui/gdmlogin.c.allow-escape 2007-10-02 10:54:33.000000000 -0400 -+++ gdm-2.20.0/gui/gdmlogin.c 2007-10-02 11:02:08.000000000 -0400 -@@ -2146,6 +2146,20 @@ gdm_set_welcomemsg (void) - g_free (greeting); - } - -+static gboolean -+key_press_event (GtkWidget *widget, GdkEventKey *key, gpointer data) -+{ -+ if (key->keyval == GDK_Escape) -+ { -+ printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_CANCEL); -+ fflush (stdout); -+ -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - static void - gdm_login_gui_init (void) - { -@@ -2182,6 +2196,9 @@ gdm_login_gui_init (void) - - gtk_widget_set_events (login, GDK_ALL_EVENTS_MASK); - -+ g_signal_connect (G_OBJECT (login), "key_press_event", -+ G_CALLBACK (key_press_event), NULL); -+ - gtk_window_set_title (GTK_WINDOW (login), _("GDM Login")); - /* connect for fingering */ - if (browser_ok && gdm_config_get_bool (GDM_KEY_BROWSER)) -diff -up gdm-2.20.0/gui/greeter/greeter.c.allow-escape gdm-2.20.0/gui/greeter/greeter.c ---- gdm-2.20.0/gui/greeter/greeter.c.allow-escape 2007-10-02 10:48:39.000000000 -0400 -+++ gdm-2.20.0/gui/greeter/greeter.c 2007-10-02 10:56:34.000000000 -0400 -@@ -597,10 +597,16 @@ process_operation (guchar op_code, - static gboolean - key_press_event (GtkWidget *widget, GdkEventKey *key, gpointer data) - { -- if (DOING_GDM_DEVELOPMENT && (key->keyval == GDK_Escape)) -+ if (key->keyval == GDK_Escape) - { -- process_operation (GDM_QUIT, NULL); -- -+ if (DOING_GDM_DEVELOPMENT) -+ process_operation (GDM_QUIT, NULL); -+ else -+ { -+ printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_CANCEL); -+ fflush (stdout); -+ } -+ - return TRUE; - } - -@@ -1360,11 +1366,9 @@ main (int argc, char *argv[]) - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - -- if G_UNLIKELY (DOING_GDM_DEVELOPMENT) { -- g_signal_connect (G_OBJECT (window), "key_press_event", -- G_CALLBACK (key_press_event), NULL); -- } -- -+ g_signal_connect (G_OBJECT (window), "key_press_event", -+ G_CALLBACK (key_press_event), NULL); -+ - canvas = gnome_canvas_new_aa (); - GTK_WIDGET_UNSET_FLAGS (canvas, GTK_CAN_FOCUS); - gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), diff --git a/gdm.spec b/gdm.spec index baf8938..be39d3b 100644 --- a/gdm.spec +++ b/gdm.spec @@ -58,9 +58,6 @@ Patch37: gdm-2.19.8-selinux.patch # http://bugzilla.gnome.org/show_bug.cgi?id=482348 Patch41: pixbuf-ref.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=135965 -Patch42: gdm-2.20.0-allow-escape.patch - # http://bugzilla.redhat.com/show_bug.cgi?id=246399 Patch43: gdm-2.20.1-keymouselistener-segfault.patch @@ -158,7 +155,6 @@ Extra icons / faces for the GNOME Display Manager. %patch35 -p1 -b .gdmsetup-path %patch37 -p1 -b .selinux %patch41 -p1 -b .pixbuf-ref -%patch42 -p1 -b .allow-escape %patch43 -p1 -b .keymouselistener-segfault %patch44 -p1 -b .tcp-wrappers %patch45 -p1 -b .suspend @@ -378,6 +374,7 @@ fi %changelog * Tue Jan 08 2008 - Bastien Nocera - 1:2.20.3-1 - Update to 2.20.3 +- Remove obsolete patch * Fri Dec 7 2007 Ray Strode - 1:2.20.2-3 - increase X server startup timeout, since 10 seconds is too short