diff options
| -rw-r--r-- | epan/filter_expressions.c | 2 | ||||
| -rw-r--r-- | epan/filter_expressions.h | 2 | ||||
| -rw-r--r-- | ui/gtk/filter_expression_save_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/prefs_filter_expressions.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c index 4b4e407333..bf5a29033a 100644 --- a/epan/filter_expressions.c +++ b/epan/filter_expressions.c @@ -57,7 +57,7 @@ filter_expression_new(const gchar *label, const gchar *expr, while (prev->next != NULL) prev = prev->next; prev->next = expression; - expression->index = prev->index + 1; + expression->filter_index = prev->filter_index + 1; } return(expression); diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h index fcca3d87d9..a5042fff09 100644 --- a/epan/filter_expressions.h +++ b/epan/filter_expressions.h @@ -38,7 +38,7 @@ struct filter_expression { gchar *label; gchar *expression; - gint index; + gint filter_index; gboolean enabled; /* Can be set to FALSE by Preferences Dialog */ gboolean deleted; /* Can be set to TRUE by Preferences Dialog (GTK+ only) */ diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 8ce4c60cde..922fa68ec4 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -112,7 +112,7 @@ filter_expression_reinit(int what) gint maxindx = -1, indx; fe = *pfilter_expression_head; while (fe != NULL) { - maxindx = MAX(maxindx, fe->index); + maxindx = MAX(maxindx, fe->filter_index); fe = fe->next; } @@ -126,7 +126,7 @@ filter_expression_reinit(int what) for (indx = 0; indx <= maxindx; indx++) { if (prevhead != NULL) { fe = prevhead; - while (fe != NULL && fe->index != indx) + while (fe != NULL && fe->filter_index != indx) fe = fe->next; } if (fe == NULL) diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index 5770086dcb..f3ae59c93c 100644 --- a/ui/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -160,7 +160,7 @@ filter_expressions_prefs_show(void) { fe = *pfilter_expression_head; while (fe != NULL) { - fe->index = -1; + fe->filter_index = -1; gtk_list_store_insert_with_values(store, &iter, G_MAXINT, ENABLED_COLUMN, fe->enabled, LABEL_COLUMN, fe->label, @@ -342,7 +342,7 @@ filter_expressions_prefs_fetch(GtkWidget *w) while (items_left) { gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1); if (fe != NULL) - fe->index = indx++; + fe->filter_index = indx++; items_left = gtk_tree_model_iter_next (model, &iter); } @@ -351,7 +351,7 @@ filter_expressions_prefs_fetch(GtkWidget *w) gtk_list_store_clear(store); fe = *pfilter_expression_head; while (fe != NULL) { - fe->index = -1; + fe->filter_index = -1; gtk_list_store_insert_with_values(store, &iter, G_MAXINT, ENABLED_COLUMN, fe->enabled, LABEL_COLUMN, fe->label, |