Make the changes compile on Linux also.

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

diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c
index 34ec6d05ac3dbc21a40c6e9ed5a3de6356f89874..d8fd58b5dfb07e9fdbfca07398088aa5ce39acc1 100644 (file)
--- a/gtk/main_filter_toolbar.c
+++ b/gtk/main_filter_toolbar.c
@@ -91,14 +91,17 @@ filter_reset_cb(GtkWidget *w, gpointer data _U_)
   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;

+#endif

     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;


@@ -291,12 +294,14 @@ dfilter_entry_match(gconstpointer a, gconstpointer b)
 
     return strcmp(s1, s2);
 }
 
     return strcmp(s1, s2);
 }

+
+#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;

-       GValue value = { 0, };
+       GValue value;

        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))


@@ -314,6 +319,7 @@ dfilter_entry_match_new(GtkWidget *filter_cm, char *s)
 
        return FALSE;
 }
 
        return FALSE;
 }

+#endif

 
 /* 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 */


@@ -353,7 +359,7 @@ dfilter_recent_combo_write_all(FILE *rf) {
 #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;

-       GValue value = { 0, };
+       GValue value;

        const char *filter_str;
        guint      max_count = 0;
 
        const char *filter_str;
        guint      max_count = 0;