From 04e7be6dae73e4999357208c671af602d1d422a6 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 22 Dec 2006 21:09:19 +0000 Subject: [PATCH] 2006-12-22 [colin] 2.6.1cvs66 * src/summary_search.c Fix previous patch --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/summary_search.c | 52 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7b6f60b4..449220f75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-22 [colin] 2.6.1cvs66 + + * src/summary_search.c + Fix previous patch + 2006-12-22 [colin] 2.6.1cvs65 * src/gtk/gtkutils.c diff --git a/PATCHSETS b/PATCHSETS index 8ac234243..9394c611b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2173,3 +2173,4 @@ ( cvs diff -u -r 1.382.2.343 -r 1.382.2.344 src/compose.c; cvs diff -u -r 1.204.2.114 -r 1.204.2.115 src/prefs_common.c; cvs diff -u -r 1.103.2.71 -r 1.103.2.72 src/prefs_common.h; cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/prefs_spelling.c; cvs diff -u -r 1.9.2.46 -r 1.9.2.47 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkaspell.h; ) > 2.6.1cvs63.patchset ( cvs diff -u -r 1.43.2.57 -r 1.43.2.58 src/toolbar.c; cvs diff -u -r 1.19.2.13 -r 1.19.2.14 src/toolbar.h; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/bogofilter/bogofilter.h; ) > 2.6.1cvs64.patchset ( cvs diff -u -r 1.5.2.46 -r 1.5.2.47 src/gtk/gtkutils.c; cvs diff -u -r 1.179.2.141 -r 1.179.2.142 src/imap.c; cvs diff -u -r 1.18.2.20 -r 1.18.2.21 src/jpilot.c; cvs diff -u -r 1.15.2.39 -r 1.15.2.40 src/summary_search.c; ) > 2.6.1cvs65.patchset +( cvs diff -u -r 1.15.2.40 -r 1.15.2.41 src/summary_search.c; ) > 2.6.1cvs66.patchset diff --git a/configure.ac b/configure.ac index 3225a0cee..492eac466 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=65 +EXTRA_VERSION=66 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/summary_search.c b/src/summary_search.c index b861db726..bd2554d18 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -114,6 +114,12 @@ static void summary_search_stop_clicked (GtkButton *button, static void adv_condition_btn_clicked (GtkButton *button, gpointer data); +static void from_changed (void); +static void to_changed (void); +static void subject_changed (void); +static void body_changed (void); +static void adv_condition_changed (void); + static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event, gpointer data); static gboolean from_entry_focus_evt_out(GtkWidget *widget, GdkEventFocus *event, @@ -281,8 +287,8 @@ static void summary_search_create(void) gtk_widget_show (to_entry); gtk_table_attach (GTK_TABLE (table1), to_entry, 1, 3, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); - g_signal_connect(G_OBJECT(from_entry), "changed", - G_CALLBACK(from_changed), NULL); + g_signal_connect(G_OBJECT(to_entry), "changed", + G_CALLBACK(to_changed), NULL); g_signal_connect(G_OBJECT(GTK_BIN(to_entry)->child), "focus_in_event", G_CALLBACK(to_entry_focus_evt_in), NULL); g_signal_connect(G_OBJECT(GTK_BIN(to_entry)->child), @@ -296,8 +302,8 @@ static void summary_search_create(void) gtk_widget_show (subject_entry); gtk_table_attach (GTK_TABLE (table1), subject_entry, 1, 3, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); - g_signal_connect(G_OBJECT(from_entry), "changed", - G_CALLBACK(from_changed), NULL); + g_signal_connect(G_OBJECT(subject_entry), "changed", + G_CALLBACK(subject_changed), NULL); g_signal_connect(G_OBJECT(GTK_BIN(subject_entry)->child), "focus_in_event", G_CALLBACK(subject_entry_focus_evt_in), NULL); g_signal_connect(G_OBJECT(GTK_BIN(subject_entry)->child), @@ -311,8 +317,8 @@ static void summary_search_create(void) gtk_widget_show (body_entry); gtk_table_attach (GTK_TABLE (table1), body_entry, 1, 3, 3, 4, GTK_EXPAND|GTK_FILL, 0, 0, 0); - g_signal_connect(G_OBJECT(from_entry), "changed", - G_CALLBACK(from_changed), NULL); + g_signal_connect(G_OBJECT(body_entry), "changed", + G_CALLBACK(body_changed), NULL); g_signal_connect(G_OBJECT(GTK_BIN(body_entry)->child), "focus_in_event", G_CALLBACK(body_entry_focus_evt_in), NULL); g_signal_connect(G_OBJECT(GTK_BIN(body_entry)->child), @@ -326,8 +332,8 @@ static void summary_search_create(void) gtk_widget_show (adv_condition_entry); gtk_table_attach (GTK_TABLE (table1), adv_condition_entry, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, 0, 0, 0); - g_signal_connect(G_OBJECT(from_entry), "changed", - G_CALLBACK(from_changed), NULL); + g_signal_connect(G_OBJECT(adv_condition_entry), "changed", + G_CALLBACK(adv_condition_changed), NULL); g_signal_connect(G_OBJECT(GTK_BIN(adv_condition_entry)->child), "focus_in_event", G_CALLBACK(adv_condition_entry_focus_evt_in), NULL); g_signal_connect(G_OBJECT(GTK_BIN(adv_condition_entry)->child), @@ -839,6 +845,36 @@ static void adv_condition_btn_clicked(GtkButton *button, gpointer data) } }; +static void from_changed(void) +{ + if (!search_window.from_entry_has_focus) + gtk_widget_grab_focus(search_window.from_entry); +} + +static void to_changed(void) +{ + if (!search_window.to_entry_has_focus) + gtk_widget_grab_focus(search_window.to_entry); +} + +static void subject_changed(void) +{ + if (!search_window.subject_entry_has_focus) + gtk_widget_grab_focus(search_window.subject_entry); +} + +static void body_changed(void) +{ + if (!search_window.body_entry_has_focus) + gtk_widget_grab_focus(search_window.body_entry); +} + +static void adv_condition_changed(void) +{ + if (!search_window.adv_condition_entry_has_focus) + gtk_widget_grab_focus(search_window.adv_condition_entry); +} + static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event, gpointer data) { -- 2.25.1