main_filter_packets(&cfile, NULL, FALSE);
}
main_filter_packets(&cfile, NULL, FALSE);
}
-/*#define NEW_FILTER_COMBO_BOX 1*/
+/* #define NEW_FILTER_COMBO_BOX 1 */
GtkWidget *filter_toolbar_new()
{
GtkWidget *filter_cm;
GtkWidget *filter_te;
GtkWidget *filter_tb;
GtkWidget *filter_toolbar_new()
{
GtkWidget *filter_cm;
GtkWidget *filter_te;
GtkWidget *filter_tb;
+#ifdef NEW_FILTER_COMBO_BOX
+#else
GList *dfilter_list = NULL;
GList *dfilter_list = NULL;
GtkTooltips *tooltips;
GtkToolItem *filter_bt, *filter_add_expr_bt, *filter_reset;
GtkToolItem *filter_apply, *item;
GtkTooltips *tooltips;
GtkToolItem *filter_bt, *filter_add_expr_bt, *filter_reset;
GtkToolItem *filter_apply, *item;
+
+#ifdef NEW_FILTER_COMBO_BOX
static gboolean
dfilter_entry_match_new(GtkWidget *filter_cm, char *s)
{
GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX(filter_cm));
GtkTreeIter iter;
static gboolean
dfilter_entry_match_new(GtkWidget *filter_cm, char *s)
{
GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX(filter_cm));
GtkTreeIter iter;
const char *filter_str;
if (!gtk_tree_model_get_iter_first (model, &iter))
const char *filter_str;
if (!gtk_tree_model_get_iter_first (model, &iter))
/* add a display filter to the combo box */
/* Note: a new filter string will not replace an old identical one */
/* add a display filter to the combo box */
/* Note: a new filter string will not replace an old identical one */
#ifdef NEW_FILTER_COMBO_BOX
GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX(filter_cm));
GtkTreeIter iter;
#ifdef NEW_FILTER_COMBO_BOX
GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX(filter_cm));
GtkTreeIter iter;
const char *filter_str;
guint max_count = 0;
const char *filter_str;
guint max_count = 0;