keypress fixes
authorThorsten Maerz <torte@netztorte.de>
Sun, 5 Oct 2003 10:13:26 +0000 (10:13 +0000)
committerThorsten Maerz <torte@netztorte.de>
Sun, 5 Oct 2003 10:13:26 +0000 (10:13 +0000)
14 files changed:
src/addrgather.c
src/exphtmldlg.c
src/expldifdlg.c
src/gtk/colorsel.c
src/gtk/description_window.c
src/importmutt.c
src/importpine.c
src/mainwindow.c
src/mainwindow.h
src/messageview.c
src/prefs_filtering.c
src/prefs_filtering_action.c
src/prefs_matcher.c
src/prefs_scoring.c

index fa2396b..31134e0 100644 (file)
@@ -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
index 5c222d3..b0d85a8 100644 (file)
@@ -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;
 }
 
 /**
index 00a2b36..ae7611b 100644 (file)
@@ -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 );
        }
index a0c6882..60bdf82 100644 (file)
@@ -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)
 {
index 38d0d7e..e463318 100644 (file)
@@ -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;
 }
 
index 766893a..6d3d012 100644 (file)
@@ -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 ) {
index e75e621..57be895 100644 (file)
@@ -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 ) {
index a9c4bf7..931eec2 100644 (file)
@@ -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
index 3993218..1cfaec2 100644 (file)
@@ -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);
index 266b6aa..c1fe971 100644 (file)
@@ -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)
index 240768f..aa90835 100644 (file)
@@ -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)
index 68082c0..fc7b2f0 100644 (file)
@@ -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)
index 570f36a..2bc1b8f 100644 (file)
@@ -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)
index 5987dba..0f5afd2 100644 (file)
@@ -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)