osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move gtk to ui/gtk. 

This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
This commit is contained in:
Jörg Mayer 2012-01-15 21:59:11 +00:00
parent 6d69ef093c
commit be706c6380
322 changed files with 1250 additions and 1242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -422,7 +422,7 @@ add_subdirectory( wiretap )
add_subdirectory( wsutil )
if(BUILD_wireshark AND GTK_FOUND)
add_subdirectory( gtk )
add_subdirectory( ui/gtk )
endif()
# Basedir where to install guides
@ -470,7 +470,7 @@ PRINT_ENABLED_FEATURES()
PRINT_DISABLED_FEATURES()
link_directories(
${CMAKE_BINARY_DIR}/gtk
${CMAKE_BINARY_DIR}/ui/gtk
${CMAKE_BINARY_DIR}/codecs
${CMAKE_BINARY_DIR}/epan
${CMAKE_BINARY_DIR}/wiretap

16
Makefile.am
View File

@ -264,7 +264,7 @@ tpncp_DATA = \
#
uidir = $(pkgdatadir)/ui
ui_DATA = \
gtk/ui/main-menubar-ui.xml
ui/gtk/ui/main-menubar-ui.xml
#
# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@ -323,13 +323,13 @@ endif
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
wireshark_LDADD = \
gtk/libui.a \
gtk/libui_dirty.a \
ui/gtk/libui.a \
ui/gtk/libui_dirty.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCAP_LIBS@ \
@GTK_LIBS@ -lm \
@ -582,8 +582,8 @@ EXTRA_DIST = \
capture-wpcap.h \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
cfilters \
colorfilters \
cfilters \
colorfilters \
config.h.win32 \
config.nmake \
debian/changelog \
@ -616,7 +616,7 @@ EXTRA_DIST = \
debian/wireshark.manpages \
debian/wireshark.menu \
epan/dfilter/README.dfilter \
dfilters \
dfilters \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
@ -891,7 +891,7 @@ endif
endif
DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc

34
Makefile.nmake
View File

@ -235,7 +235,7 @@ packaging_zip: all
rm -f wireshark.zip
zip -r -9 wireshark.zip $(INSTALL_DIR)/
wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\*.sbr epan\dissectors\*.sbr gtk\*.sbr win32\*.sbr wiretap\*.sbr
wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\*.sbr epan\dissectors\*.sbr ui\gtk\*.sbr win32\*.sbr wiretap\*.sbr
rm -f $@
$(BSCMAKE) @<<
/o $@ $?
@ -252,10 +252,10 @@ $(RESOURCES): image
wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap
wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib win32\libui_win32.lib plugins
wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui\gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\gtk\libui.lib win32\libui_win32.lib plugins
@echo Linking $@
$(LINK) @<<
/OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib gtk\libui.lib win32\libui_win32.lib $(wireshark_OBJECTS) image\wireshark.res
/OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libui.lib win32\libui_win32.lib $(wireshark_OBJECTS) image\wireshark.res
<<
!IFDEF MANIFEST_INFO_REQUIRED
mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1
@ -463,9 +463,9 @@ clean: clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../gtk
cd ../ui/gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../win32
cd ../../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
@ -509,9 +509,9 @@ distclean: distclean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../gtk
cd ../ui/gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../win32
cd ../../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
@ -550,7 +550,7 @@ maintainer-clean: maintainer-clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../win32
cd ../../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
@ -649,14 +649,14 @@ wiretap::
cd ..
codecs::
cd codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
cd codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
gtk:: help config.h svnversion.h doxygen
cd gtk
cd ui/gtk
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib
cd ..
cd ../..
win32::
cd win32
@ -780,7 +780,7 @@ setup: verify_tools clean_setup process_libs
# The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
# (The choice is determined by the value of the macro WIN_SETUP_OPT).
process_libs:
@if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
@if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
!IFDEF GTK_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@ -1007,7 +1007,7 @@ install-generated-files:
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
cd ..
if not exist $(INSTALL_DIR)\ui mkdir $(INSTALL_DIR)\ui
xcopy "gtk\ui\*.xml" $(INSTALL_DIR)\ui /d
xcopy "ui\gtk\ui\*.xml" $(INSTALL_DIR)\ui /d
# "install-all" will copy all files needed to run Wireshark/Tshark
# to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there.
@ -1123,9 +1123,9 @@ checkapi: checkapi_local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../gtk
cd ../ui/gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../win32
cd ../../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../epan
## $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi

6
configure.in
View File

@ -856,7 +856,7 @@ else
#
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_man="wireshark.1"
wireshark_SUBDIRS="codecs gtk"
wireshark_SUBDIRS="codecs ui/gtk"
# Don't use GLIB_CFLAGS
AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
@ -1977,8 +1977,8 @@ AC_OUTPUT(
epan/wslua/Makefile
epan/wspython/Makefile
codecs/Makefile
gtk/Makefile
gtk/doxygen.cfg
ui/gtk/Makefile
ui/gtk/doxygen.cfg
help/Makefile
packaging/Makefile
packaging/macosx/Info.plist

2
epan/plugins.c
View File

@ -510,7 +510,7 @@ register_all_codecs(void)
#endif /* big HAVE_PLUGINS */
/*
* Dump plugin info to stdout. Copied from gtk/plugins_dlg.c:plugins_scan.
* Dump plugin info to stdout. Copied from ui/gtk/plugins_dlg.c:plugins_scan.
*/
void
plugins_dump_all(void)

2
epan/timestamp.c
View File

@ -28,7 +28,7 @@
#include "timestamp.h"
/* Init with an invalid value, so that "recent" in gtk/menu.c can detect this
/* Init with an invalid value, so that "recent" in ui/gtk/menu.c can detect this
* and distinguish it from a command line value */
static ts_type timestamp_type = TS_NOT_SET;

2
file.c
View File

@ -3481,7 +3481,7 @@ cf_select_packet(capture_file *cf, int row)
if (fdata == NULL) {
/* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when
the first entry is added to it by "real_insert_row()", that row
is selected (see "real_insert_row()", in "gtk/gtkclist.c", in both
is selected (see "real_insert_row()", in "ui/gtk/gtkclist.c", in both
our version and the vanilla GTK+ version).
This means that a "select-row" signal is emitted; this causes

2
packaging/nsis/wireshark.nsi
View File

@ -669,7 +669,7 @@ File "..\..\tpncp\tpncp.dat"
; of the installation directory.
;
SetOutPath $INSTDIR\ui
File "..\..\gtk\ui\main-menubar-ui.xml"
File "..\..\ui\gtk\ui\main-menubar-ui.xml"
SetOutPath $INSTDIR
;

4
tap-megaco-common.h
View File

@ -6,7 +6,7 @@
* Copyright 2008, Ericsson AB
* By Balint Reczey <balint.reczey@ericsson.com>
*
* most functions are copied from gtk/rtp_stream.c and gtk/rtp_analysis.c
* most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analysis.c
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
@ -44,7 +44,7 @@
case GCP_CMD_NOTIFY_REPLY: \
case GCP_CMD_SVCCHG_REPLY: \
case GCP_CMD_TOPOLOGY_REPLY: \
case GCP_CMD_REPLY:
case GCP_CMD_REPLY:
#define GCP_CMD_REQ_CASE \
case GCP_CMD_ADD_REQ: \

4
tap-rtp-common.c
View File

@ -6,7 +6,7 @@
* Copyright 2008, Ericsson AB
* By Balint Reczey <balint.reczey@ericsson.com>
*
* most functions are copied from gtk/rtp_stream.c and gtk/rtp_analisys.c
* most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analisys.c
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
@ -42,7 +42,7 @@
#include <epan/rtp_pt.h>
#include <epan/addr_resolv.h>
#include <epan/dissectors/packet-rtp.h>
#include "gtk/rtp_stream.h"
#include "ui/gtk/rtp_stream.h"
#include "tap-rtp-common.h"
/* XXX: are changes needed to properly handle situations where

4
tap-rtp-common.h
View File

@ -6,7 +6,7 @@
* Copyright 2008, Ericsson AB
* By Balint Reczey <balint.reczey@ericsson.com>
*
* most functions are copied from gtk/rtp_stream.c and gtk/rtp_analisys.c
* most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analisys.c
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
@ -32,7 +32,7 @@
#ifndef TAP_RTP_COMMON_H_INCLUDED
#define TAP_RTP_COMMON_H_INCLUDED
#include "gtk/rtp_stream.h"
#include "ui/gtk/rtp_stream.h"
gint rtp_stream_info_cmp(gconstpointer, gconstpointer);
void rtpstream_reset_cb(void*);

2
tap-rtp.c
View File

@ -6,7 +6,7 @@
* Copyright 2008, Ericsson AB
* By Balint Reczey <balint.reczey@ericsson.com>
*
* based on gtk/rtp_stream_dlg.c
* based on ui/gtk/rtp_stream_dlg.c
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*

10
tap-sipstat.c
View File

@ -2,7 +2,7 @@
* sip message counter for wireshark
*
* $Id$
* Copied from gtk/sip_stat.c and tap-httpstat.c
* Copied from ui/gtk/sip_stat.c and tap-httpstat.c
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -42,7 +42,7 @@
/* used to keep track of the statictics for an entire program interface */
typedef struct _sip_stats_t {
char *filter;
char *filter;
guint32 packets; /* number of sip packets, including continuations */
guint32 resent_packets;
guint32 average_setup_time;
@ -58,8 +58,8 @@ typedef struct _sip_stats_t {
* for example it can be { 3, 404, "Not Found" ,...}
* which means we captured 3 reply sip/1.1 404 Not Found */
typedef struct _sip_response_code_t {
guint32 packets; /* 3 */
guint response_code; /* 404 */
guint32 packets; /* 3 */
guint response_code; /* 404 */
const gchar *name; /* Not Found */
sipstat_t *sp;
} sip_response_code_t;
@ -151,7 +151,7 @@ static const value_string vals_status_code[] = {
{ 606, "Not Acceptable"},
{ 699, "Global Failure - Others"},
{ 0, NULL}
{ 0, NULL}
};
/* Create tables for responses and requests */

0
gtk/CMakeLists.txt → ui/gtk/CMakeLists.txt
View File

0
gtk/Makefile.am → ui/gtk/Makefile.am
View File

0
gtk/Makefile.common → ui/gtk/Makefile.common
View File

0
gtk/Makefile.nmake → ui/gtk/Makefile.nmake
View File

0
gtk/Makefile_custom.common → ui/gtk/Makefile_custom.common
View File

2
gtk/STATUS.gtk3 → ui/gtk/STATUS.gtk3
View File

@ -17,6 +17,8 @@ To build Wireshark with GTK3 instead of GTK2, use:
http://lists-archives.org/gtk-devel/13233-fwd-precompiled-gtk3-for-windows.html
A Win32 port is in the making (and availalbe as source):
http://blogs.gnome.org/alexl/2011/11/25/gtk-work-on-windows/
The location of an experimental build can be found at:
http://www.pguridi.com.ar/2011/10/experimental-gtk-3-3-2-win32-build/
Except in one place we are building on GTK2 using the compat flags
-DGTK_DISABLE_SINGLE_INCLUDES

16
gtk/about_dlg.c → ui/gtk/about_dlg.c
View File

@ -43,14 +43,14 @@
#include "../log.h"
#include "../version_info.h"
#include "gtk/about_dlg.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/file_dlg.h"
#include "gtk/text_page_utils.h"
#include "gtk/gtkglobals.h"
#include "gtk/main.h"
#include "gtk/plugins_dlg.h"
#include "ui/gtk/about_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/text_page_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/main.h"
#include "ui/gtk/plugins_dlg.h"
#include "../image/wssplash-dev.xpm"
#include "webbrowser.h"

0
gtk/about_dlg.h → ui/gtk/about_dlg.h
View File

12
gtk/afp_stat.c → ui/gtk/afp_stat.c
View File

@ -46,13 +46,13 @@
#include "../file.h"
#include "../stat_menu.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/service_response_time_table.h"
#include "gtk/tap_param_dlg.h"
#include "gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/service_response_time_table.h"
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/main.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* used to keep track of the statistics for an entire program interface */
typedef struct _afpstat_t {

18
gtk/airpcap_dlg.c → ui/gtk/airpcap_dlg.c
View File

@ -46,15 +46,15 @@
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/dfilter_expr_dlg.h"
#include "gtk/stock_icons.h"
#include "gtk/gtkglobals.h"
#include "gtk/help_dlg.h"
#include "gtk/keys.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dfilter_expr_dlg.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/old-gtk-compat.h"
#include <airpcap.h>
#include "airpcap_loader.h"

0
gtk/airpcap_dlg.h → ui/gtk/airpcap_dlg.h
View File

14
gtk/airpcap_gui_utils.c → ui/gtk/airpcap_gui_utils.c
View File

@ -43,13 +43,13 @@
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/dfilter_expr_dlg.h"
#include "gtk/help_dlg.h"
#include "gtk/keys.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dfilter_expr_dlg.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/old-gtk-compat.h"
#include <airpcap.h>
#include "airpcap_loader.h"

0
gtk/airpcap_gui_utils.h → ui/gtk/airpcap_gui_utils.h
View File

10
gtk/ansi_a_stat.c → ui/gtk/ansi_a_stat.c
View File

@ -48,12 +48,12 @@
#include "../stat_menu.h"
#include "../simple_dialog.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/dlg_utils.h"
#include "gtk/filter_dlg.h"
#include "gtk/gui_utils.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
enum
{

10
gtk/ansi_map_stat.c → ui/gtk/ansi_map_stat.c
View File

@ -47,12 +47,12 @@
#include "../stat_menu.h"
#include "../simple_dialog.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/dlg_utils.h"
#include "gtk/filter_dlg.h"
#include "gtk/gui_utils.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
enum
{

10
gtk/bootp_stat.c → ui/gtk/bootp_stat.c
View File

@ -37,12 +37,12 @@
#include "../simple_dialog.h"
#include "../stat_menu.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/tap_param_dlg.h"
#include "gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/main.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
typedef const char* bootp_info_value_t;

12
gtk/camel_counter.c → ui/gtk/camel_counter.c
View File

@ -46,13 +46,13 @@
#include "../timestats.h"
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/gui_stat_util.h"
#include "gtk/tap_param_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/tap_param_dlg.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
static void gtk_camelcounter_reset(void *phs);
static int gtk_camelcounter_packet(void *phs,

14
gtk/camel_srt.c → ui/gtk/camel_srt.c
View File

@ -47,14 +47,14 @@
#include "../file.h"
#include "../stat_menu.h"
#include "gtk/main.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/gui_stat_util.h"
#include "gtk/tap_param_dlg.h"
#include "gtk/service_response_time_table.h"
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/service_response_time_table.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* used to keep track of the statistics for an entire program interface */
struct camelsrt_t {

36
gtk/capture_dlg.c → ui/gtk/capture_dlg.c
View File

@ -50,26 +50,26 @@
#include "../capture_ui_utils.h"
#include "../ringbuffer.h"
#include "gtk/main.h"
#include "gtk/menus.h"
#include "gtk/gui_utils.h"
#include "gtk/capture_dlg.h"
#include "gtk/filter_dlg.h"
#include "gtk/dlg_utils.h"
#include "gtk/file_dlg.h"
#include "gtk/stock_icons.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/help_dlg.h"
#include "gtk/gtkglobals.h"
#include "gtk/capture_globals.h"
#include "gtk/cfilter_combo_utils.h"
#include "gtk/capture_if_dlg.h"
#include "gtk/main_welcome.h"
#include "gtk/network_icons.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/capture_globals.h"
#include "ui/gtk/cfilter_combo_utils.h"
#include "ui/gtk/capture_if_dlg.h"
#include "ui/gtk/main_welcome.h"
#include "ui/gtk/network_icons.h"
#include "gtk/keys.h"
#include "ui/gtk/keys.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_AIRPCAP
#include <airpcap.h>

0
gtk/capture_dlg.h → ui/gtk/capture_dlg.h
View File

34
gtk/capture_file_dlg.c → ui/gtk/capture_file_dlg.c
View File

@ -49,25 +49,25 @@
#include "../util.h"
#include <wsutil/file_util.h>
#include "gtk/gtkglobals.h"
#include "gtk/keys.h"
#include "gtk/filter_dlg.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/file_dlg.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/drag_and_drop.h"
#include "gtk/main.h"
#include "gtk/menus.h"
#include "gtk/recent.h"
#include "gtk/color_dlg.h"
#include "gtk/new_packet_list.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/drag_and_drop.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
#include "ui/gtk/recent.h"
#include "ui/gtk/color_dlg.h"
#include "ui/gtk/new_packet_list.h"
#ifdef HAVE_LIBPCAP
#include "gtk/capture_dlg.h"
#include "ui/gtk/capture_dlg.h"
#endif
#include "gtk/stock_icons.h"
#include "gtk/range_utils.h"
#include "gtk/filter_autocomplete.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/range_utils.h"
#include "ui/gtk/filter_autocomplete.h"
#if _WIN32
#include <gdk/gdkwin32.h>

0
gtk/capture_file_dlg.h → ui/gtk/capture_file_dlg.h
View File

0
gtk/capture_globals.h → ui/gtk/capture_globals.h
View File

10
gtk/capture_if_details_dlg_win32.c → ui/gtk/capture_if_details_dlg_win32.c
View File

@ -41,11 +41,11 @@
#include "../capture.h"
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/help_dlg.h"
#include "gtk/capture_if_details_dlg_win32.h"
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/capture_if_details_dlg_win32.h"
#include <winsock2.h> /* Needed here to force a definition of WINVER */
/* for some (all ?) Microsoft compilers newer than vc6. */

0
gtk/capture_if_details_dlg_win32.h → ui/gtk/capture_if_details_dlg_win32.h
View File

36
gtk/capture_if_dlg.c → ui/gtk/capture_if_dlg.c
View File

@ -48,33 +48,33 @@
#include <wiretap/wtap.h>
#ifdef _WIN32
#include "gtk/capture_if_details_dlg_win32.h"
#include "ui/gtk/capture_if_details_dlg_win32.h"
#endif
#include "gtk/stock_icons.h"
#include "gtk/capture_dlg.h"
#include "gtk/capture_if_dlg.h"
#include "gtk/recent.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/main.h"
#include "gtk/main_toolbar.h"
#include "gtk/help_dlg.h"
#include "gtk/keys.h"
#include "gtk/webbrowser.h"
#include "gtk/capture_globals.h"
#include "gtk/network_icons.h"
#include "gtk/main_welcome.h"
#include "gtk/menus.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/capture_if_dlg.h"
#include "ui/gtk/recent.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/main.h"
#include "ui/gtk/main_toolbar.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/webbrowser.h"
#include "ui/gtk/capture_globals.h"
#include "ui/gtk/network_icons.h"
#include "ui/gtk/main_welcome.h"
#include "ui/gtk/menus.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_AIRPCAP
#include "../image/toolbar/capture_airpcap_16.xpm"
#endif
#if defined(HAVE_PCAP_REMOTE)
#include "gtk/remote_icons.h"
#include "ui/gtk/remote_icons.h"
#endif
#ifdef _WIN32

0
gtk/capture_if_dlg.h → ui/gtk/capture_if_dlg.h
View File

10
gtk/capture_info_dlg.c → ui/gtk/capture_info_dlg.c
View File

@ -44,11 +44,11 @@
#include "../capture_ui_utils.h"
#include "../capture-pcap-util.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/main.h"
#include "gtk/help_dlg.h"
#include "gtk/stock_icons.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/stock_icons.h"
#ifdef HAVE_AIRPCAP
#include <airpcap.h>

8
gtk/cfilter_combo_utils.c → ui/gtk/cfilter_combo_utils.c
View File

@ -31,10 +31,10 @@
#include <gtk/gtk.h>
#include "gtk/main.h"
#include "gtk/gtkglobals.h"
#include "gtk/cfilter_combo_utils.h"
#include "gtk/recent.h"
#include "ui/gtk/main.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/cfilter_combo_utils.h"
#include "ui/gtk/recent.h"
/* XXX: use a preference for this setting! */

0
gtk/cfilter_combo_utils.h → ui/gtk/cfilter_combo_utils.h
View File

26
gtk/color_dlg.c → ui/gtk/color_dlg.c
View File

@ -39,19 +39,19 @@
#include "../file.h"
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/color_utils.h"
#include "gtk/color_dlg.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/dfilter_expr_dlg.h"
#include "gtk/stock_icons.h"
#include "gtk/filter_dlg.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/gtkglobals.h"
#include "gtk/help_dlg.h"
#include "gtk/color_edit_dlg.h"
#include "gtk/new_packet_list.h"
#include "ui/gtk/main.h"
#include "ui/gtk/color_utils.h"
#include "ui/gtk/color_dlg.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dfilter_expr_dlg.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/color_edit_dlg.h"
#include "ui/gtk/new_packet_list.h"
#define BUTTON_SIZE_X -1

0
gtk/color_dlg.h → ui/gtk/color_dlg.h
View File

20
gtk/color_edit_dlg.c → ui/gtk/color_edit_dlg.c
View File

@ -36,17 +36,17 @@
#include "../color_filters.h"
#include "../simple_dialog.h"
#include "gtk/color_dlg.h"
#include "gtk/color_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/stock_icons.h"
#include "gtk/filter_dlg.h"
#include "gtk/dfilter_expr_dlg.h"
#include "gtk/color_edit_dlg.h"
#include "gtk/filter_autocomplete.h"
#include "ui/gtk/color_dlg.h"
#include "ui/gtk/color_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/dfilter_expr_dlg.h"
#include "ui/gtk/color_edit_dlg.h"
#include "ui/gtk/filter_autocomplete.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
#define BUTTON_SIZE_X -1
#define BUTTON_SIZE_Y -1

0
gtk/color_edit_dlg.h → ui/gtk/color_edit_dlg.h
View File

4
gtk/color_utils.c → ui/gtk/color_utils.c
View File

@ -33,8 +33,8 @@
#include "../color.h"
#include "../simple_dialog.h"
#include "gtk/color_utils.h"
#include "gtk/gtkglobals.h"
#include "ui/gtk/color_utils.h"
#include "ui/gtk/gtkglobals.h"
#if 0
static GdkColormap* sys_cmap;
static GdkColormap* our_cmap = NULL;

0
gtk/color_utils.h → ui/gtk/color_utils.h
View File

10
gtk/compare_stat.c → ui/gtk/compare_stat.c
View File

@ -60,10 +60,10 @@
#include "../simple_dialog.h"
#include "../timestats.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/stock_icons.h"
#include "gtk/help_dlg.h"
#include "gtk/filter_autocomplete.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/filter_autocomplete.h"
#include "gui_utils.h"
#include "dlg_utils.h"
@ -81,7 +81,7 @@
#include "color_dlg.h"
#include "new_packet_list.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* From colorize convertion */
#define COLOR_N 1

4
gtk/conversations_eth.c → ui/gtk/conversations_eth.c
View File

@ -41,8 +41,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_fc.c → ui/gtk/conversations_fc.c
View File

@ -42,8 +42,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int

4
gtk/conversations_fddi.c → ui/gtk/conversations_fddi.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_ip.c → ui/gtk/conversations_ip.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_ipv6.c → ui/gtk/conversations_ipv6.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_ipx.c → ui/gtk/conversations_ipx.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int

4
gtk/conversations_jxta.c → ui/gtk/conversations_jxta.c
View File

@ -41,8 +41,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_ncp.c → ui/gtk/conversations_ncp.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_rsvp.c → ui/gtk/conversations_rsvp.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_sctp.c → ui/gtk/conversations_sctp.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

26
gtk/conversations_table.c → ui/gtk/conversations_table.c
View File

@ -42,19 +42,19 @@
#include "../simple_dialog.h"
#include "../globals.h"
#include "gtk/sat.h"
#include "gtk/conversations_table.h"
#include "gtk/filter_utils.h"
#include "gtk/gtkglobals.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/help_dlg.h"
#include "gtk/main.h"
#include "gtk/stock_icons.h"
#include "gtk/follow_tcp.h"
#include "gtk/follow_udp.h"
#include "gtk/keys.h"
#include "gtk/utf8_entities.h"
#include "ui/gtk/sat.h"
#include "ui/gtk/conversations_table.h"
#include "ui/gtk/filter_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/follow_tcp.h"
#include "ui/gtk/follow_udp.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/utf8_entities.h"
#include "old-gtk-compat.h"

0
gtk/conversations_table.h → ui/gtk/conversations_table.h
View File

4
gtk/conversations_tcpip.c → ui/gtk/conversations_tcpip.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_tr.c → ui/gtk/conversations_tr.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_udpip.c → ui/gtk/conversations_udpip.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

4
gtk/conversations_usb.c → ui/gtk/conversations_usb.c
View File

@ -39,8 +39,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)

4
gtk/conversations_wlan.c → ui/gtk/conversations_wlan.c
View File

@ -40,8 +40,8 @@
#include "../stat_menu.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"
static int
wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)

20
gtk/dcerpc_stat.c → ui/gtk/dcerpc_stat.c
View File

@ -47,17 +47,17 @@
#include "../stat_menu.h"
#include "../simple_dialog.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/filter_dlg.h"
#include "gtk/stock_icons.h"
#include "gtk/service_response_time_table.h"
#include "gtk/gtkglobals.h"
#include "gtk/main.h"
#include "gtk/filter_autocomplete.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/service_response_time_table.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/main.h"
#include "ui/gtk/filter_autocomplete.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* used to keep track of the statistics for an entire program interface */
typedef struct _dcerpcstat_t {

10
gtk/decode_as_ber.c → ui/gtk/decode_as_ber.c
View File

@ -34,11 +34,11 @@
#include "../simple_dialog.h"
#include "gtk/decode_as_dlg.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/decode_as_dcerpc.h"
#include "gtk/decode_as_ber.h"
#include "ui/gtk/decode_as_dlg.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/decode_as_dcerpc.h"
#include "ui/gtk/decode_as_ber.h"
/**************************************************/

0
gtk/decode_as_ber.h → ui/gtk/decode_as_ber.h
View File

8
gtk/decode_as_dcerpc.c → ui/gtk/decode_as_dcerpc.c
View File

@ -34,10 +34,10 @@
#include "../simple_dialog.h"
#include "gtk/decode_as_dlg.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/decode_as_dcerpc.h"
#include "ui/gtk/decode_as_dlg.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/decode_as_dcerpc.h"
/**************************************************/

0
gtk/decode_as_dcerpc.h → ui/gtk/decode_as_dcerpc.h
View File

14
gtk/decode_as_dlg.c → ui/gtk/decode_as_dlg.c
View File

@ -43,13 +43,13 @@
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/decode_as_dlg.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/decode_as_dcerpc.h"
#include "gtk/decode_as_ber.h"
#include "gtk/help_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/decode_as_dlg.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/decode_as_dcerpc.h"
#include "ui/gtk/decode_as_ber.h"
#include "ui/gtk/help_dlg.h"
#include "utf8_entities.h"
#undef DEBUG

0
gtk/decode_as_dlg.h → ui/gtk/decode_as_dlg.h
View File

14
gtk/dfilter_expr_dlg.c → ui/gtk/dfilter_expr_dlg.c
View File

@ -49,14 +49,14 @@
#include "../simple_dialog.h"
#include "gtk/main.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/proto_dlg.h"
#include "gtk/filter_dlg.h"
#include "gtk/dfilter_expr_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/proto_dlg.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/dfilter_expr_dlg.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
#define E_DFILTER_EXPR_TREE_KEY "dfilter_expr_tree"
#define E_DFILTER_EXPR_CURRENT_VAR_KEY "dfilter_expr_current_var"

0
gtk/dfilter_expr_dlg.h → ui/gtk/dfilter_expr_dlg.h
View File

14
gtk/diameter_stat.c → ui/gtk/diameter_stat.c
View File

@ -47,14 +47,14 @@
#include "../file.h"
#include "../stat_menu.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/service_response_time_table.h"
#include "gtk/tap_param_dlg.h"
#include "gtk/gtkglobals.h"
#include "gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/service_response_time_table.h"
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/main.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* used to keep track of the statistics for an entire program interface */
typedef struct _diameterstat_t {

6
gtk/dissector_tables_dlg.c → ui/gtk/dissector_tables_dlg.c
View File

@ -36,9 +36,9 @@
#include <epan/packet.h>
#include <gtk/gtk.h>
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/dissector_tables_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/dissector_tables_dlg.h"
static GtkWidget *dissector_tables_dlg_w = NULL;

0
gtk/dissector_tables_dlg.h → ui/gtk/dissector_tables_dlg.h
View File

8
gtk/dlg_utils.c → ui/gtk/dlg_utils.c
View File

@ -30,10 +30,10 @@
#include <gtk/gtk.h>
#include "gtk/gtkglobals.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/stock_icons.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/stock_icons.h"
#include "epan/filesystem.h"

0
gtk/dlg_utils.h → ui/gtk/dlg_utils.h
View File

0
gtk/doxygen.cfg.in → ui/gtk/doxygen.cfg.in
View File

14
gtk/drag_and_drop.c → ui/gtk/drag_and_drop.c
View File

@ -43,16 +43,16 @@
#include "../capture.h"
#endif
#include "gtk/gtkglobals.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/drag_and_drop.h"
#include "gtk/main.h"
#include "gtk/menus.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/drag_and_drop.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
#ifdef HAVE_LIBPCAP
#include "gtk/capture_globals.h"
#include "ui/gtk/capture_globals.h"
#endif
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_GTKOSXAPPLICATION
#include <igemacintegration/gtkosxapplication.h>

0
gtk/drag_and_drop.h → ui/gtk/drag_and_drop.h
View File

22
gtk/expert_comp_dlg.c → ui/gtk/expert_comp_dlg.c
View File

@ -42,17 +42,17 @@
#include "../simple_dialog.h"
#include "../stat_menu.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/expert_comp_table.h"
#include "gtk/gui_stat_menu.h"
#include "gtk/help_dlg.h"
#include "gtk/expert_comp_dlg.h"
#include "gtk/stock_icons.h"
#include "gtk/main.h"
#include "gtk/expert_indicators.h"
#include "gtk/main_proto_draw.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/expert_comp_table.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/expert_comp_dlg.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/main.h"
#include "ui/gtk/expert_indicators.h"
#include "ui/gtk/main_proto_draw.h"
#include "ui/gtk/old-gtk-compat.h"
enum
{

0
gtk/expert_comp_dlg.h → ui/gtk/expert_comp_dlg.h
View File

22
gtk/expert_comp_table.c → ui/gtk/expert_comp_table.c
View File

@ -43,18 +43,18 @@
#include "../simple_dialog.h"
#include "gtk/expert_comp_table.h"
#include "gtk/filter_utils.h"
#include "gtk/find_dlg.h"
#include "gtk/color_dlg.h"
#include "gtk/main.h"
#include "gtk/gui_utils.h"
#include "gtk/gtkglobals.h"
#include "gtk/webbrowser.h"
#include "gtk/stock_icons.h"
#include "gtk/utf8_entities.h"
#include "ui/gtk/expert_comp_table.h"
#include "ui/gtk/filter_utils.h"
#include "ui/gtk/find_dlg.h"
#include "ui/gtk/color_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/webbrowser.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/utf8_entities.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
const char *packet = "Packet:";

0
gtk/expert_comp_table.h → ui/gtk/expert_comp_table.h
View File

0
gtk/expert_indicators.h → ui/gtk/expert_indicators.h
View File

14
gtk/export_object.c → ui/gtk/export_object.c
View File

@ -46,13 +46,13 @@
#include <../simple_dialog.h>
#include <wsutil/file_util.h>
#include <gtk/dlg_utils.h>
#include <gtk/file_dlg.h>
#include <gtk/gui_utils.h>
#include <gtk/help_dlg.h>
#include <gtk/main.h>
#include <gtk/stock_icons.h>
#include "gtk/export_object.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/export_object.h"
#include <string.h>
enum {

0
gtk/export_object.h → ui/gtk/export_object.h
View File

2
gtk/export_object_dicom.c → ui/gtk/export_object_dicom.c
View File

@ -38,7 +38,7 @@
#include <epan/packet.h>
#include <epan/tap.h>
#include "gtk/export_object.h"
#include "ui/gtk/export_object.h"
static int
eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,

2
gtk/export_object_http.c → ui/gtk/export_object_http.c
View File

@ -35,7 +35,7 @@
#include <epan/dissectors/packet-http.h>
#include <epan/tap.h>
#include "gtk/export_object.h"
#include "ui/gtk/export_object.h"
static int

2
gtk/export_object_smb.c → ui/gtk/export_object_smb.c
View File

@ -38,7 +38,7 @@
#include <epan/dissectors/packet-smb.h>
#include <epan/tap.h>
#include "gtk/export_object.h"
#include "ui/gtk/export_object.h"
/* These flags show what kind of data the object contains

26
gtk/export_sslkeys.c → ui/gtk/export_sslkeys.c
View File

@ -64,19 +64,19 @@
#include "../progress_dlg.h"
#include "../ui_util.h"
#include "gtk/keys.h"
#include "gtk/color_utils.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/packet_win.h"
#include "gtk/file_dlg.h"
#include "gtk/gui_utils.h"
#include "gtk/gtkglobals.h"
#include "gtk/font_utils.h"
#include "gtk/webbrowser.h"
#include "gtk/main.h"
#include "gtk/menus.h"
#include "gtk/recent.h"
#include "gtk/export_sslkeys.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/color_utils.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/packet_win.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/webbrowser.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
#include "ui/gtk/recent.h"
#include "ui/gtk/export_sslkeys.h"
#ifdef _WIN32
#include <gdk/gdkwin32.h>

0
gtk/export_sslkeys.h → ui/gtk/export_sslkeys.h
View File

14
gtk/fc_stat.c → ui/gtk/fc_stat.c
View File

@ -47,14 +47,14 @@
#include "../file.h"
#include "../stat_menu.h"
#include "gtk/gui_utils.h"
#include "gtk/dlg_utils.h"
#include "gtk/service_response_time_table.h"
#include "gtk/tap_param_dlg.h"
#include "gtk/gtkglobals.h"
#include "gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/service_response_time_table.h"
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/main.h"
#include "gtk/old-gtk-compat.h"
#include "ui/gtk/old-gtk-compat.h"
/* used to keep track of the statistics for an entire program interface */
typedef struct _fcstat_t {

8
gtk/file_dlg.c → ui/gtk/file_dlg.c
View File

@ -32,10 +32,10 @@
#include <wsutil/file_util.h>
#include "gtk/gtkglobals.h"
#include "gtk/gui_utils.h"
#include "gtk/file_dlg.h"
#include "gtk/keys.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/keys.h"
static gchar *last_open_dir = NULL;

0
gtk/file_dlg.h → ui/gtk/file_dlg.h
View File

20
gtk/file_import_dlg.c → ui/gtk/file_import_dlg.c
View File

@ -46,17 +46,17 @@
#include "simple_dialog.h"
#include "alert_box.h"
#include "gtk/gtkglobals.h"
#include "gtk/stock_icons.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/file_dlg.h"
#include "gtk/capture_file_dlg.h"
#include "gtk/help_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/help_dlg.h"
#include "gtk/file_import_dlg.h"
#include "gtk/text_import.h"
#include "gtk/text_import_scanner.h"
#include "ui/gtk/file_import_dlg.h"
#include "ui/gtk/text_import.h"
#include "ui/gtk/text_import_scanner.h"
#include "file.h"
#include "wsutil/file_util.h"

Some files were not shown because too many files have changed in this diff Show More