diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 05:45:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 05:45:32 +0000 |
| commit | 64f9f5fb1cb01942c64a4593ba204da18e4c3bb4 (patch) | |
| tree | f512e5edf243e6bad520102aee264b5b345793ce /ui/gtk/find_dlg.c | |
| parent | 1569217448c1e4c85ac44ecb20cf2f5b79978b72 (diff) | |
From chaitanya:
Find Window: The cursor is not set when we seleted String/hex/Display Filter (again)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8498
svn path=/trunk/; revision=49435
Diffstat (limited to 'ui/gtk/find_dlg.c')
| -rw-r--r-- | ui/gtk/find_dlg.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index 49c958acae..08a4b5501b 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -447,11 +447,14 @@ find_filter_te_syntax_check_cb(GtkWidget *w, gpointer parent_w) static void hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { - GtkWidget *filter_tb, *hex_rb; + GtkWidget *filter_tb, *hex_rb, *filter_entry; filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); hex_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_HEXDATA_KEY); + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); + /* Disable AutoCompletion feature */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hex_rb)) && g_signal_handler_is_connected(filter_tb, te_presskey_handler_id)) { g_signal_handler_disconnect(filter_tb, te_presskey_handler_id); @@ -471,7 +474,7 @@ static void string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { GtkWidget *string_rb, *packet_data_rb, *decode_data_rb, *summary_data_rb, - *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_tb; + *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_tb, *filter_entry; string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); packet_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DATA_KEY); @@ -483,6 +486,9 @@ string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) data_case_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CASE_SEARCH_KEY); filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(string_rb))) { gtk_widget_set_sensitive(GTK_WIDGET(packet_data_rb), TRUE); gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), TRUE); @@ -517,12 +523,15 @@ string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) static void filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { - GtkWidget *filter_bt, *filter_rb, *filter_te; + GtkWidget *filter_bt, *filter_rb, *filter_te, *filter_entry; filter_bt = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_BUTTON_KEY); filter_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILTERDATA_KEY); filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_rb))) { gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), TRUE); |