Ensure we initialize all colorized filter text entries before we show the

widget, so we don't get wrong foreground color when using a dark theme.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26414 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index c99fbe2552412d7a892c0f0d27463ce6aa7bfd6f..4f9c3d7bad7969e246d7c2e971a874c97957dffe 100644 (file)
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -501,6 +501,7 @@ file_open_cmd(GtkWidget *w)
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3);
   g_signal_connect(filter_te, "changed",
                    G_CALLBACK(filter_te_syntax_check_cb), NULL);
+  colorize_filter_te_as_empty(filter_te);
   gtk_widget_show(filter_te);
   gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
 
@@ -807,6 +808,7 @@ file_merge_cmd(GtkWidget *w)
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3);
   g_signal_connect(filter_te, "changed",
                    G_CALLBACK(filter_te_syntax_check_cb), NULL);
+  colorize_filter_te_as_empty(filter_te);
   gtk_widget_show(filter_te);
   gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
 

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 5280a443ea63f9536ff5fbddcf0a912d0b4bc684..2ea9b667cc2d0f5fe14408ee713c869b082cc076 100644 (file)
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -638,6 +638,8 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
        if(filter){
                gtk_entry_set_text(GTK_ENTRY(filter_entry), filter);
+       } else {
+               colorize_filter_te_as_empty(filter_entry);
        }
        gtk_widget_show(filter_entry);
 

diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index f718756c8a96eaeb040aabf2e2496047dbb57e54..8cd54bc9a6e4422edde1a299e4ac8d9f493461bd 100644 (file)
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1957,6 +1957,7 @@ create_advanced_field(io_stat_graph_t *gio, GtkWidget *box)
        g_signal_connect(gio->calc_field, "activate", G_CALLBACK(filter_callback), gio);
        g_object_set_data (G_OBJECT(gio->calc_field), E_FILT_FIELD_NAME_ONLY_KEY, "");
        g_signal_connect(gio->calc_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+       colorize_filter_te_as_empty(gio->calc_field);
 }
 
 
@@ -2046,6 +2047,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
        gtk_widget_show(gio->filter_field);
        g_signal_connect(gio->filter_field, "activate", G_CALLBACK(filter_callback), gio);
        g_signal_connect(gio->filter_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+       colorize_filter_te_as_empty(gio->filter_field);
 
        create_advanced_box(gio, hbox);
 

diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c
index b3ac68077b83ea2b402ed4f24b20e84111c5930a..9d76b0b4c17ebadeab2e316f15d4e674685720ad 100644 (file)
--- a/gtk/prefs_column.c
+++ b/gtk/prefs_column.c
@@ -245,6 +245,7 @@ column_prefs_show() {
   field_te = gtk_entry_new();
   g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, "");
   g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+  colorize_filter_te_as_empty(field_te);
   gtk_table_attach_defaults(GTK_TABLE(tb), field_te, 3, 4, 1, 2);
   gtk_widget_set_sensitive(field_te, FALSE);
   gtk_widget_hide(field_te);

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index e324ef30824617758de2c9880b118342337978cf..44fccaaae20463e2a5e603e59e3fbe6d41ebd6db 100644 (file)
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -507,6 +507,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
        if(filter){
                gtk_entry_set_text(GTK_ENTRY(filter_entry), filter);
+       } else {
+               colorize_filter_te_as_empty(filter_entry);
        }
        gtk_widget_show(filter_entry);
 

diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index 6ebfe4618acf5ba66655c79ce030f423a74ee04e..edc390e3ceaf9cc4372098628b4a1a7c3b81320f 100644 (file)
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -400,6 +400,8 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
        filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
        if(filter){
                gtk_entry_set_text(GTK_ENTRY(filter_entry), filter);
+       } else {
+               colorize_filter_te_as_empty(filter_entry);
        }
        gtk_widget_show(filter_entry);
 

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 053061ae603063fd3ee5c80068e74071b64430f0..22f9d3473f74a72f59d74a7b58592341959b37b7 100644 (file)
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -220,6 +220,8 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
        filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
        if(filter){
                gtk_entry_set_text(GTK_ENTRY(current_dlg->filter_entry), filter);
+       } else {
+               colorize_filter_te_as_empty(current_dlg->filter_entry);
        }
        gtk_widget_show(current_dlg->filter_entry);