Skip to content

Commit

Permalink
Revert previous commit of Irene, which doesn't work (yet).
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=52814
  • Loading branch information
@tuexen
tuexen committed Oct 24, 2013
1 parent 207cedd commit eec2feb
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 12 deletions.
1 change: 0 additions & 1 deletion ui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ set(COMMON_UI_SRC
preference_utils.c
profile.c
recent.c
sctp_stat.c
ssl_key_export.c
software_update.c
tap-megaco-common.c
Expand Down
2 changes: 0 additions & 2 deletions ui/Makefile.common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ WIRESHARK_UI_SRC = \
preference_utils.c \
profile.c \
recent.c \
sctp_stat.c \
software_update.c \
ssl_key_export.c \
tap-megaco-common.c \
Expand All @@ -82,7 +81,6 @@ noinst_HEADERS = \
progress_dlg.h \
recent.h \
recent_utils.h \
sctp_stat.h \
simple_dialog.h \
software_update.h \
ssl_key_export.h \
Expand Down
1 change: 1 addition & 0 deletions ui/gtk/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ set(WIRESHARK_GTK_SRC
sctp_byte_graph_dlg.c
sctp_error_dlg.c
sctp_graph_dlg.c
sctp_stat.c
service_response_time_table.c
simple_dialog.c
stock_icons.c
Expand Down
2 changes: 2 additions & 0 deletions ui/gtk/Makefile.common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ WIRESHARK_GTK_SRC = \
sctp_byte_graph_dlg.c \
sctp_error_dlg.c \
sctp_graph_dlg.c \
sctp_stat.c \
service_response_time_table.c \
simple_dialog.c \
stock_icons.c \
Expand Down Expand Up @@ -336,6 +337,7 @@ noinst_HEADERS = \
rtp_stream.h \
rtp_stream_dlg.h \
sat.h \
sctp_stat.h \
service_response_time_table.h \
time_shift_dlg.h \
stock_icons.h \
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/main_menubar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
#include "ui/gtk/conversations_table.h"
#include "ui/gtk/hostlist_table.h"
#include "ui/gtk/packet_history.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/firewall_dlg.h"
#include "ui/gtk/macros_dlg.h"
#include "epan/dissectors/packet-ssl-utils.h"
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_assoc_analyse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/gtkglobals.h"

#include "frame_tvbuff.h"
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_byte_graph_dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"

#include "ui/gtk/old-gtk-compat.h"

Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_chunk_stat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "ui/gtk/tap_param_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"


static void sctpstat_init(const char *opt_arg, void *userdata);
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_chunk_stat_dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"

static GtkWidget *clist = NULL;
static GList *last_list = NULL;
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_error_dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/gui_utils.h"

static GtkWidget *sctp_error_dlg=NULL;
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/sctp_graph_dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/old-gtk-compat.h"

Expand Down
2 changes: 1 addition & 1 deletion ui/sctp_stat.c → ui/gtk/sctp_stat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "ui/simple_dialog.h"

#include "ui/gtk/dlg_utils.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/main.h"

#define SCTP_ABORT_CHUNK_T_BIT 0x01
Expand Down
0 ui/sctp_stat.h → ui/gtk/sctp_stat.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ui/gtk/sctp_stat_dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/main.h"
#include "ui/sctp_stat.h"
#include "ui/gtk/sctp_stat.h"
#include "ui/gtk/gtkglobals.h"

#include "ui/gtk/old-gtk-compat.h"
Expand Down

0 comments on commit eec2feb

Please sign in to comment.