commit 7207f4a7942518cc0049afbf48f42a8670f2aa33
parent 635d07f3dd7e749fe5fd5adbd44292758f4e96cd
Author: Oliver Lowe <o@olowe.co>
Date: Sun, 24 Aug 2025 15:34:33 +1000
stop responding to escape key
Diffstat:
36 files changed, 43 insertions(+), 397 deletions(-)
diff --git a/src/account.c b/src/account.c
@@ -111,9 +111,7 @@ static gint account_delete_event (GtkWidget *widget,
gpointer data);
static void account_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation);
-static gboolean account_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
+
static gboolean account_search_func_cb (GtkTreeModel *model, gint column,
const gchar *key, GtkTreeIter *iter,
gpointer search_data);
@@ -721,8 +719,6 @@ static void account_edit_create(void)
gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
g_signal_connect (G_OBJECT (window), "delete_event",
G_CALLBACK (account_delete_event), NULL);
- g_signal_connect (G_OBJECT (window), "key_press_event",
- G_CALLBACK (account_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_widget_realize(window);
@@ -1266,14 +1262,6 @@ static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
return TRUE;
}
-static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- account_edit_close(NULL, NULL);
- return FALSE;
-}
-
static gboolean account_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
GtkTreeIter *iter, gpointer search_data)
{
diff --git a/src/action.c b/src/action.c
@@ -176,9 +176,6 @@ static void update_io_dialog (Children *children);
static void hide_io_dialog_cb (GtkWidget *widget,
gpointer data);
-static gint io_dialog_key_pressed_cb (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static void catch_output (gpointer data,
gint source,
@@ -1126,16 +1123,6 @@ static void hide_io_dialog_cb(GtkWidget *w, gpointer data)
}
}
-static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
-{
- if (event && (event->keyval == GDK_KEY_Escape ||
- event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_KP_Enter))
- hide_io_dialog_cb(widget, data);
- return TRUE;
-}
-
static void childinfo_close_pipes(ChildInfo *child_info)
{
/* stdout and stderr pipes are guaranteed to be removed by
@@ -1211,10 +1198,6 @@ static void update_io_dialog(Children *children)
if (children->input_hbox)
gtk_widget_set_sensitive(children->input_hbox, FALSE);
gtk_widget_grab_focus(children->close_btn);
- g_signal_connect(G_OBJECT(children->dialog),
- "key_press_event",
- G_CALLBACK(io_dialog_key_pressed_cb),
- children);
}
if (children->output) {
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
@@ -856,13 +856,8 @@ static gboolean cb_finder_results_dialog_key_pressed(GtkWidget *widget,
GdkEventKey *event,
gpointer data)
{
- if(event) {
- if(event->keyval == GDK_KEY_Delete && detail_view_has_focus)
- cb_del_btn_clicked(NULL,NULL);
- else if(event->keyval == GDK_KEY_Escape)
- gtk_widget_destroy(dialog);
- }
-
+ if(event->keyval == GDK_KEY_Delete && detail_view_has_focus)
+ cb_del_btn_clicked(NULL,NULL);
return FALSE;
}
diff --git a/src/addressadd.c b/src/addressadd.c
@@ -92,14 +92,6 @@ static gint addressadd_delete_event( GtkWidget *widget, GdkEventAny *event, gboo
return TRUE;
}
-static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_KEY_Escape) {
- addressadd_cancelled = TRUE;
- gtk_main_quit();
- }
- return FALSE;
-}
-
/* Points addressadd_dlg.fiSelected to the selected item */
static void set_selected_ptr()
{
@@ -165,8 +157,6 @@ static void addressadd_create( void ) {
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect( G_OBJECT(window), "delete_event",
G_CALLBACK(addressadd_delete_event), NULL );
- g_signal_connect( G_OBJECT(window), "key_press_event",
- G_CALLBACK(addressadd_key_pressed), NULL );
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressadd_size_allocate_cb), NULL);
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -591,9 +591,7 @@ void addressbook_refresh( void )
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_KEY_Escape)
- addressbook_close();
- else if (event && event->keyval == GDK_KEY_Delete) {
+ if (event && event->keyval == GDK_KEY_Delete) {
/* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
if ( /* address_index_has_focus || */ address_list_has_focus )
addressbook_del_clicked(NULL, NULL);
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
@@ -88,15 +88,6 @@ static gint addressbook_foldersel_delete_event( GtkWidget *widget, GdkEventAny *
return TRUE;
}
-static gboolean addressbook_foldersel_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled )
-{
- if ( event && event->keyval == GDK_KEY_Escape ) {
- addressbook_foldersel_cancelled = TRUE;
- gtk_main_quit();
- }
- return FALSE;
-}
-
static void set_selected_ptr()
{
GtkWidget *view = addressbook_foldersel_dlg.view_folder;
@@ -159,8 +150,6 @@ static void addressbook_foldersel_create( void )
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect( G_OBJECT(window), "delete_event",
G_CALLBACK(addressbook_foldersel_delete_event), NULL );
- g_signal_connect( G_OBJECT(window), "key_press_event",
- G_CALLBACK(addressbook_foldersel_key_pressed), NULL );
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressbook_foldersel_size_allocate_cb), NULL);
diff --git a/src/addrgather.c b/src/addrgather.c
@@ -124,16 +124,6 @@ static gint addrgather_dlg_delete_event(
return TRUE;
}
-static gboolean addrgather_dlg_key_pressed(
- GtkWidget *widget, GdkEventKey *event, gpointer data )
-{
- if( event && event->keyval == GDK_KEY_Escape ) {
- addrgather_dlg.cancelled = TRUE;
- gtk_main_quit();
- }
- return FALSE;
-}
-
static void addrgather_size_allocate(
GtkWidget *widget, GtkAllocation *allocation )
{
@@ -451,8 +441,6 @@ static void addrgather_dlg_create(void)
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(addrgather_dlg_delete_event), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(addrgather_dlg_key_pressed), NULL);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addrgather_size_allocate), NULL);
diff --git a/src/common/log.c b/src/common/log.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -80,11 +80,6 @@ static LogInstanceData log_instances[LOG_INSTANCE_MAX] = {
{ DEBUG_FILTERING_APPEND_TEXT_HOOKLIST, NULL, NULL, NULL }
};
-gboolean prefs_common_enable_log_standard(void);
-gboolean prefs_common_enable_log_warning(void);
-gboolean prefs_common_enable_log_error(void);
-gboolean prefs_common_enable_log_status(void);
-
static gboolean invoke_hook_cb (gpointer data)
{
LogText *logtext = (LogText *)data;
@@ -109,7 +104,7 @@ void set_log_file(LogInstance instance, const gchar *filename)
/* backup old logfile if existing */
if (is_file_exist(fullname)) {
gchar *backupname;
-
+
backupname = g_strconcat(fullname, ".bak", NULL);
unlink(backupname);
if (g_rename(fullname, backupname) < 0)
@@ -212,10 +207,10 @@ void log_print(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf);
logtext->type = LOG_NORMAL;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_standard()) {
+ if (log_fp[instance]) {
FPUTS(buf, log_fp[instance])
log_size[instance] += strlen(buf);
FFLUSH(log_fp[instance])
@@ -243,10 +238,10 @@ void log_message(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_MSG;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_standard()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("* message: ", log_fp[instance])
log_size[instance] += strlen("* message: ");
@@ -277,10 +272,10 @@ void log_warning(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_WARN;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_warning()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("** warning: ", log_fp[instance])
log_size[instance] += strlen("** warning: ");
@@ -311,10 +306,10 @@ void log_error(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_ERROR;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_error()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("*** error: ", log_fp[instance])
log_size[instance] += strlen("*** error: ");
@@ -345,10 +340,10 @@ void log_status_ok(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_STATUS_OK;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_status()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("* OK: ", log_fp[instance])
log_size[instance] += strlen("* OK: ");
@@ -379,10 +374,10 @@ void log_status_nok(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_STATUS_NOK;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_status()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("* NOT OK: ", log_fp[instance])
log_size[instance] += strlen("* NOT OK: ");
@@ -413,10 +408,10 @@ void log_status_skip(LogInstance instance, const gchar *format, ...)
logtext->instance = instance;
logtext->text = g_strdup(buf + LOG_TIME_LEN);
logtext->type = LOG_STATUS_SKIP;
-
+
g_timeout_add(0, invoke_hook_cb, logtext);
- if (log_fp[instance] && prefs_common_enable_log_status()) {
+ if (log_fp[instance]) {
FWRITE(buf, 1, LOG_TIME_LEN, log_fp[instance])
FPUTS("* SKIPPED: ", log_fp[instance])
log_size[instance] += strlen("* SKIPPED: ");
diff --git a/src/compose.c b/src/compose.c
@@ -8487,8 +8487,7 @@ static gboolean compose_can_autosave(Compose *compose)
{
if (compose->privacy_system && compose->use_encryption)
return prefs_common.autosave && prefs_common.autosave_encrypted;
- else
- return prefs_common.autosave;
+ return prefs_common.autosave;
}
/**
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -260,16 +260,6 @@ static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboo
return TRUE;
}
-static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
- if (prefs_common.addressbook_use_editaddress_dialog) {
- if (event && event->keyval == GDK_KEY_Escape) {
- *cancelled = TRUE;
- gtk_main_quit();
- }
- }
- return FALSE;
-}
-
static gchar *_title_new_ = NULL;
static gchar *_title_edit_ = NULL;
@@ -656,9 +646,6 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(edit_person_size_allocate_cb),
cancelled);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(edit_person_key_pressed),
- cancelled);
vbox = addressbook_edit_person_widgets_create(window, cancelled);
diff --git a/src/editbook.c b/src/editbook.c
@@ -90,14 +90,6 @@ static gint edit_book_delete_event( GtkWidget *widget, GdkEventAny *event, gbool
return TRUE;
}
-static gboolean edit_book_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_KEY_Escape) {
- *cancelled = TRUE;
- gtk_main_quit();
- }
- return FALSE;
-}
-
static void edit_book_file_check( void ) {
gint t;
gchar *sMsg;
@@ -150,9 +142,6 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(edit_book_delete_event),
cancelled);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(edit_book_key_pressed),
- cancelled);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
diff --git a/src/editgroup.c b/src/editgroup.c
@@ -110,14 +110,6 @@ static gint edit_group_delete_event(GtkWidget *widget, GdkEventAny *event, gbool
return TRUE;
}
-static gboolean edit_group_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
- if (event && event->keyval == GDK_KEY_Escape) {
- *cancelled = TRUE;
- gtk_main_quit();
- }
- return FALSE;
-}
-
static gchar *edit_group_format_item_clist( ItemPerson *person, ItemEMail *email ) {
gchar *str = NULL;
gchar *aName = ADDRITEM_NAME(email);
@@ -295,9 +287,6 @@ static void addressbook_edit_group_create(gboolean *cancelled)
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(edit_group_delete_event),
cancelled);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(edit_group_key_pressed),
- cancelled);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressbook_edit_group_size_allocate_cb), NULL);
diff --git a/src/export.c b/src/export.c
@@ -56,7 +56,6 @@ static void export_cancel_cb(GtkWidget *widget, gpointer data);
static void export_srcsel_cb(GtkWidget *widget, gpointer data);
static void export_filesel_cb(GtkWidget *widget, gpointer data);
static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint export_mbox(FolderItem *default_src)
/* return values: -2 skipped/cancelled, -1 error, 0 OK */
@@ -116,8 +115,6 @@ static void export_create(void)
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_event), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
@@ -270,10 +267,3 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
export_cancel_cb(NULL, NULL);
return TRUE;
}
-
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- export_cancel_cb(NULL, NULL);
- return FALSE;
-}
diff --git a/src/foldersel.c b/src/foldersel.c
@@ -644,11 +644,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
if (!event)
return FALSE;
- if (event->keyval == GDK_KEY_Escape) {
- foldersel_cancel(NULL, NULL);
- return TRUE;
- }
-
GtkTreePath *path = NULL;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(treeview), &path, NULL);
if (path == NULL)
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
@@ -33,9 +33,6 @@
#include "prefs_gtk.h"
static void description_create (DescriptionWindow *dwindow);
-static gboolean description_window_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static gboolean description_window_focus_in_event (GtkWidget *widget,
GdkEventFocus *event,
gpointer data);
@@ -156,8 +153,6 @@ static void description_create(DescriptionWindow * dwindow)
g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(description_window_destroy), dwindow);
- g_signal_connect(G_OBJECT(dwindow->window), "key_press_event",
- G_CALLBACK(description_window_key_pressed), dwindow);
g_signal_connect(G_OBJECT(dwindow->window), "focus_in_event",
G_CALLBACK(description_window_focus_in_event), NULL);
g_signal_connect(G_OBJECT(dwindow->window), "focus_out_event",
@@ -174,15 +169,6 @@ static void description_create(DescriptionWindow * dwindow)
(width < 400) ? 400 : width, 450);
}
-static gboolean description_window_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- description_window_destroy(widget, data);
- return FALSE;
-}
-
static gboolean description_window_focus_in_event (GtkWidget *widget,
GdkEventFocus *event,
gpointer data)
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
@@ -182,13 +182,6 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, FolderSortDialog
return TRUE;
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, FolderSortDialog *dialog)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- destroy_dialog(dialog);
- return FALSE;
-}
-
static void foldersort_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation)
{
cm_return_if_fail(allocation != NULL);
@@ -234,8 +227,6 @@ void foldersort_open()
G_CALLBACK(delete_event), dialog);
g_signal_connect (G_OBJECT(window), "size_allocate",
G_CALLBACK (foldersort_size_allocate_cb), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(key_pressed), dialog);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
@@ -38,9 +38,9 @@
StockPixmap legend_icons[ICONS] = {
STOCK_PIXMAP_NEW,
STOCK_PIXMAP_UNREAD,
- STOCK_PIXMAP_REPLIED,
- STOCK_PIXMAP_FORWARDED,
- STOCK_PIXMAP_REPLIED_AND_FORWARDED,
+ STOCK_PIXMAP_REPLIED,
+ STOCK_PIXMAP_FORWARDED,
+ STOCK_PIXMAP_REPLIED_AND_FORWARDED,
STOCK_PIXMAP_IGNORETHREAD,
STOCK_PIXMAP_WATCHTHREAD,
STOCK_PIXMAP_SPAM,
@@ -54,7 +54,7 @@ StockPixmap legend_icons[ICONS] = {
STOCK_PIXMAP_MOVED,
STOCK_PIXMAP_COPIED,
STOCK_PIXMAP_LOCKED,
- STOCK_PIXMAP_DIR_OPEN,
+ STOCK_PIXMAP_DIR_OPEN,
STOCK_PIXMAP_DIR_OPEN_HRM,
STOCK_PIXMAP_DIR_OPEN_MARK,
STOCK_PIXMAP_DIR_NOSELECT_OPEN,
@@ -97,7 +97,6 @@ static struct LegendDialog {
} legend;
static void legend_create(void);
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event);
static void legend_close(void);
void legend_show(void)
@@ -130,8 +129,6 @@ static void legend_create(void)
gtk_window_set_default_size(GTK_WINDOW(window), 666, 340);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(legend_close), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(key_pressed), NULL);
gtk_widget_realize(window);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
@@ -195,14 +192,6 @@ static void legend_create(void)
legend.window = window;
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
-{
- if (event && event->keyval == GDK_KEY_Escape) {
- legend_close();
- }
- return FALSE;
-}
-
static void legend_close(void)
{
gtk_widget_destroy(legend.window);
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
@@ -160,7 +160,7 @@ gchar *input_dialog_with_invisible_checkbtn(const gchar *title, const gchar *mes
gchar *input_dialog_combo(const gchar *title, const gchar *message,
const gchar *default_string, GList *list)
{
- return input_dialog_combo_remember(title, message,
+ return input_dialog_combo_remember(title, message,
default_string, list, FALSE);
}
@@ -216,7 +216,7 @@ gchar *input_dialog_with_checkbtn(const gchar *title,
is_pass = FALSE;
gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE);
- return input_dialog_open(title, message, checkbtn_label, default_string,
+ return input_dialog_open(title, message, checkbtn_label, default_string,
prefs_common.inherit_folder_props, checkbtn_state);
}
@@ -264,9 +264,9 @@ gchar *input_dialog_query_password_keep(const gchar *server, const gchar *user,
}
else {
gboolean state = prefs_common.session_passwords;
- pass = input_dialog_with_invisible_checkbtn(_("Input password"),
+ pass = input_dialog_with_invisible_checkbtn(_("Input password"),
message, NULL,
- _("Remember password for this session"),
+ _("Remember password for this session"),
&state);
if (state) {
*keep = g_strdup (pass);
@@ -277,7 +277,7 @@ gchar *input_dialog_query_password_keep(const gchar *server, const gchar *user,
}
else {
pass = input_dialog_with_invisible(_("Input password"), message, NULL);
- }
+ }
g_free(message);
return pass;
@@ -312,20 +312,20 @@ static void input_dialog_create(gboolean is_password)
/* for title label */
icon_q = gtk_image_new_from_icon_name("dialog-question-symbolic",
- GTK_ICON_SIZE_DIALOG);
+ GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon_q, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon_q, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon_q, FALSE, FALSE, 0);
icon_p = gtk_image_new_from_icon_name("dialog-password-symbolic",
- GTK_ICON_SIZE_DIALOG);
+ GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon_p, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon_p, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon_p, FALSE, FALSE, 0);
-
+
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 16);
gtk_widget_show (vbox);
-
+
msg_title = gtk_label_new("");
gtk_label_set_xalign(GTK_LABEL(msg_title), 0.0);
gtk_label_set_justify(GTK_LABEL(msg_title), GTK_JUSTIFY_LEFT);
@@ -345,13 +345,13 @@ static void input_dialog_create(gboolean is_password)
}
if (font_desc)
gtk_widget_override_font(msg_title, font_desc);
-
+
msg_label = gtk_label_new("");
gtk_label_set_xalign(GTK_LABEL(msg_label), 0.0);
gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT);
gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0);
gtk_widget_show(msg_label);
-
+
entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(entry), "activate",
@@ -371,7 +371,7 @@ static void input_dialog_create(gboolean is_password)
GTK_RESPONSE_NONE);
gtk_widget_show_all(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
-
+
gtk_widget_hide(remember_checkbtn);
if (is_password)
@@ -505,10 +505,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_KEY_Escape) {
- ack = FALSE;
- fin = TRUE;
- } else if (event && (event->keyval == GDK_KEY_KP_Enter ||
+ if (event && (event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KEY_Return)) {
ack = TRUE;
fin = TRUE;
diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
@@ -35,9 +35,6 @@
static void hide_cb (GtkWidget *widget,
LogWindow *logwin);
-static gboolean key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- LogWindow *logwin);
static void size_allocate_cb (GtkWidget *widget,
GtkAllocation *allocation,
gpointer data);
@@ -96,8 +93,6 @@ LogWindow *log_window_create(LogInstance instance)
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(key_pressed), logwin);
g_signal_connect_after(G_OBJECT(window), "hide",
G_CALLBACK(hide_cb), logwin);
gtk_widget_realize(window);
@@ -332,17 +327,6 @@ static void hide_cb(GtkWidget *widget, LogWindow *logwin)
logwin->hidden = TRUE;
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
- LogWindow *logwin)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- gtk_widget_hide(logwin->window);
- else if (event && event->keyval == GDK_KEY_Delete)
- log_window_clear(NULL, logwin);
-
- return FALSE;
-}
-
static void log_window_clear(GtkWidget *widget, LogWindow *logwin)
{
GtkTextBuffer *textbuf = logwin->buffer;
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -146,9 +146,6 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
if (event) {
switch (event->keyval) {
- case GDK_KEY_Escape :
- cancel_button_clicked(NULL, data);
- break;
case GDK_KEY_Return :
case GDK_KEY_KP_Enter :
focused_child = gtkut_get_focused_child
diff --git a/src/import.c b/src/import.c
@@ -56,7 +56,6 @@ static void import_cancel_cb(GtkWidget *widget, gpointer data);
static void import_filesel_cb(GtkWidget *widget, gpointer data);
static void import_destsel_cb(GtkWidget *widget, gpointer data);
static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint import_mbox(FolderItem *default_dest, const gchar* mbox_file)
/* return values: -2 skipped/cancelled, -1 error, 0 OK */
@@ -120,8 +119,6 @@ static void import_create(void)
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_event), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
@@ -279,10 +276,3 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
import_cancel_cb(NULL, NULL);
return TRUE;
}
-
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- import_cancel_cb(NULL, NULL);
- return FALSE;
-}
diff --git a/src/message_search.c b/src/message_search.c
@@ -381,10 +381,6 @@ static void message_search_next_clicked(GtkButton *button, gpointer data)
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_KEY_Escape)) {
- gtk_widget_hide(search_window.window);
- }
-
if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
message_search_execute(FALSE);
}
diff --git a/src/messageview.c b/src/messageview.c
@@ -1367,11 +1367,6 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
MessageView *messageview)
{
- if (event && event->keyval == GDK_KEY_Escape && messageview->window) {
- messageview_destroy(messageview);
- return TRUE;
- }
-
if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
return FALSE;
if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space)
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -846,14 +846,9 @@ static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_KEY_Escape)
- prefs_actions_cancel(widget, data);
- else {
- GtkWidget *focused = gtkut_get_focused_child(
- GTK_CONTAINER(widget));
- if (focused && GTK_IS_EDITABLE(focused))
- modified = TRUE;
- }
+ GtkWidget *focused = gtkut_get_focused_child(GTK_CONTAINER(widget));
+ if (focused && GTK_IS_EDITABLE(focused))
+ modified = TRUE;
return FALSE;
}
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
@@ -81,9 +81,6 @@ static void prefs_custom_header_delete_cb (void);
static void prefs_custom_header_up (void);
static void prefs_custom_header_down (void);
-static gboolean prefs_custom_header_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static void prefs_custom_header_ok (void);
static void prefs_custom_header_cancel (void);
static gint prefs_custom_header_deleted (GtkWidget *widget,
@@ -184,9 +181,6 @@ static void prefs_custom_header_create(void)
g_signal_connect (G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_custom_header_deleted),
NULL);
- g_signal_connect (G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_custom_header_key_pressed),
- NULL);
g_signal_connect (G_OBJECT(ok_btn), "clicked",
G_CALLBACK(prefs_custom_header_ok), NULL);
g_signal_connect (G_OBJECT(cancel_btn), "clicked",
@@ -763,15 +757,6 @@ static void prefs_custom_header_down(void)
prefs_custom_header_set_list(cur_ac);
}
-static gboolean prefs_custom_header_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- prefs_custom_header_cancel();
- return FALSE;
-}
-
static void prefs_custom_header_ok(void)
{
prefs_custom_header_write_config(cur_ac);
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
@@ -76,10 +76,6 @@ static void prefs_display_header_delete_cb (GtkButton *btn,
gpointer list_view_data);
static void prefs_display_header_up (void);
static void prefs_display_header_down (void);
-
-static gboolean prefs_display_header_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static void prefs_display_header_ok (void);
static void prefs_display_header_cancel (void);
static gint prefs_display_header_deleted (GtkWidget *widget,
@@ -223,9 +219,6 @@ static void prefs_display_header_create(void)
g_signal_connect (G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_display_header_deleted),
NULL);
- g_signal_connect (G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_display_header_key_pressed),
- NULL);
g_signal_connect (G_OBJECT(ok_btn), "clicked",
G_CALLBACK(prefs_display_header_ok),
NULL);
@@ -669,15 +662,6 @@ static void prefs_display_header_down(void)
gtk_tree_path_free(try);
}
-static gboolean prefs_display_header_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- prefs_display_header_cancel();
- return FALSE;
-}
-
static void prefs_display_header_ok(void)
{
prefs_common.show_other_header =
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
@@ -107,9 +107,6 @@ static void prefs_folder_column_cancel (void);
static gint prefs_folder_column_delete_event (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static gboolean prefs_folder_column_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static GtkListStore *prefs_folder_column_create_store (void);
@@ -213,9 +210,6 @@ static void prefs_folder_column_create(void)
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_folder_column_delete_event),
NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_folder_column_key_pressed),
- NULL);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
@@ -657,15 +651,6 @@ static gint prefs_folder_column_delete_event(GtkWidget *widget,
return TRUE;
}
-static gboolean prefs_folder_column_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- folder_col.finished = TRUE;
- return FALSE;
-}
-
static GtkListStore *prefs_folder_column_create_store(void)
{
return gtk_list_store_new(N_SUMCOL_COLUMNS,
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -258,9 +258,6 @@ static void prefs_matcher_substitute_cb (void);
static void prefs_matcher_delete_cb (void);
static void prefs_matcher_up (void);
static void prefs_matcher_down (void);
-static gboolean prefs_matcher_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static void prefs_matcher_ok (void);
static void prefs_matcher_cancel (void);
static gint prefs_matcher_deleted (GtkWidget *widget, GdkEventAny *event,
@@ -560,8 +557,6 @@ static void prefs_matcher_create(void)
G_CALLBACK(prefs_matcher_deleted), NULL);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(prefs_matcher_size_allocate_cb), NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_matcher_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
g_signal_connect(G_OBJECT(ok_btn), "clicked",
G_CALLBACK(prefs_matcher_ok), NULL);
@@ -1981,23 +1976,6 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
}
/*!
- *\brief Handle key press
- *
- *\param widget Widget receiving key press
- *\param event Key event
- *\param data User data
- */
-static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape) {
- prefs_matcher_cancel();
- return TRUE;
- }
- return FALSE;
-}
-
-/*!
*\brief Cancel matcher dialog
*/
static void prefs_matcher_cancel(void)
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
@@ -95,9 +95,6 @@ static void date_format_ok_btn_clicked (GtkButton *button,
GtkWidget **widget);
static void date_format_cancel_btn_clicked (GtkButton *button,
GtkWidget **widget);
-static gboolean date_format_key_pressed (GtkWidget *keywidget,
- GdkEventKey *event,
- GtkWidget **widget);
static gboolean date_format_on_delete (GtkWidget *dialogwidget,
GdkEventAny *event,
GtkWidget **widget);
@@ -333,9 +330,6 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(date_format_cancel_btn_clicked),
&datefmt_win);
- g_signal_connect(G_OBJECT(datefmt_win), "key_press_event",
- G_CALLBACK(date_format_key_pressed),
- &datefmt_win);
g_signal_connect(G_OBJECT(datefmt_win), "delete_event",
G_CALLBACK(date_format_on_delete),
&datefmt_win);
@@ -947,14 +941,6 @@ static void date_format_cancel_btn_clicked(GtkButton *button,
*widget = NULL;
}
-static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
- GtkWidget **widget)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- date_format_cancel_btn_clicked(NULL, widget);
- return FALSE;
-}
-
static gboolean date_format_on_delete(GtkWidget *dialogwidget,
GdkEventAny *event, GtkWidget **widget)
{
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
@@ -123,9 +123,6 @@ static void prefs_summary_column_cancel (void);
static gint prefs_summary_column_delete_event (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static gboolean prefs_summary_column_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static GtkListStore *prefs_summary_column_create_store (void);
@@ -227,9 +224,6 @@ static void prefs_summary_column_create(void)
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_summary_column_delete_event),
NULL);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_summary_column_key_pressed),
- NULL);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
@@ -672,15 +666,6 @@ static gint prefs_summary_column_delete_event(GtkWidget *widget,
return TRUE;
}
-static gboolean prefs_summary_column_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- summary_col.finished = TRUE;
- return FALSE;
-}
-
static GtkListStore *prefs_summary_column_create_store(void)
{
return gtk_list_store_new(N_SUMCOL_COLUMNS,
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
@@ -71,9 +71,6 @@ static void prefs_summary_open_delete_cb (GtkButton *btn,
static void prefs_summary_open_up (void);
static void prefs_summary_open_down (void);
-static gboolean prefs_summary_open_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
static void prefs_summary_open_ok (void);
static void prefs_summary_open_cancel (void);
static gint prefs_summary_open_deleted (GtkWidget *widget,
@@ -189,9 +186,6 @@ static void prefs_summary_open_create(void)
g_signal_connect (G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_summary_open_deleted),
NULL);
- g_signal_connect (G_OBJECT(window), "key_press_event",
- G_CALLBACK(prefs_summary_open_key_pressed),
- NULL);
g_signal_connect (G_OBJECT(ok_btn), "clicked",
G_CALLBACK(prefs_summary_open_ok),
NULL);
@@ -526,15 +520,6 @@ static void prefs_summary_open_down(void)
prefs_summary_open_set_list();
}
-static gboolean prefs_summary_open_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_KEY_Escape)
- prefs_summary_open_cancel();
- return FALSE;
-}
-
static void prefs_summary_open_ok(void)
{
int i;
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -133,7 +133,6 @@ static void prefs_themes_btn_remove_clicked_cb (GtkWidget *widget, gpointer data
static void prefs_themes_btn_install_clicked_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_btn_viewall_clicked_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_viewall_close_btn_clicked (GtkWidget *widget, gpointer data);
-static gboolean prefs_themes_viewall_key_pressed (GtkWidget *keywidget, GdkEventKey *event, GtkWidget **widget);
static void prefs_themes_menu_item_activated_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_update_buttons (const ThemesData *tdata);
@@ -576,15 +575,6 @@ end_inst:
g_free(alert_title);
}
-static gboolean prefs_themes_viewall_key_pressed(GtkWidget *keywidget, GdkEventKey *event, GtkWidget **widget)
-{
- if (event && event->keyval == GDK_KEY_Escape) {
- prefs_themes_viewall_close_btn_clicked(NULL, widget);
- }
-
- return FALSE;
-}
-
static void prefs_themes_viewall_close_btn_clicked(GtkWidget *widget, gpointer data)
{
GtkWidget **window = (GtkWidget **) data;
@@ -657,9 +647,6 @@ static void prefs_themes_btn_viewall_clicked_cb(GtkWidget *widget, gpointer data
g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(prefs_themes_viewall_close_btn_clicked),
&viewall_win);
- g_signal_connect(G_OBJECT(viewall_win), "key_press_event",
- G_CALLBACK(prefs_themes_viewall_key_pressed),
- &viewall_win);
manage_window_set_transient(GTK_WINDOW(viewall_win));
gtk_window_set_modal(GTK_WINDOW(viewall_win), TRUE);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -1333,17 +1333,6 @@ static void icon_chooser_cancel_clicked(GtkButton *button,
prefs_toolbar->icon_chooser_view = NULL;
}
-static gboolean icon_chooser_key_pressed(GtkWidget *widget, GdkEventKey *event,
- ToolbarPage *prefs_toolbar)
-{
- if (event && event->keyval == GDK_KEY_Escape) {
- icon_chooser_cancel_clicked(NULL, prefs_toolbar);
- return TRUE;
- }
-
- return FALSE;
-}
-
static gboolean icon_list_key_pressed(GtkWidget *widget, GdkEventKey *event,
ToolbarPage *prefs_toolbar)
{
@@ -1470,8 +1459,6 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(icon_view), SET_ICON);
gtk_container_add(GTK_CONTAINER(scrollwin), GTK_WIDGET(icon_view));
- g_signal_connect(G_OBJECT(icon_chooser_win), "key_press_event",
- G_CALLBACK(icon_chooser_key_pressed), prefs_toolbar);
g_signal_connect(G_OBJECT(icon_view), "item-activated",
G_CALLBACK(icon_chooser_activated), prefs_toolbar);
g_signal_connect(G_OBJECT(icon_chooser_win),
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -208,10 +208,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
if ((event->state & GDK_CONTROL_MASK) != 0)
gtk_widget_destroy(sourcewin->window);
break;
- case GDK_KEY_Escape:
- source_window_destroy(sourcewin);
- return TRUE;
- break;
}
return FALSE;
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
@@ -392,12 +392,7 @@ static void ssl_manager_close_cb(GtkWidget *widget,
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (!event)
- return FALSE;
-
- if (event->keyval == GDK_KEY_Escape)
- ssl_manager_close();
- else if (event->keyval == GDK_KEY_Delete)
+ if (event->keyval == GDK_KEY_Delete)
ssl_manager_delete_cb(manager.delete_btn, NULL);
return FALSE;
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -5962,8 +5962,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
(GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
if (gtk_adjustment_get_lower(adj) != gtk_adjustment_get_value(adj))
break;
- /* FALLTHROUGH */
- case GDK_KEY_Escape:
folderview_grab_focus(summaryview->folderview);
mainwindow_exit_folder(summaryview->mainwin);
return TRUE;
