When writing the color filter list out, go through the list of

"color_filter_t" structures to find the filters.

svn path=/trunk/; revision=1358

1 files changed, 19 insertions, 13 deletions

diff --git a/colors.c b/colors.c
index f65c6e3e89..f152af7609 100644
--- a/colors.c
+++ b/colors.c
@@ -1,7 +1,7 @@
 /* colors.c
  * Definitions for color structures and routines
  *
- * $Id: colors.c,v 1.19 1999/12/19 07:01:29 guy Exp $
+ * $Id: colors.c,v 1.20 1999/12/19 07:11:26 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -313,10 +313,26 @@ read_filters(colfilter *filter)
 	return TRUE;
 }
 
+static void
+write_filter(gpointer filter_arg, gpointer file_arg)
+{
+	color_filter_t *cfilter = filter_arg;
+	FILE *f = file_arg;
+
+	fprintf(f,"@%s@%s@[%d,%d,%d][%d,%d,%d]\n",
+	    cfilter->filter_name,
+	    cfilter->filter_text,
+	    cfilter->bg_color.red,
+	    cfilter->bg_color.green,
+	    cfilter->bg_color.blue,
+	    cfilter->fg_color.red,
+	    cfilter->fg_color.green,
+	    cfilter->fg_color.blue);
+}
+	
 static gboolean
 write_filters(colfilter *filter)
 {
-	int i;
 	FILE *f;
 	gchar *path;
 	gchar *name = PF_DIR "/colorfilters";
@@ -332,17 +348,7 @@ write_filters(colfilter *filter)
 	  return FALSE;
 	}
         fprintf(f,"# DO NOT EDIT THIS FILE!  It was created by Ethereal\n");
-	for(i = 0; i < filter->num_of_filters; i++){
-	  fprintf(f,"@%s@%s@[%d,%d,%d][%d,%d,%d]\n",
-		get_color_filter_name(filter,i),
-		get_color_filter_string(filter,i),
-		color_filter(filter,i)->bg_color.red,
-		color_filter(filter,i)->bg_color.green,
-		color_filter(filter,i)->bg_color.blue,
-		color_filter(filter,i)->fg_color.red,
-		color_filter(filter,i)->fg_color.green,
-		color_filter(filter,i)->fg_color.blue);
-	}
+        g_slist_foreach(filter_list, write_filter, f);
 	fclose(f);
 	g_free(path);
 	return TRUE;