diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-06-16 00:53:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-06-16 00:53:20 +0000 |
| commit | 3a407d9567a2443401eef9445cb1e228dd02008b (patch) | |
| tree | de35242e1888899aa25b343c56bc89a5616a7eca /gtk/prefs_dlg.c | |
| parent | 561aaa66e05e2eff2ccd4cb38488b1023aa032c6 (diff) | |
From Chris Waters: don't use "bool" as a variable name or structure
member, as it's a C++ keyword.
svn path=/trunk/; revision=5677
Diffstat (limited to 'gtk/prefs_dlg.c')
| -rw-r--r-- | gtk/prefs_dlg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 98b67ce3cd..0072229443 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -1,7 +1,7 @@ /* prefs_dlg.c * Routines for handling preferences * - * $Id: prefs_dlg.c,v 1.46 2002/04/20 20:29:28 guy Exp $ + * $Id: prefs_dlg.c,v 1.47 2002/06/16 00:53:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -165,10 +165,10 @@ pref_show(pref_t *pref, gpointer user_data) break; case PREF_BOOL: - pref->saved_val.bool = *pref->varp.bool; + pref->saved_val.boolean = *pref->varp.boolean; pref->control = create_preference_check_button(main_tb, pref->ordinal, label_string, pref->description, - pref->saved_val.bool); + pref->saved_val.boolean); break; case PREF_ENUM: @@ -715,9 +715,9 @@ pref_fetch(pref_t *pref, gpointer user_data) case PREF_BOOL: bval = GTK_TOGGLE_BUTTON(pref->control)->active; - if (*pref->varp.bool != bval) { + if (*pref->varp.boolean != bval) { *pref_changed_p = TRUE; - *pref->varp.bool = bval; + *pref->varp.boolean = bval; } break; @@ -949,9 +949,9 @@ pref_revert(pref_t *pref, gpointer user_data) break; case PREF_BOOL: - if (*pref->varp.bool != pref->saved_val.bool) { + if (*pref->varp.boolean != pref->saved_val.boolean) { *pref_changed_p = TRUE; - *pref->varp.bool = pref->saved_val.bool; + *pref->varp.boolean = pref->saved_val.boolean; } break; |