summaryrefslogtreecommitdiff
path: root/gtk/color_dlg.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/color_dlg.c')
-rw-r--r--gtk/color_dlg.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 5fe875a61b..115f2e07ea 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.37 2004/01/31 02:25:44 ulfl Exp $
+ * $Id: color_dlg.c,v 1.38 2004/01/31 03:22:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1084,9 +1084,8 @@ static void
color_save_cb(GtkButton *button _U_, gpointer user_data _U_)
{
if (!write_filters())
- simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open filter file: %s",
- strerror(errno));
-
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not open filter file: %s", strerror(errno));
}
/* Remove all user defined color filters and revert to the global file. */
@@ -1103,8 +1102,8 @@ color_clear_cb(GtkWidget *widget, gpointer user_data _U_)
}
if (!revert_filters())
- simple_dialog(ESD_TYPE_ERROR, NULL, "Could not delete filter file: %s",
- strerror(errno));
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not delete filter file: %s", strerror(errno));
/* colorize list */
colorize_packets(&cfile);
@@ -1462,7 +1461,8 @@ edit_color_filter_ok_cb (GtkButton *button,
filter_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(filt_text_entry)));
if(strchr(filter_name,'@') || strchr(filter_text,'@')){
- simple_dialog(ESD_TYPE_ERROR, NULL, "Filter names and strings must not"
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Filter names and strings must not"
" use the '@' character. Filter unchanged.");
g_free(filter_name);
g_free(filter_text);
@@ -1470,7 +1470,8 @@ edit_color_filter_ok_cb (GtkButton *button,
}
if(!dfilter_compile(filter_text, &compiled_filter)) {
- simple_dialog(ESD_TYPE_ERROR, NULL, "Filter \"%s\" did not compile correctly.\n"
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Filter \"%s\" did not compile correctly.\n"
" Please try again. Filter unchanged.\n%s\n", filter_name,
dfilter_error_msg);
} else {
@@ -1662,7 +1663,8 @@ color_sel_ok_cb (GtkButton *button _U_,
#endif
if ( ! get_color(&new_color) ){
- simple_dialog(ESD_TYPE_ERROR, NULL, "Could not allocate color. Try again.");
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not allocate color. Try again.");
} else {
/* Find the "Edit color filter" dialog box with which this is
associated. */