renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir

svn path=/trunk/; revision=15465
This commit is contained in:
Ulf Lamping 2005-08-20 12:09:48 +00:00
parent 5adc2b6bf1
commit eafbbbcabb
82 changed files with 1430 additions and 1436 deletions

View File

@ -64,6 +64,7 @@ noinst_HEADERS = \
gtkglobals.h \
gtk_stat_util.h \
gui_prefs.h \
gui_utils.h \
help_dlg.h \
hostlist_table.h \
isprint.h \
@ -96,7 +97,6 @@ noinst_HEADERS = \
tap_dfilter_dlg.h \
text_page.h \
toolbar.h \
ui_util.h \
voip_calls.h \
voip_calls_dlg.h \
webbrowser.h

View File

@ -67,6 +67,7 @@ ETHEREAL_GTK_SRC = \
graph_analysis.c \
gtk_stat_util.c \
gui_prefs.c \
gui_utils.c \
help_dlg.c \
hostlist_table.c \
layout_prefs.c \
@ -99,7 +100,6 @@ ETHEREAL_GTK_SRC = \
tap_dfilter_dlg.c \
text_page.c \
toolbar.c \
ui_util.c \
voip_calls.c \
webbrowser.c

View File

@ -32,7 +32,7 @@
#include <epan/filesystem.h>
#include <epan/plugins.h>
#include "about_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "compat_macros.h"
#include "globals.h"

View File

