keypress fixes

diff --git a/src/addrgather.c b/src/addrgather.c
index fa2396bf4cce566e5b242c072bf7de06411faf01..31134e0fca0daaa905bfcc28163581ac48968e69 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -127,13 +127,14 @@ static gint addrgather_dlg_delete_event(
        return TRUE;
 }
 
        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();
        }
        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
 }
 
 #define FMT_BUFSIZE 32

diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index 5c222d3b5e30ae9e7daaa519c2392926928849c6..b0d85a8fdaadccfafac6ded4f598b246dae4ac11 100644 (file)
--- 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.
  */
  * \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 );
        }
        if (event && event->keyval == GDK_Escape) {
                export_html_cancel( widget, data );
        }

+       return FALSE;

 }
 
 /**
 }
 
 /**

diff --git a/src/expldifdlg.c b/src/expldifdlg.c
index 00a2b360991968576e4b7072eec0b8da68f8bcac..ae7611b77e796b2b239f84e55adaa7bae866e42b 100644 (file)
--- 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.
  */
  * \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 );
        }
        if (event && event->keyval == GDK_Escape) {
                export_ldif_cancel( widget, data );
        }

diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c
index a0c6882dada200453403630171eb3a62c511d124..60bdf82db86edac216d0f2a30c347e766a041b52 100644 (file)
--- 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();
 }
 
        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)
 {
                                                GdkEventKey *event,
                                                gpointer data)
 {

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 38d0d7e9f1baa8a38bdfb0e7b13745e80fac2fdf..e463318e11129e5ba3b4e414c272f79b3338893c 100644 (file)
--- 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);
 #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);
 
                                                 GdkEventKey *event,
                                                 gpointer data);
 


@@ -147,11 +147,12 @@ static void description_create(DescriptionWindow * dwindow)
        gtk_widget_show_all(table);
 }
 
        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();
                                           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 766893a39a3059c462434a4fde4dcd5e2438b2db..6d3d0126ef1f6e2d3f8d0f61d7b05394abcc8511 100644 (file)
--- 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;
 }
 
        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();
        }
        if (event && event->keyval == GDK_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }

+       return FALSE;

 }
 
 static void imp_mutt_create( gboolean *cancelled ) {
 }
 
 static void imp_mutt_create( gboolean *cancelled ) {

diff --git a/src/importpine.c b/src/importpine.c
index e75e6219c03ad7ddc6090dbd89e441bbb9a5f960..57be8956fb8a21e21f3d5267711cfdef724864b5 100644 (file)
--- 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;
 }
 
        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();
        }
        if (event && event->keyval == GDK_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }

+       return FALSE;

 }
 
 static void imp_pine_create( gboolean *cancelled ) {
 }
 
 static void imp_pine_create( gboolean *cancelled ) {

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a9c4bf783859ee2545a040e5ac65e1238dbec6c0..931eec2c115ab7f33ddf57735a946f37886b1362 100644 (file)
--- 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
 
 #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;
                                    gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;


@@ -2832,6 +2832,7 @@ void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
        default:
                break;
        }

+       return FALSE;

 }
 
 #undef BREAK_ON_MODIFIER_KEY
 }
 
 #undef BREAK_ON_MODIFIER_KEY

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 39932181ff94ff3b389a874c24aaed54a83310f2..1cfaec2e9b74a069104aced4e28168dc13eee0b2 100644 (file)
--- 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 */
                                                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);
                                               GdkEventKey       *event,
                                               gpointer           data);
 MainWindow *mainwindow_get_mainwindow        (void);

diff --git a/src/messageview.c b/src/messageview.c
index 266b6aa5906aeb8a72f0864801e6e542aa3e50a6..c1fe971fc998ecce4511b2f16e86950db89e6e3f 100644 (file)
--- 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);
                                         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);
 
                                         GdkEventKey    *event,
                                         MessageView    *messageview);
 


@@ -929,11 +929,12 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
        prefs_common.msgwin_height = allocation->height;
 }
 
        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);
                        MessageView *messageview)
 {
        if (event && event->keyval == GDK_Escape && messageview->window)
                gtk_widget_destroy(messageview->window);

+       return FALSE;

 }
 
 void messageview_toggle_view_real(MessageView *messageview)
 }
 
 void messageview_toggle_view_real(MessageView *messageview)

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 240768fe40e8e39ab2a8c030a7735b53f45d6ea6..aa908359d1a14089d5ba4602fe17c282678c7e1c 100644 (file)
--- 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 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);
                                         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;
 }
 
        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();
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
                prefs_filtering_cancel();

+       return FALSE;

 }
 
 static void prefs_filtering_ok(void)
 }
 
 static void prefs_filtering_ok(void)

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 68082c067085101f9595df1ff9bdb914b194db3f..fc7b2f0cfff40a49bf795c05c5768bff00af2b9a 100644 (file)
--- 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_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);
     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
  */
  *\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)
     GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 570f36a45de2f4855338fea17accaee28ed38fc4..2bc1b8f5ab1955f09c1d5408bf35dfa0d041f4f6 100644 (file)
--- 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);
                                         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);
                                         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
  */
  *\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)
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)

diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c
index 5987dbaf196b48175d4bc8b3dd289f8b2842be68..0f5afd2c1089009638d7ec5888482d5fc89ff9cb 100644 (file)
--- 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 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);
                                         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;
 }
 
        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)
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)