Backed out changeset 796618164ade (bug 414071) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 08 Jan 2014 10:49:55 -0500
changeset 162545 ee31dadd0969e729d6148388f74c2f317c19e8c3
parent 162544 d8a6bde7629390a84a31f999ab78a6e385ec7afe
child 162546 ab12a8416a1dc1fde3833adcb4d896c27a3e59a3
push id38229
push userryanvm@gmail.com
push dateWed, 08 Jan 2014 15:50:03 +0000
treeherdermozilla-inbound@ee31dadd0969 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs414071
milestone29.0a1
backs out796618164ade96ef26652d714f8db94ef698dd9d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 796618164ade (bug 414071) for bustage.
toolkit/crashreporter/client/crashreporter_gtk_common.cpp
toolkit/crashreporter/client/crashreporter_gtk_common.h
toolkit/crashreporter/client/crashreporter_linux.cpp
--- a/toolkit/crashreporter/client/crashreporter_gtk_common.cpp
+++ b/toolkit/crashreporter/client/crashreporter_gtk_common.cpp
@@ -12,17 +12,16 @@
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "mozilla/NullPtr.h"
 #include "common/linux/http_upload.h"
 #include "crashreporter.h"
@@ -211,35 +210,24 @@ gpointer SendThread(gpointer args)
   // on the main thread, see:
   // http://library.gnome.org/devel/gtk-faq/stable/x499.html
   g_idle_add(ReportCompleted, (gpointer)success);
 
   return nullptr;
 }
 
 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))) {
     gDidTrySend = true;
     SendReport();
   } else {
     gtk_main_quit();
   }
--- a/toolkit/crashreporter/client/crashreporter_gtk_common.h
+++ b/toolkit/crashreporter/client/crashreporter_gtk_common.h
@@ -34,17 +34,16 @@ extern std::string gCACertificateFile;
 extern std::string gSendURL;
 extern std::string gURLParameter;
 
 void LoadProxyinfo();
 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,
                   gpointer userData);
 void RestartClicked(GtkButton* button,
                     gpointer userData);
 
 #endif // CRASHREPORTER_GTK_COMMON_H__
--- a/toolkit/crashreporter/client/crashreporter_linux.cpp
+++ b/toolkit/crashreporter/client/crashreporter_linux.cpp
@@ -391,17 +391,16 @@ bool UIShowCrashUI(const string& dumpfil
 
   gWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(gWindow),
                        gStrings[ST_CRASHREPORTERTITLE].c_str());
   gtk_window_set_resizable(GTK_WINDOW(gWindow), FALSE);
   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);
 
   GtkWidget* titleLabel = gtk_label_new("");
   gtk_box_pack_start(GTK_BOX(vbox), titleLabel, FALSE, FALSE, 0);
   gtk_misc_set_alignment(GTK_MISC(titleLabel), 0, 0.5);
   char* markup = g_strdup_printf("<b>%s</b>",