@ -53,7 +53,7 @@
#include "../globals.h"
#include "filter_dlg.h"
#include "compat_macros.h"
#include "ui_util.h"
#include "gui_utils.h"
typedef struct column_arrows {

View File

@ -52,7 +52,7 @@
#include "filter_dlg.h"
#include "compat_macros.h"
#include <epan/dissectors/packet-ansi_map.h>
#include "ui_util.h"
#include "gui_utils.h"
typedef struct column_arrows {

View File

@ -36,7 +36,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include <epan/tap.h>
#include "../register.h"

View File

@ -37,7 +37,7 @@
#include "globals.h"
#include <epan/addr_resolv.h>
#include "main.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "capture.h"
#include "capture_dlg.h"
#include "filter_dlg.h"

View File

@ -42,7 +42,7 @@
#include "capture.h"
#include "main.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "help_dlg.h"

View File

@ -54,7 +54,7 @@
#include "capture_dlg.h"
#include "capture_if_details_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "wtap.h"

View File

@ -41,7 +41,7 @@
#include "globals.h"
#include "capture_ui_utils.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "pcap-util.h"

View File

@ -37,7 +37,7 @@
#include "gtkglobals.h"
#include <epan/prefs.h>
#include "prefs_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "simple_dialog.h"
#include "pcap-util.h"

View File

@ -40,7 +40,7 @@
#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dfilter_expr_dlg.h"
#include "compat_macros.h"
#include "filter_dlg.h"

View File

@ -34,11 +34,7 @@
#include <epan/prefs.h>
#include <epan/column.h>
#include "compat_macros.h"
#include "ui_util.h"
#if GTK_MAJOR_VERSION >= 2
#include "ui_util.h"
#endif
#include "gui_utils.h"
static GtkWidget *column_l, *del_bt, *title_te, *fmt_m, *up_bt, *dn_bt;
static gint cur_fmt, cur_row;

View File

@ -53,7 +53,7 @@
#include "gtk/color_dlg.h"
#include "gtkglobals.h"
#include "main.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "help_dlg.h"

View File

@ -44,7 +44,7 @@
#include "stat_menu.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/tap.h>
#include "../register.h"
#include <epan/dissectors/packet-dcerpc.h>

View File

@ -34,7 +34,7 @@
#include "simple_dialog.h"
#include <epan/packet.h>
#include <epan/ipproto.h>
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/epan_dissect.h>
#include "compat_macros.h"
#include "decode_as_dcerpc.h"

View File

@ -35,7 +35,7 @@
#include "simple_dialog.h"
#include <epan/packet.h>
#include <epan/ipproto.h>
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/epan_dissect.h>
#include "compat_macros.h"
#include "decode_as_dcerpc.h"

View File

@ -49,7 +49,7 @@
#include "globals.h"
#include "main.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "proto_dlg.h"

View File

@ -34,7 +34,7 @@
#include "globals.h"
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "keys.h"
#include "compat_macros.h"

View File

@ -80,7 +80,7 @@
/** @file
* Utilities for dialog boxes. Depending on the window functions in
* ui_util.h, see: @ref howto_window_page for details.
* gui_utils.h, see: @ref howto_window_page for details.
* @ingroup dialog_group
*/
@ -164,7 +164,7 @@ extern void set_last_open_dir(char *dirname);
* @param stock_id_first the first button (e.g. GTK_STOCK_OK)
* @param ... the next buttons, just like stock_id_first
* @return the new button row
* @todo move this to ui_util.h
* @todo move this to gui_utils.h
*/
extern GtkWidget *dlg_button_row_new(const gchar *stock_id_first, ...);
@ -173,7 +173,7 @@ extern GtkWidget *dlg_button_row_new(const gchar *stock_id_first, ...);
*
* @param widget a widget which should be connected (usually a GtkEntry)
* @param ok_button the button to be activated
* @todo move this to ui_util.h
* @todo move this to gui_utils.h
*/
extern void dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button);

View File

@ -46,7 +46,7 @@
#include "../timestats.h"
#include "compat_macros.h"
#include "../simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"

View File

@ -38,7 +38,7 @@
#include <epan/addr_resolv.h>
#include "keys.h"
#include "filter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "alert_box.h"
#include "simple_dialog.h"
#include "menu.h"

View File

@ -44,7 +44,7 @@
#include "compat_macros.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "main.h"

View File

@ -36,7 +36,7 @@
#include "gtk/main.h"
#include "filter_dlg.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "simple_dialog.h"
#include "dfilter_expr_dlg.h"
#include "compat_macros.h"

View File

@ -36,7 +36,7 @@
#include <epan/strutil.h>
#include "globals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "find_dlg.h"
#include "filter_dlg.h"
#include "alert_box.h"

View File

@ -36,7 +36,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "gtkglobals.h"

View File

@ -58,7 +58,7 @@
#include <epan/addr_resolv.h>
#include <epan/charsets.h>
#include "util.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/epan_dissect.h>
#include <epan/filesystem.h>
#include "compat_macros.h"

View File

@ -36,7 +36,7 @@
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "compat_macros.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "help_dlg.h"
/* Capture callback data keys */

View File

@ -52,7 +52,7 @@
#include "gtkglobals.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
#include "../color.h"

View File

@ -53,7 +53,7 @@
#include "../globals.h"
#include "filter_dlg.h"
#include "compat_macros.h"
#include "ui_util.h"
#include "gui_utils.h"
typedef struct column_arrows {

View File

@ -46,7 +46,7 @@
#include "image/clist_descend.xpm"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/tap.h>
#include "../register.h"
#include "../globals.h"

View File

@ -43,7 +43,7 @@
#include "file.h"
#include "summary.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include <epan/tap.h>

View File

@ -37,7 +37,7 @@
#include "supported_protos_dlg.h"
#include <epan/prefs.h>
#include "prefs_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "proto_draw.h"

View File

@ -1,7 +1,7 @@
/* ui_util.c
* UI utility routines
*
* $Id$
* $Id: ui_util.c 15286 2005-08-10 19:49:45Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -40,7 +40,7 @@
#include <gdk/gdkkeysyms.h>
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/prefs.h>
#include "epan/epan.h"
#include "../ui_util.h"

View File

@ -1,7 +1,7 @@
/* ui_util.h
/* gui_utils.h
* Definitions for UI utility routines
*
* $Id$
* $Id: ui_util.h 15263 2005-08-08 17:22:55Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -43,7 +43,7 @@
* from it's parent window. Dialogs should be used to ask or note the user something, while windows should
* show data independantly from the main window.
* Dialogs are created by calling dlg_window_new() which in turn will call window_new().
* After that, dialogs can be developed the same way as windows, all window related functions in ui_util.h
* After that, dialogs can be developed the same way as windows, all window related functions in gui_utils.h
* can be used for both.
*
* @section window_create Create a window

View File

@ -52,7 +52,7 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
static void gtk_h225counter_init(const char *optarg);

View File

@ -53,7 +53,7 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
static void gtk_h225rassrt_init(const char *optarg);

View File

@ -37,7 +37,7 @@
#include "text_page.h"
#include <epan/prefs.h>
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "dlg_utils.h"
#include "simple_dialog.h"

View File

@ -50,7 +50,7 @@
#include "gtk/color_dlg.h"
#include "gtkglobals.h"
#include "main.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "help_dlg.h"

View File

@ -41,7 +41,7 @@
#include <epan/packet_info.h>
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/stat.h>
#include "stat_menu.h"
#include <epan/tap.h>

View File

@ -31,10 +31,8 @@
#include "globals.h"
#include "layout_prefs.h"
#include "gtkglobals.h"
/*#include <epan/resolv.h>*/
#include <epan/prefs.h>
/*#include "prefs_dlg.h"*/
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
#include "dlg_utils.h"

View File

@ -46,7 +46,7 @@
#include "../timestats.h"
#include "compat_macros.h"
#include "../simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"

View File

@ -81,7 +81,7 @@
#include "register.h"
#include <epan/prefs-int.h>
#include "ringbuffer.h"
#include "../ui_util.h" /* beware: ui_util.h exists twice! */
#include "../ui_util.h"
#include <epan/tap.h>
#include <epan/stat.h>
#include "util.h"
@ -110,7 +110,7 @@
#include "dlg_utils.h"
#include "gtkglobals.h"
#include "colors.h"
#include "ui_util.h" /* beware: ui_util.h exists twice! */
#include "gui_utils.h"
#include "compat_macros.h"
#include "main.h"

View File

@ -53,7 +53,7 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#define NUM_TIMESTATS 10

View File

@ -52,7 +52,7 @@
#include "../globals.h"
#include "filter_dlg.h"
#include "compat_macros.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/dissectors/packet-mtp3.h>
#include "mtp3_stat.h"

View File

@ -46,7 +46,7 @@
#include "image/clist_ascend.xpm"
#include "image/clist_descend.xpm"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include <epan/tap.h>

View File

@ -34,7 +34,7 @@
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
#include "prefs_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "menu.h"
#include "compat_macros.h"

View File

@ -35,7 +35,7 @@
#include "color.h"
#include "color_filters.h"
#include "../ui_util.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "menu.h"
#include "colors.h"

View File

@ -56,7 +56,7 @@
#include "proto_draw.h"
#include "keys.h"
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include <epan/plugins.h>
#include <epan/epan_dissect.h>
#include "compat_macros.h"

View File

@ -31,7 +31,7 @@
#include "globals.h"
#include <epan/plugins.h>
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#ifdef HAVE_PLUGINS

View File

@ -45,7 +45,7 @@
#include "layout_prefs.h"
#include "capture_prefs.h"
#include "nameres_prefs.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "simple_dialog.h"
#include "compat_macros.h"

View File

@ -37,7 +37,7 @@
#include "alert_box.h"
#include "simple_dialog.h"
#include "file_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "main.h"
#include <epan/epan_dissect.h>

View File

@ -36,7 +36,7 @@
#include <epan/prefs.h>
#include "prefs_dlg.h"
#include "util.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "file_dlg.h"
#include "compat_macros.h"

View File

@ -31,7 +31,7 @@
#include <gtk/gtk.h>
#include "gtkglobals.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "progress_dlg.h"
#include "compat_macros.h"

View File

@ -35,7 +35,7 @@
#include "globals.h"
#include "main.h"
#include "util.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "proto_dlg.h"
#include "simple_dialog.h"

View File

@ -64,7 +64,7 @@
#include "proto_draw.h"
#include "packet_win.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "gtkglobals.h"
#include "compat_macros.h"
#include "alert_box.h"

View File

@ -30,7 +30,7 @@
#include "proto_hier_stats.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
#include "help_dlg.h"

View File

@ -33,7 +33,7 @@
#include "globals.h"
#include "packet-range.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "compat_macros.h"
#include "simple_dialog.h"

View File

@ -39,7 +39,7 @@
#include "main.h"
#include <epan/prefs.h>
#include <epan/prefs-int.h>
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "cfilter_combo_utils.h"
#include "simple_dialog.h"

View File

@ -43,7 +43,7 @@
#include "../register.h"
#include <epan/dissectors/packet-rpc.h>
#include "../globals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "compat_macros.h"

View File

@ -40,7 +40,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include <epan/tap.h>
#include "../register.h"

View File

@ -65,7 +65,7 @@
#include <epan/stat.h>
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "alert_box.h"
#include "simple_dialog.h"
#include "stat_menu.h"

View File

@ -38,7 +38,7 @@
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "gtkglobals.h"

View File

@ -35,7 +35,7 @@
#include "register.h"
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"

View File

@ -37,7 +37,7 @@
#include "../color.h"
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
#include "simple_dialog.h"

View File

@ -53,7 +53,7 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
static void sctpstat_init(const char *optarg);

View File

@ -37,7 +37,7 @@
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"

View File

@ -33,7 +33,7 @@
#include "simple_dialog.h"
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"

View File

@ -37,7 +37,7 @@
#include "../color.h"
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
#include "simple_dialog.h"

View File

@ -37,7 +37,7 @@
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"

View File

@ -44,7 +44,7 @@
#include "color.h"
#include "gtk/color_dlg.h"
#include "main.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "gtkglobals.h"

View File

@ -33,7 +33,7 @@
#include "gtkglobals.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include <epan/strutil.h>

View File

@ -37,7 +37,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include <epan/tap.h>
#include "../register.h"

View File

@ -46,7 +46,7 @@
#include "../timestats.h"
#include "compat_macros.h"
#include "../simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"

View File

@ -36,7 +36,7 @@
#include "globals.h"
#include <epan/stat.h>
#include "stat_menu.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "compat_macros.h"
#include "tap_dfilter_dlg.h"

View File

@ -43,7 +43,7 @@
#include "summary.h"
#include "summary_dlg.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "help_dlg.h"

View File

@ -34,7 +34,7 @@
#include <epan/prefs.h>
#include "globals.h"
#include "gtkglobals.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "dlg_utils.h"
#include "font_utils.h"

View File

@ -44,7 +44,7 @@
#include "filter_dlg.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "gtkglobals.h"

View File

@ -38,7 +38,7 @@
#include <epan/packet.h> /* frame_data */
#include "gtkglobals.h" /* packet_list */
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "color.h"
#include "compat_macros.h"
#include "etypes.h"

View File

@ -34,7 +34,7 @@
#include "epan/filesystem.h"
#include "text_page.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "simple_dialog.h"
#include "font_utils.h"

View File

@ -53,7 +53,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "dlg_utils.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "compat_macros.h"
#include "gtkglobals.h"

View File

@ -37,7 +37,7 @@
#include <epan/stat.h>
#include "stat_menu.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include <epan/tap.h>
#include "../register.h"