diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-11 07:40:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-11 07:40:32 +0000 |
| commit | feb5791d6ae22cca80342e84961273ddaaf52b6f (patch) | |
| tree | 467547aec98e0b9c4656c1d3ff930b5a308bd1f7 /gtk/gui_prefs.c | |
| parent | e592fa4a6bdf6342a790f488596c73d2332c9d27 (diff) | |
Have a routine to create a scrolled window, set its vertical scrollbar
preference, and add it to the list of scrolled windows; call that
routine to create scrolled windows, rather than creating it and calling
other routines to do the other two operations.
As "set_scrollbar_placement_all()" and "set_ctree_styles_all()" always
set the styles to match the user's preference, don't have them take an
argument, have them just use the user's preference settings.
Get rid of unnecessary includes of "prefs_dlg.h", replacing them with
includes of "prefs.h" if necessary. Don't have "prefs_dlg.h" include
"prefs.h" - its sole purpose is to declare routines defined in
"prefs_dlg.c" - and add any additional includes of "prefs.h" this
requires.
Get rid of unnecessary includes of "prefs.h" and "gtkglobals.h".
Fix up white space.
svn path=/trunk/; revision=4521
Diffstat (limited to 'gtk/gui_prefs.c')
| -rw-r--r-- | gtk/gui_prefs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 4da7659fa7..c9dafda6f8 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -1,7 +1,7 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: gui_prefs.c,v 1.29 2002/01/11 06:43:17 guy Exp $ + * $Id: gui_prefs.c,v 1.30 2002/01/11 07:40:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,7 +34,6 @@ #include "globals.h" #include "gui_prefs.h" #include "gtkglobals.h" -#include "prefs_dlg.h" #include "follow_dlg.h" #include "help_dlg.h" #include "prefs.h" @@ -514,11 +513,10 @@ gui_prefs_apply(GtkWidget *w) or the colors to use changed. */ follow_redraw_all(); - set_scrollbar_placement_all(prefs.gui_scrollbar_on_right); + set_scrollbar_placement_all(); set_plist_sel_browse(prefs.gui_plist_sel_browse); set_ptree_sel_browse_all(prefs.gui_ptree_sel_browse); - set_ctree_styles_all(prefs.gui_ptree_line_style, - prefs.gui_ptree_expander_style); + set_ctree_styles_all(); if (colors_changed) update_marked_frames(); |