Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-01-08 10:49:55 -05:00
parent 0b927c76d8
commit 68f927d176
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/crashreporter/client/crashreporter_gtk_common.cpp
View File

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

1
toolkit/crashreporter/client/crashreporter_gtk_common.h
View File

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

1
toolkit/crashreporter/client/crashreporter_linux.cpp
View File

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