From Richard Urwin:

	use Export and Import for the buttons in GTK+ 2.x as well;

	get rid of a duplicate fclose;

	other fixes.

Update the description of color filters in the Ethereal man page to
reflect the change, clean up the formatting (use =item), and add the
global and personal color filters files to the FILES section; refer to
them as "color filters" files rather than "colorfilters" files, as the
FILES section gives the "colorfilters" file name so you don't have to
use that as the name.

Clean up white space.

svn path=/trunk/; revision=8285

1 files changed, 34 insertions, 28 deletions

diff --git a/gtk/color_filters.c b/gtk/color_filters.c
index 00e24d78a2..a3efb3e323 100644
--- a/gtk/color_filters.c
+++ b/gtk/color_filters.c
@@ -1,7 +1,7 @@
 /* color_filters.c
  * Routines for color filters
  *
- * $Id: color_filters.c,v 1.3 2003/08/18 21:27:10 sahlberg Exp $
+ * $Id: color_filters.c,v 1.4 2003/08/27 22:55:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -106,7 +106,7 @@ new_color_filter(gchar *name,           /* The name of the filter to create */
 	gdkcolor_to_color_t(&colorf->fg_color, &style->text[GTK_STATE_NORMAL]);
 	colorf->c_colorfilter = NULL;
 	colorf->edit_dialog = NULL;
-  colorf->marked = FALSE;
+	colorf->marked = FALSE;
 	filter_list = g_slist_append(filter_list, colorf);
         return colorf;
 }
@@ -195,18 +195,17 @@ read_filters_file(FILE *f, gpointer arg)
 			bg_color.red = bg_r;
 			bg_color.green = bg_g;
 			bg_color.blue = bg_b;
-      
+
 			gdkcolor_to_color_t(&colorf->bg_color, &bg_color);
 			gdkcolor_to_color_t(&colorf->fg_color, &fg_color);
 
-      if (arg != NULL)
-        color_add_filter_cb (colorf, arg);
-
-    }    /* if sscanf */
+			if (arg != NULL)
+				color_add_filter_cb (colorf, arg);
+		}    /* if sscanf */
 	} while(!feof(f));
-	fclose(f);
 	return TRUE;
 }
+
 /* read filters from the user's filter file */
 static gboolean
 read_filters(void)
@@ -218,6 +217,7 @@ read_filters(void)
 	 * reading only */
 	gchar *path;
 	FILE *f;
+	gboolean ret;
 
 	/* decide what file to open (from dfilter code) */
 	path = get_persconffile_path("colorfilters", FALSE);
@@ -233,7 +233,9 @@ read_filters(void)
 	g_free((gchar *)path);
 	path = NULL;
 
-	return read_filters_file(f, NULL);
+	ret = read_filters_file(f, NULL);
+	fclose(f);
+	return ret;
 }
 
 /* read filters from the filter file */
@@ -242,6 +244,7 @@ read_global_filters(void)
 {
 	gchar *path;
 	FILE *f;
+	gboolean ret;
 
 	/* decide what file to open (from dfilter code) */
 	path = get_datafile_path("colorfilters");
@@ -257,7 +260,9 @@ read_global_filters(void)
 	g_free((gchar *)path);
 	path = NULL;
 
-	return read_filters_file(f, NULL);
+	ret = read_filters_file(f, NULL);
+	fclose(f);
+	return ret;
 }
 
 /* save filters in some other filter file */
@@ -266,6 +271,7 @@ gboolean
 read_other_filters(gchar *path, gpointer arg)
 {
 	FILE *f;
+	gboolean ret;
 
 	if ((f = fopen(path, "r")) == NULL) {
 		simple_dialog(ESD_TYPE_CRIT, NULL,
@@ -274,9 +280,9 @@ read_other_filters(gchar *path, gpointer arg)
 		return FALSE;
 	}
 
-	read_filters_file(f, arg);
+	ret = read_filters_file(f, arg);
 	fclose(f);
-	return TRUE;
+	return ret;
 }
 
 struct write_filter_data
@@ -288,31 +294,31 @@ struct write_filter_data
 static void
 write_filter(gpointer filter_arg, gpointer data_arg)
 {
-  struct write_filter_data *data = data_arg;
+	struct write_filter_data *data = data_arg;
 	color_filter_t *colorf = filter_arg;
 	FILE *f = data->f;
 
-  if (colorf->marked || !data->only_marked)
-  {
-    fprintf(f,"@%s@%s@[%d,%d,%d][%d,%d,%d]\n",
-        colorf->filter_name,
-        colorf->filter_text,
-        colorf->bg_color.red,
-        colorf->bg_color.green,
-        colorf->bg_color.blue,
-        colorf->fg_color.red,
-        colorf->fg_color.green,
-        colorf->fg_color.blue);
-  }
+	if (colorf->marked || !data->only_marked) {
+		fprintf(f,"@%s@%s@[%d,%d,%d][%d,%d,%d]\n",
+		    colorf->filter_name,
+		    colorf->filter_text,
+		    colorf->bg_color.red,
+		    colorf->bg_color.green,
+		    colorf->bg_color.blue,
+		    colorf->fg_color.red,
+		    colorf->fg_color.green,
+		    colorf->fg_color.blue);
+	}
 }
 
 /* save filters in a filter file */
 gboolean
 write_filters_file(FILE *f, gboolean only_marked)
 {
-  struct write_filter_data data;
-  data.f = f;
-  data.only_marked = only_marked;
+	struct write_filter_data data;
+
+	data.f = f;
+	data.only_marked = only_marked;
   
 	fprintf(f,"# DO NOT EDIT THIS FILE!  It was created by Ethereal\n");
         g_slist_foreach(filter_list, write_filter, &data);