From f9bf36e69f2d4b6b76c1c92642ebe26eaca59dae Mon Sep 17 00:00:00 2001 From: Thorsten Maerz Date: Sun, 5 Oct 2003 10:13:26 +0000 Subject: [PATCH] keypress fixes --- src/addrgather.c | 3 ++- src/exphtmldlg.c | 3 ++- src/expldifdlg.c | 2 +- src/gtk/colorsel.c | 2 +- src/gtk/description_window.c | 5 +++-- src/importmutt.c | 3 ++- src/importpine.c | 3 ++- src/mainwindow.c | 3 ++- src/mainwindow.h | 2 +- src/messageview.c | 5 +++-- src/prefs_filtering.c | 5 +++-- src/prefs_filtering_action.c | 4 ++-- src/prefs_matcher.c | 4 ++-- src/prefs_scoring.c | 4 ++-- 14 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/addrgather.c b/src/addrgather.c index fa2396bf4..31134e0fc 100644 --- a/src/addrgather.c +++ b/src/addrgather.c @@ -127,13 +127,14 @@ static gint addrgather_dlg_delete_event( return TRUE; } -static void addrgather_dlg_key_pressed( +static gboolean addrgather_dlg_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) { if( event && event->keyval == GDK_Escape ) { addrgather_dlg.cancelled = TRUE; gtk_main_quit(); } + return FALSE; } #define FMT_BUFSIZE 32 diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c index 5c222d3b5..b0d85a8fd 100644 --- a/src/exphtmldlg.c +++ b/src/exphtmldlg.c @@ -151,10 +151,11 @@ static gint export_html_delete_event( GtkWidget *widget, GdkEventAny *event, gpo * \param event Event object. * \param data User data. */ -static void export_html_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) { +static gboolean export_html_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) { if (event && event->keyval == GDK_Escape) { export_html_cancel( widget, data ); } + return FALSE; } /** diff --git a/src/expldifdlg.c b/src/expldifdlg.c index 00a2b3609..ae7611b77 100644 --- a/src/expldifdlg.c +++ b/src/expldifdlg.c @@ -150,7 +150,7 @@ static gint export_ldif_delete_event( GtkWidget *widget, GdkEventAny *event, gpo * \param event Event object. * \param data User data. */ -static void export_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) { +static gboolean export_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) { if (event && event->keyval == GDK_Escape) { export_ldif_cancel( widget, data ); } diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c index a0c6882da..60bdf82db 100644 --- a/src/gtk/colorsel.c +++ b/src/gtk/colorsel.c @@ -34,7 +34,7 @@ static void quote_colors_set_dialog_cancel(GtkWidget *widget, gpointer data) gtk_main_quit(); } -static void quote_colors_set_dialog_key_pressed(GtkWidget *widget, +static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c index 38d0d7e9f..e463318e1 100644 --- a/src/gtk/description_window.c +++ b/src/gtk/description_window.c @@ -31,7 +31,7 @@ #include "gtkutils.h" static void description_create (DescriptionWindow *dwindow); -static void description_window_key_pressed (GtkWidget *widget, +static gboolean description_window_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); @@ -147,11 +147,12 @@ static void description_create(DescriptionWindow * dwindow) gtk_widget_show_all(table); } -static void description_window_key_pressed(GtkWidget *widget, +static gboolean description_window_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) gtk_main_quit(); + return FALSE; } diff --git a/src/importmutt.c b/src/importmutt.c index 766893a39..6d3d0126e 100644 --- a/src/importmutt.c +++ b/src/importmutt.c @@ -210,11 +210,12 @@ static gint imp_mutt_delete_event( GtkWidget *widget, GdkEventAny *event, gboole return TRUE; } -static void imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) { +static gboolean imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) { if (event && event->keyval == GDK_Escape) { *cancelled = TRUE; gtk_main_quit(); } + return FALSE; } static void imp_mutt_create( gboolean *cancelled ) { diff --git a/src/importpine.c b/src/importpine.c index e75e6219c..57be8956f 100644 --- a/src/importpine.c +++ b/src/importpine.c @@ -210,11 +210,12 @@ static gint imp_pine_delete_event( GtkWidget *widget, GdkEventAny *event, gboole return TRUE; } -static void imp_pine_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) { +static gboolean imp_pine_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) { if (event && event->keyval == GDK_Escape) { *cancelled = TRUE; gtk_main_quit(); } + return FALSE; } static void imp_pine_create( gboolean *cancelled ) { diff --git a/src/mainwindow.c b/src/mainwindow.c index a9c4bf783..931eec2c1 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2808,7 +2808,7 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu #define BREAK_ON_MODIFIER_KEY() \ if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break -void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, +gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data) { MainWindow *mainwin = (MainWindow*) data; @@ -2832,6 +2832,7 @@ void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, default: break; } + return FALSE; } #undef BREAK_ON_MODIFIER_KEY diff --git a/src/mainwindow.h b/src/mainwindow.h index 39932181f..1cfaec2e9 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -182,7 +182,7 @@ void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline); /* public so it can be disabled from summaryview */ -void mainwindow_key_pressed (GtkWidget *widget, +gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); MainWindow *mainwindow_get_mainwindow (void); diff --git a/src/messageview.c b/src/messageview.c index 266b6aa59..c1fe971fc 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -70,7 +70,7 @@ static void messageview_destroy_cb (GtkWidget *widget, MessageView *messageview); static void messageview_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation); -static void key_pressed (GtkWidget *widget, +static gboolean key_pressed (GtkWidget *widget, GdkEventKey *event, MessageView *messageview); @@ -929,11 +929,12 @@ static void messageview_size_allocate_cb(GtkWidget *widget, prefs_common.msgwin_height = allocation->height; } -static void key_pressed(GtkWidget *widget, GdkEventKey *event, +static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, MessageView *messageview) { if (event && event->keyval == GDK_Escape && messageview->window) gtk_widget_destroy(messageview->window); + return FALSE; } void messageview_toggle_view_real(MessageView *messageview) diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index 240768fe4..aa908359d 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -87,7 +87,7 @@ static void prefs_filtering_select (GtkCList *clist, static gint prefs_filtering_deleted (GtkWidget *widget, GdkEventAny *event, gpointer data); -static void prefs_filtering_key_pressed (GtkWidget *widget, +static gboolean prefs_filtering_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); static void prefs_filtering_cancel (void); @@ -971,11 +971,12 @@ static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event, return TRUE; } -static void prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event, +static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) prefs_filtering_cancel(); + return FALSE; } static void prefs_filtering_ok(void) diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c index 68082c067..fc7b2f0cf 100644 --- a/src/prefs_filtering_action.c +++ b/src/prefs_filtering_action.c @@ -56,7 +56,7 @@ static void prefs_filtering_action_delete_cb(void); static void prefs_filtering_action_substitute_cb(void); static void prefs_filtering_action_register_cb(void); static void prefs_filtering_action_reset_dialog(void); -static void prefs_filtering_action_key_pressed(GtkWidget *widget, +static gboolean prefs_filtering_action_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data); static void prefs_filtering_action_cancel(void); static void prefs_filtering_action_ok(void); @@ -974,7 +974,7 @@ static void prefs_filtering_action_select(GtkCList *clist, *\param event Key event *\param data User data */ -static void prefs_filtering_action_key_pressed(GtkWidget *widget, +static gboolean prefs_filtering_action_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c index 570f36a45..2bc1b8f5a 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.c @@ -232,7 +232,7 @@ static void prefs_matcher_select (GtkCList *clist, gint row, gint column, GdkEvent *event); -static void prefs_matcher_key_pressed (GtkWidget *widget, +static gboolean prefs_matcher_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); static void prefs_matcher_ok (void); @@ -1619,7 +1619,7 @@ static void prefs_matcher_criteria_select(GtkList *list, *\param event Key event *\param data User data */ -static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event, +static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c index 5987dbaf1..0f5afd2c1 100644 --- a/src/prefs_scoring.c +++ b/src/prefs_scoring.c @@ -90,7 +90,7 @@ static void prefs_scoring_select (GtkCList *clist, static gint prefs_scoring_deleted (GtkWidget *widget, GdkEventAny *event, gpointer data); -static void prefs_scoring_key_pressed (GtkWidget *widget, +static gboolean prefs_scoring_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); static void prefs_scoring_cancel (void); @@ -712,7 +712,7 @@ static gint prefs_scoring_deleted(GtkWidget *widget, GdkEventAny *event, return TRUE; } -static void prefs_scoring_key_pressed(GtkWidget *widget, GdkEventKey *event, +static gboolean prefs_scoring_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) -- 2.25.1