diff options
| -rw-r--r-- | file.c | 1 | ||||
| -rw-r--r-- | ui/packet_list_utils.h | 20 | ||||
| -rw-r--r-- | ui/recent.c | 1 | ||||
| -rw-r--r-- | ui/recent_utils.h | 6 | ||||
| -rw-r--r-- | ui/time_shift.c | 2 | ||||
| -rw-r--r-- | ui/ws_ui_util.h | 11 |
6 files changed, 23 insertions, 18 deletions
@@ -55,6 +55,7 @@ #include "ui/progress_dlg.h" #include "ui/urls.h" #include "ui/ws_ui_util.h" +#include "ui/packet_list_utils.h" /* Needed for addrinfo */ #include <sys/types.h> diff --git a/ui/packet_list_utils.h b/ui/packet_list_utils.h index 3b846772ec..ce495e1c44 100644 --- a/ui/packet_list_utils.h +++ b/ui/packet_list_utils.h @@ -36,6 +36,26 @@ gboolean right_justify_column (gint col, capture_file *cf); */ gboolean resolve_column (gint col, capture_file *cf); +/** + * @brief The following methods have to be implemented by any class that + * whishes to represent a packet list. + */ + +/** Write all packet list geometry values to the recent file. + * + * @param rf recent file handle from caller + */ +extern void packet_list_recent_write_all(FILE *rf); + +extern void packet_list_clear(void); +extern void packet_list_freeze(void); +extern void packet_list_recreate_visible_rows(void); +extern void packet_list_thaw(void); +extern guint packet_list_append(column_info *cinfo, frame_data *fdata); +extern void packet_list_queue_draw(void); +extern gboolean packet_list_select_row_from_data(frame_data *fdata_needle); +extern gboolean packet_list_multi_select_active(void); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ui/recent.c b/ui/recent.c index c59d67da81..6db4ddf46e 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -25,6 +25,7 @@ #include "ui/last_open_dir.h" #include "ui/recent.h" #include "ui/recent_utils.h" +#include "ui/packet_list_utils.h" #include "ui/simple_dialog.h" #include <wsutil/file_util.h> diff --git a/ui/recent_utils.h b/ui/recent_utils.h index 9ede640b2a..711f80d1f1 100644 --- a/ui/recent_utils.h +++ b/ui/recent_utils.h @@ -46,12 +46,6 @@ extern gboolean dfilter_combo_add_recent(const gchar *dftext); */ extern void dfilter_recent_combo_write_all(FILE *rf); -/** Write all packet list geometry values to the recent file. - * - * @param rf recent file handle from caller - */ -extern void packet_list_recent_write_all(FILE *rf); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ui/time_shift.c b/ui/time_shift.c index e0bf0b0615..e54aa21db6 100644 --- a/ui/time_shift.c +++ b/ui/time_shift.c @@ -17,7 +17,7 @@ #include "time_shift.h" -#include "ui/ws_ui_util.h" +#include "ui/packet_list_utils.h" #define SHIFT_POS 0 #define SHIFT_NEG 1 diff --git a/ui/ws_ui_util.h b/ui/ws_ui_util.h index e0aad987b7..e8d9fd9f51 100644 --- a/ui/ws_ui_util.h +++ b/ui/ws_ui_util.h @@ -50,17 +50,6 @@ typedef gboolean (*pipe_input_cb_t) (gint source, gpointer user_data); /* install callback function, called if pipe input is available */ extern void pipe_input_set_handler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb); -/* packet_list.c */ - -void packet_list_clear(void); -void packet_list_freeze(void); -void packet_list_recreate_visible_rows(void); -void packet_list_thaw(void); -guint packet_list_append(column_info *cinfo, frame_data *fdata); -void packet_list_queue_draw(void); -gboolean packet_list_select_row_from_data(frame_data *fdata_needle); -gboolean packet_list_multi_select_active(void); - /* XXX - Yes this isn't the best place, but they are used by file_dlg_win32.c, which is supposed to be GUI independent, but has lots of GTK leanings. But if you put these in a GTK UI header file, file_dlg_win32.c complains about all of the GTK structures also in the header |