Backed out changeset 796618164ade (bug 414071) for bustage.

toolkit/crashreporter/client/crashreporter_gtk_common.cpp

@@ -17,7 +17,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ -216,25 +215,14 @@ gpointer SendThread(gpointer args)
 }
 
 gboolean WindowDeleted(GtkWidget* window,
-                       GdkEvent* event,
-                       gpointer userData)
+                              GdkEvent* event,
+                              gpointer userData)
 {
   SaveSettings();
   gtk_main_quit();
   return TRUE;
 }
 
-gboolean check_escape(GtkWidget* window,
-                      GdkEventKey* event,
-                      gpointer userData)
-{
-  if (event->keyval == GDK_KEY_Escape) {
-    gtk_main_quit();
-    return TRUE;
-  }
-  return FALSE;
-}
-
 static void MaybeSubmitReport()
 {
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gSubmitReportCheck))) {

toolkit/crashreporter/client/crashreporter_gtk_common.h

@@ -39,7 +39,6 @@ gpointer SendThread(gpointer args);
 gboolean WindowDeleted(GtkWidget* window,
                        GdkEvent* event,
                        gpointer userData);
-gboolean check_escape(GtkWidget* window, GdkEventKey* event, gpointer data);
 void SubmitReportChecked(GtkButton* sender, gpointer userData);
 void IncludeURLClicked(GtkButton* sender, gpointer userData);
 void CloseClicked(GtkButton* button,

toolkit/crashreporter/client/crashreporter_linux.cpp

@@ -396,7 +396,6 @@ bool UIShowCrashUI(const string& dumpfile,
   gtk_window_set_position(GTK_WINDOW(gWindow), GTK_WIN_POS_CENTER);
   gtk_container_set_border_width(GTK_CONTAINER(gWindow), 12);
   g_signal_connect(gWindow, "delete-event", G_CALLBACK(WindowDeleted), 0);
-  g_signal_connect(gWindow, "key_press_event", G_CALLBACK(check_escape), nullptr);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, 6);
   gtk_container_add(GTK_CONTAINER(gWindow), vbox);