rpms/gdm/devel gdm-2.20.0-allow-escape.patch, NONE, 1.1 gdm.spec, 1.298, 1.299

[Ray Strode (rstrode)]

Author: rstrode

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

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.0-allow-escape.patch 
Log Message:
- Add escape == cancel behavior back


gdm-2.20.0-allow-escape.patch:

--- NEW FILE gdm-2.20.0-allow-escape.patch ---
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),


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- gdm.spec	1 Oct 2007 19:37:23 -0000	1.298
+++ gdm.spec	2 Oct 2007 15:04:32 -0000	1.299
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -67,6 +67,9 @@
 # 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
+
 Patch100: gdm-2.20.0-change-defaults.patch
 Patch101: stupid-bullets.patch
 
@@ -369,6 +372,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Oct  2 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-12
+- Add escape == cancel behavior back
+
 * Mon Oct  1 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-11
 - Fix a refcounting problem with user faces