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.

svn path=/trunk/; revision=26414

7 files changed, 13 insertions, 0 deletions

diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index c99fbe2552..4f9c3d7bad 100644
--- 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 5280a443ea..2ea9b667cc 100644
--- 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 f718756c8a..8cd54bc9a6 100644
--- 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 b3ac68077b..9d76b0b4c1 100644
--- 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 e324ef3082..44fccaaae2 100644
--- 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 6ebfe4618a..edc390e3ce 100644
--- 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 053061ae60..22f9d3473f 100644
--- 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);