aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2012-09-04 02:35:25 +0000
committerJörg Mayer <jmayer@loplof.de>2012-09-04 02:35:25 +0000
commit12a0aa484957651b221bf0ec83fa2963a48941c5 (patch)
treee7940e11e2934d966ab19187871583f9091b9f80
parent380fe63a6d9a02a53a12baa4a25e4a31934f8178 (diff)
- Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list
- Replace new_packet_list_ -> packet_list_ svn path=/trunk/; revision=44765
-rw-r--r--color_filters.c2
-rw-r--r--file.c58
-rw-r--r--recent.c2
-rw-r--r--ui/gtk/capture_file_dlg.c10
-rw-r--r--ui/gtk/color_dlg.c6
-rw-r--r--ui/gtk/compare_stat.c2
-rw-r--r--ui/gtk/edit_packet_comment_dlg.c4
-rw-r--r--ui/gtk/font_utils.c2
-rw-r--r--ui/gtk/goto_dlg.c4
-rw-r--r--ui/gtk/main.c32
-rw-r--r--ui/gtk/main_menubar.c76
-rw-r--r--ui/gtk/main_toolbar.c2
-rw-r--r--ui/gtk/packet_list.c200
-rw-r--r--ui/gtk/packet_list.h52
-rw-r--r--ui/gtk/packet_list_store.c14
-rw-r--r--ui/gtk/packet_list_store.h10
-rw-r--r--ui/gtk/prefs_column.c2
-rw-r--r--ui/gtk/prefs_gui.c2
-rw-r--r--ui/gtk/time_shift_dlg.c8
-rw-r--r--ui/gtk/uat_gui.c2
-rw-r--r--ui/gtk/voip_calls.c2
-rw-r--r--ui/qt/monospace_font.cpp2
-rw-r--r--ui/qt/packet_list.cpp32
-rw-r--r--ui/recent_utils.h2
-rw-r--r--ui/ui_util.h34
25 files changed, 281 insertions, 281 deletions
diff --git a/color_filters.c b/color_filters.c
index 3d2c2b7dfe..5c83cb59cc 100644
--- a/color_filters.c
+++ b/color_filters.c
@@ -411,7 +411,7 @@ tmp_color_filters_used(void)
void
color_filters_enable(gboolean enable)
{
- new_packet_list_enable_color(enable);
+ packet_list_enable_color(enable);
}
diff --git a/file.c b/file.c
index 7ed4328dbd..ea05108b18 100644
--- a/file.c
+++ b/file.c
@@ -244,7 +244,7 @@ cf_timestamp_auto_precision(capture_file *cf)
"command-line-specified" format. */
for (i = 0; i < cf->cinfo.num_cols; i++) {
if (col_has_time_fmt(&cf->cinfo, i)) {
- new_packet_list_resize_column(i);
+ packet_list_resize_column(i);
}
}
}
@@ -341,7 +341,7 @@ cf_open(capture_file *cf, const char *fname, gboolean is_tempfile, int *err)
/* Adjust timestamp precision if auto is selected, col width will be adjusted */
cf_timestamp_auto_precision(cf);
/* XXX needed ? */
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
fileset_file_opened(fname);
if (cf->cd_t == WTAP_FILE_BER) {
@@ -433,9 +433,9 @@ cf_reset_state(capture_file *cf)
cf->linktypes = NULL;
/* Clear the packet list. */
- new_packet_list_freeze();
- new_packet_list_clear();
- new_packet_list_thaw();
+ packet_list_freeze();
+ packet_list_clear();
+ packet_list_thaw();
cf->f_datalen = 0;
nstime_set_zero(&cf->elapsed_time);
@@ -564,7 +564,7 @@ cf_read(capture_file *cf, gboolean reloading)
progbar_val = 0.0f;
/* The packet list window will be empty until the file is completly loaded */
- new_packet_list_freeze();
+ packet_list_freeze();
stop_flag = FALSE;
g_get_current_time(&start_time);
@@ -672,7 +672,7 @@ cf_read(capture_file *cf, gboolean reloading)
cf->current_frame = frame_data_sequence_find(cf->frames, cf->first_displayed);
cf->current_row = 0;
- new_packet_list_thaw();
+ packet_list_thaw();
if (reloading)
cf_callback_invoke(cf_cb_file_reload_finished, cf);
else
@@ -681,7 +681,7 @@ cf_read(capture_file *cf, gboolean reloading)
/* If we have any displayed packets to select, select the first of those
packets by making the first row the selected row. */
if (cf->first_displayed != 0) {
- new_packet_list_select_first_row();
+ packet_list_select_first_row();
}
if (stop_flag) {
@@ -787,9 +787,9 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
*err = 0;
- new_packet_list_check_end();
+ packet_list_check_end();
/* Don't freeze/thaw the list when doing live capture */
- /*new_packet_list_freeze();*/
+ /*packet_list_freeze();*/
/*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: %u new: %u", cf->count, to_read);*/
@@ -840,17 +840,17 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
cf->count, cf->state, *err);*/
/* Don't freeze/thaw the list when doing live capture */
- /*new_packet_list_thaw();*/
+ /*packet_list_thaw();*/
/* With the new packet list the first packet
* isn't automatically selected.
*/
if (!cf->current_frame)
- new_packet_list_select_first_row();
+ packet_list_select_first_row();
/* moving to the end of the packet list - if the user requested so and
we have some new packets. */
if (newly_displayed_packets && auto_scroll_live && cf->count != 0)
- new_packet_list_moveto_end();
+ packet_list_moveto_end();
if (cf->state == FILE_READ_ABORTED) {
/* Well, the user decided to exit Wireshark. Return CF_READ_ABORTED
@@ -903,9 +903,9 @@ cf_finish_tail(capture_file *cf, int *err)
return CF_READ_ERROR;
}
- new_packet_list_check_end();
+ packet_list_check_end();
/* Don't freeze/thaw the list when doing live capture */
- /*new_packet_list_freeze();*/
+ /*packet_list_freeze();*/
while ((wtap_read(cf->wth, err, &err_info, &data_offset))) {
if (cf->state == FILE_READ_ABORTED) {
@@ -923,7 +923,7 @@ cf_finish_tail(capture_file *cf, int *err)
}
/* Don't freeze/thaw the list when doing live capture */
- /*new_packet_list_thaw();*/
+ /*packet_list_thaw();*/
if (cf->state == FILE_READ_ABORTED) {
/* Well, the user decided to abort the read. We're only called
@@ -936,7 +936,7 @@ cf_finish_tail(capture_file *cf, int *err)
}
if (auto_scroll_live && cf->count != 0)
- new_packet_list_moveto_end();
+ packet_list_moveto_end();
/* We're done reading sequentially through the file. */
cf->state = FILE_READ_DONE;
@@ -1145,7 +1145,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
if (add_to_packet_list) {
/* We fill the needed columns from new_packet_list */
- row = new_packet_list_append(cinfo, fdata, &edt.pi);
+ row = packet_list_append(cinfo, fdata, &edt.pi);
}
if (fdata->flags.passed_dfilter || fdata->flags.ref_time)
@@ -1799,7 +1799,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
/* Freeze the packet list while we redo it, so we don't get any
screen updates while it happens. */
- new_packet_list_freeze();
+ packet_list_freeze();
if (redissect) {
/* We need to re-initialize all the state information that protocols
@@ -1818,7 +1818,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
/* We need to redissect the packets so we have to discard our old
* packet list store. */
- new_packet_list_clear();
+ packet_list_clear();
add_to_packet_list = TRUE;
}
@@ -1991,12 +1991,12 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
/* Unfreeze the packet list. */
if (!add_to_packet_list)
- new_packet_list_recreate_visible_rows();
+ packet_list_recreate_visible_rows();
/* Compute the time it took to filter the file */
compute_elapsed(&start_time);
- new_packet_list_thaw();
+ packet_list_thaw();
if (selected_frame_num == -1) {
/* The selected frame didn't pass the filter. */
@@ -2044,9 +2044,9 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
/* Set to invalid to force update of packet list and packet details */
cf->current_row = -1;
if (selected_frame_num == 0) {
- new_packet_list_select_first_row();
+ packet_list_select_first_row();
}else{
- if (!new_packet_list_select_row_from_data(selected_frame)) {
+ if (!packet_list_select_row_from_data(selected_frame)) {
/* We didn't find a row corresponding to this frame.
This means that the frame isn't being displayed currently,
so we can't select it. */
@@ -3566,7 +3566,7 @@ find_packet(capture_file *cf,
if (new_fd != NULL) {
/* Find and select */
cf->search_in_progress = TRUE;
- found = new_packet_list_select_row_from_data(new_fd);
+ found = packet_list_select_row_from_data(new_fd);
cf->search_in_progress = FALSE;
cf->search_pos = 0; /* Reset the position */
if (!found) {
@@ -3602,7 +3602,7 @@ cf_goto_frame(capture_file *cf, guint fnumber)
return FALSE; /* we failed to go to that packet */
}
- if (!new_packet_list_select_row_from_data(fdata)) {
+ if (!packet_list_select_row_from_data(fdata)) {
/* We didn't find a row corresponding to this frame.
This means that the frame isn't being displayed currently,
so we can't select it. */
@@ -3618,7 +3618,7 @@ gboolean
cf_goto_top_frame(void)
{
/* Find and select */
- new_packet_list_select_first_row();
+ packet_list_select_first_row();
return TRUE; /* we got to that packet */
}
@@ -3626,7 +3626,7 @@ gboolean
cf_goto_bottom_frame(void)
{
/* Find and select */
- new_packet_list_select_last_row();
+ packet_list_select_last_row();
return TRUE; /* we got to that packet */
}
@@ -3660,7 +3660,7 @@ cf_select_packet(capture_file *cf, int row)
frame_data *fdata;
/* Get the frame data struct pointer for this frame */
- fdata = new_packet_list_get_row_data(row);
+ fdata = packet_list_get_row_data(row);
if (fdata == NULL) {
/* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when
diff --git a/recent.c b/recent.c
index c0fdc2fc8b..5981321f1a 100644
--- a/recent.c
+++ b/recent.c
@@ -382,7 +382,7 @@ write_profile_recent(void)
fprintf(rf, "\n# Packet list column pixel widths.\n");
fprintf(rf, "# Each pair of strings consists of a column format and its pixel width.\n");
- new_packet_list_recent_write_all(rf);
+ packet_list_recent_write_all(rf);
if (get_last_open_dir() != NULL) {
fprintf(rf, "\n# Last directory navigated to in File Open dialog.\n");
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 0341fa6809..46310f3912 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -677,8 +677,8 @@ file_merge_cmd(GtkWidget *w)
{
#ifdef USE_WIN32_FILE_DIALOGS
win32_merge_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)));
- new_packet_list_freeze();
- new_packet_list_thaw();
+ packet_list_freeze();
+ packet_list_thaw();
#else /* USE_WIN32_FILE_DIALOGS */
GtkWidget *file_merge_w;
GtkWidget *main_hb, *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *filter_hbox,
@@ -1387,7 +1387,7 @@ do_file_save(capture_file *cf, gboolean dont_reopen)
If we discarded comments, redraw the packet list to reflect
any packets that no longer have comments. */
if (discard_comments)
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
break;
case CF_WRITE_ERROR:
@@ -1628,7 +1628,7 @@ do_file_save_as(capture_file *cf, gboolean must_support_comments,
cf, must_support_comments, dont_reopen)) {
/* They discarded comments, so redraw the packet details window
to reflect any packets that no longer have comments. */
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
#else /* USE_WIN32_FILE_DIALOGS */
GtkWidget *file_save_as_w;
@@ -1747,7 +1747,7 @@ do_file_save_as(capture_file *cf, gboolean must_support_comments,
If we discarded comments, redraw the packet list to reflect
any packets that no longer have comments. */
if (discard_comments)
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
return;
case CF_WRITE_ERROR:
diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c
index d6589d1624..fd6749afac 100644
--- a/ui/gtk/color_dlg.c
+++ b/ui/gtk/color_dlg.c
@@ -783,7 +783,7 @@ create_new_color_filter(GtkButton *button, const char *filter)
/* Use the default background and foreground colors as the colors. */
#if GTK_CHECK_VERSION(3,0,0)
- context = gtk_widget_get_style_context (new_packet_list_get_widget());
+ context = gtk_widget_get_style_context (packet_list_get_widget());
gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
"background-color", &rgba_bg_color,
NULL);
@@ -796,7 +796,7 @@ create_new_color_filter(GtkButton *button, const char *filter)
gdk_rgba_free (rgba_fg_color);
#else
- style = gtk_widget_get_style(new_packet_list_get_widget());
+ style = gtk_widget_get_style(packet_list_get_widget());
gdkcolor_to_color_t(&bg_color, &style->base[GTK_STATE_NORMAL]);
gdkcolor_to_color_t(&fg_color, &style->text[GTK_STATE_NORMAL]);
#endif
@@ -1041,7 +1041,7 @@ color_apply_cb(GtkButton *button _U_, gpointer user_data _U_)
color_filters_apply(color_filter_tmp_list, color_filter_edit_list);
/* colorize list */
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
}
/* User pressed the "Save" button: save the color filters to the
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index b2cd31b34d..2016d1aef2 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -606,7 +606,7 @@ comparestat_draw(void *arg)
g_string_printf(filter_str, "%s %s %s %s", "eth.dst==", ep_address_to_str(&cs->eth_dst), "|| eth.dst==", ep_address_to_str(&cs->eth_src));
}
color_filters_set_tmp(COLOR_N, filter_str->str, FALSE);
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
/* Variance */
cs->stats.variance=compare_variance;
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 2000c37b40..020696f8bd 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -66,7 +66,7 @@ pkt_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
/*g_warning("The new comment is '%s'",new_packet_comment);*/
- new_packet_list_update_packet_comment(new_packet_comment);
+ packet_list_update_packet_comment(new_packet_comment);
window_destroy(edit_or_add_pkt_comment_dlg);
@@ -132,7 +132,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
/* Get the comment */
- opt_comment = new_packet_list_get_packet_comment();
+ opt_comment = packet_list_get_packet_comment();
/*g_warning("Fetched comment '%s'",opt_comment);*/
if(opt_comment){
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index a89104b513..2223b546af 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -241,7 +241,7 @@ user_font_apply(void) {
}
/* the font(s) seem to be ok */
- new_packet_list_set_font(new_r_font);
+ packet_list_set_font(new_r_font);
set_ptree_font_all(new_r_font);
old_r_font = m_r_font;
set_fonts(new_r_font);
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index a8f7213cec..8f22a9f1e1 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -161,12 +161,12 @@ goto_bottom_frame_cb(GtkWidget *w _U_, gpointer d _U_)
void
goto_next_frame_cb(GtkWidget *w _U_, gpointer d _U_)
{
- new_packet_list_next();
+ packet_list_next();
}
void
goto_previous_frame_cb(GtkWidget *w _U_, gpointer d _U_)
{
- new_packet_list_prev();
+ packet_list_prev();
}
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index f9fcbe7569..c3384d827b 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -365,7 +365,7 @@ colorize_selected_ptree_cb(GtkWidget *w _U_, gpointer data _U_, guint8 filt_nr)
} else {
color_filters_set_tmp(filt_nr,filter, FALSE);
}
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
}
}
}
@@ -535,12 +535,12 @@ GList *
get_ip_address_list_from_packet_list_row(gpointer data)
{
gint row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_ROW_KEY));
- gint column = new_packet_list_get_column_id (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_COL_KEY)));
+ gint column = packet_list_get_column_id (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_COL_KEY)));
gint col;
frame_data *fdata;
GList *addr_list = NULL;
- fdata = (frame_data *) new_packet_list_get_row_data(row);
+ fdata = (frame_data *) packet_list_get_row_data(row);
if (fdata != NULL) {
epan_dissect_t edt;
@@ -576,11 +576,11 @@ static gchar *
get_filter_from_packet_list_row_and_column(gpointer data)
{
gint row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_ROW_KEY));
- gint column = new_packet_list_get_column_id (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_COL_KEY)));
+ gint column = packet_list_get_column_id (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_COL_KEY)));
frame_data *fdata;
gchar *buf=NULL;
- fdata = (frame_data *) new_packet_list_get_row_data(row);
+ fdata = (frame_data *) packet_list_get_row_data(row);
if (fdata != NULL) {
epan_dissect_t edt;
@@ -709,12 +709,12 @@ set_frame_reftime(gboolean set, frame_data *frame, gint row) {
}
cf_reftime_packets(&cfile);
if (!frame->flags.ref_time && !frame->flags.passed_dfilter) {
- new_packet_list_freeze();
+ packet_list_freeze();
cfile.displayed_count--;
- new_packet_list_recreate_visible_rows();
- new_packet_list_thaw();
+ packet_list_recreate_visible_rows();
+ packet_list_thaw();
}
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
@@ -725,7 +725,7 @@ static void reftime_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_
timestamp_set_type(TS_RELATIVE);
recent.gui_time_format = TS_RELATIVE;
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
break;
case(ESD_BTN_NO):
break;
@@ -895,7 +895,7 @@ void apply_as_custom_column_cb (GtkWidget *widget _U_, gpointer data _U_)
column_prefs_add_custom(COL_CUSTOM, cfile.finfo_selected->hfinfo->name,
cfile.finfo_selected->hfinfo->abbrev,0);
/* Recreate the packet list according to new preferences */
- new_packet_list_recreate ();
+ packet_list_recreate ();
if (!prefs.gui_use_pref_save) {
prefs_main_write();
}
@@ -1426,7 +1426,7 @@ main_colorize_changed(gboolean packet_list_colorize)
if(packet_list_colorize != recent.packet_list_colorize) {
recent.packet_list_colorize = packet_list_colorize;
color_filters_enable(packet_list_colorize);
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
}
}
@@ -3713,10 +3713,10 @@ static gboolean
top_level_key_pressed_cb(GtkWidget *w _U_, GdkEventKey *event, gpointer user_data _U_)
{
if (event->keyval == GDK_F8) {
- new_packet_list_next();
+ packet_list_next();
return TRUE;
} else if (event->keyval == GDK_F7) {
- new_packet_list_prev();
+ packet_list_prev();
return TRUE;
} else if (event->state & NO_SHIFT_MOD_MASK) {
return FALSE; /* Skip control, alt, and other modifiers */
@@ -3782,7 +3782,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
filter_tb = filter_toolbar_new();
/* Packet list */
- pkt_scrollw = new_packet_list_create();
+ pkt_scrollw = packet_list_create();
gtk_widget_set_size_request(pkt_scrollw, -1, pl_size);
gtk_widget_show_all(pkt_scrollw);
@@ -3972,7 +3972,7 @@ void change_configuration_profile (const gchar *profile_name)
welcome_if_panel_reload();
/* Recreate the packet list according to new preferences */
- new_packet_list_recreate ();
+ packet_list_recreate ();
cfile.columns_changed = FALSE; /* Reset value */
user_font_apply();
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index ad819bdc90..2ffd39108c 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -386,7 +386,7 @@ colorize_conversation_cb(GtkAction *action _U_, gpointer data _U_, int action_nu
if( (action_num>>8) == 255 ) {
color_filters_reset_tmp();
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
} else if (cfile.current_frame) {
if( (action_num&0xff) == 0 ) {
/* colorize_conversation_cb was called from the window-menu
@@ -415,7 +415,7 @@ colorize_conversation_cb(GtkAction *action _U_, gpointer data _U_, int action_nu
} else {
/* Set one of the temporary coloring filters */
color_filters_set_tmp((guint8)(action_num>>8),filter,FALSE);
- new_packet_list_colorize_packets();
+ packet_list_colorize_packets();
}
g_free(filter);
@@ -600,7 +600,7 @@ timestamp_seconds_time_cb(GtkAction *action _U_, gpointer user_data _U_)
/* This call adjusts column width */
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
static void
@@ -614,7 +614,7 @@ timestamp_format_new_cb (GtkRadioAction *action, GtkRadioAction *current _U_, gp
recent.gui_time_format = value;
/* This call adjusts column width */
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
}
@@ -626,7 +626,7 @@ timestamp_precision_new_cb (GtkRadioAction *action, GtkRadioAction *current _U_,
value = gtk_radio_action_get_current_value (action);
if (recent.gui_time_precision != value) {
- /* the actual precision will be set in new_packet_list_queue_draw() below */
+ /* the actual precision will be set in packet_list_queue_draw() below */
if (value == TS_PREC_AUTO) {
timestamp_set_precision(TS_PREC_AUTO_SEC);
} else {
@@ -635,7 +635,7 @@ timestamp_precision_new_cb (GtkRadioAction *action, GtkRadioAction *current _U_,
recent.gui_time_precision = value;
/* This call adjusts column width */
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
}
@@ -1495,21 +1495,21 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Edit/FindNext", NULL, "Find Ne_xt", "<control>N", NULL, G_CALLBACK(find_next_cb) },
{ "/Edit/FindPrevious", NULL, "Find Pre_vious", "<control>B", NULL, G_CALLBACK(find_previous_cb) },
- { "/Edit/MarkPacket", NULL, "_Mark Packet (toggle)", "<control>M", NULL, G_CALLBACK(new_packet_list_mark_frame_cb) },
- { "/Edit/ToggleMarkingOfAllDisplayedPackets", NULL, "Toggle Marking Of All Displayed Packets", "<shift><alt><control>M", NULL, G_CALLBACK(new_packet_list_toggle_mark_all_displayed_frames_cb) },
- { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets", "<shift><control>M", NULL, G_CALLBACK(new_packet_list_mark_all_displayed_frames_cb) },
- { "/Edit/UnmarkAllDisplayedPackets", NULL, "_Unmark All Displayed Packets", "<alt><control>M", NULL, G_CALLBACK(new_packet_list_unmark_all_displayed_frames_cb) },
+ { "/Edit/MarkPacket", NULL, "_Mark Packet (toggle)", "<control>M", NULL, G_CALLBACK(packet_list_mark_frame_cb) },
+ { "/Edit/ToggleMarkingOfAllDisplayedPackets", NULL, "Toggle Marking Of All Displayed Packets", "<shift><alt><control>M", NULL, G_CALLBACK(packet_list_toggle_mark_all_displayed_frames_cb) },
+ { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets", "<shift><control>M", NULL, G_CALLBACK(packet_list_mark_all_displayed_frames_cb) },
+ { "/Edit/UnmarkAllDisplayedPackets", NULL, "_Unmark All Displayed Packets", "<alt><control>M", NULL, G_CALLBACK(packet_list_unmark_all_displayed_frames_cb) },
{ "/Edit/FindNextMark", NULL, "Find Next Mark", "<shift><control>N", NULL, G_CALLBACK(find_next_mark_cb) },
{ "/Edit/FindPreviousMark", NULL, "Find Previous Mark", "<shift><control>B", NULL, G_CALLBACK(find_prev_mark_cb) },
- { "/Edit/IgnorePacket", NULL, "_Ignore Packet (toggle)", "<control>X", NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) },
+ { "/Edit/IgnorePacket", NULL, "_Ignore Packet (toggle)", "<control>X", NULL, G_CALLBACK(packet_list_ignore_frame_cb) },
/*
* XXX - this next one overrides /Edit/Copy/Description
*/
- { "/Edit/IgnoreAllDisplayedPackets", NULL, "_Ignore All Displayed Packets (toggle)","<alt><shift><control>X", NULL, G_CALLBACK(new_packet_list_ignore_all_displayed_frames_cb) },
- { "/Edit/Un-IgnoreAllPackets", NULL, "U_n-Ignore All Packets", "<shift><control>X", NULL, G_CALLBACK(new_packet_list_unignore_all_frames_cb) },
+ { "/Edit/IgnoreAllDisplayedPackets", NULL, "_Ignore All Displayed Packets (toggle)","<alt><shift><control>X", NULL, G_CALLBACK(packet_list_ignore_all_displayed_frames_cb) },
+ { "/Edit/Un-IgnoreAllPackets", NULL, "U_n-Ignore All Packets", "<shift><control>X", NULL, G_CALLBACK(packet_list_unignore_all_frames_cb) },
{ "/Edit/SetTimeReference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", "<control>T", NULL, G_CALLBACK(set_reftime_cb) },
- { "/Edit/Un-TimeReferenceAllPackets",NULL, "Un-Time Reference All Packets", "<alt><control>T", NULL, G_CALLBACK(new_packet_list_untime_reference_all_frames_cb) },
+ { "/Edit/Un-TimeReferenceAllPackets",NULL, "Un-Time Reference All Packets", "<alt><control>T", NULL, G_CALLBACK(packet_list_untime_reference_all_frames_cb) },
{ "/Edit/FindNextTimeReference", NULL, "Find Next Time Reference", "<alt><control>N", NULL, G_CALLBACK(find_next_ref_time_cb) },
{ "/Edit/FindPreviousTimeReference", NULL, "Find Previous Time Reference", "<alt><control>B", NULL, G_CALLBACK(find_previous_ref_time_cb) },
{ "/Edit/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", "<shift><control>T", NULL, G_CALLBACK(time_shift_cb) },
@@ -1528,7 +1528,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/View/ZoomIn", GTK_STOCK_ZOOM_IN, "_Zoom In", "<control>plus", NULL, G_CALLBACK(view_zoom_in_cb) },
{ "/View/ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "<control>minus", NULL, G_CALLBACK(view_zoom_out_cb) },
{ "/View/NormalSize", GTK_STOCK_ZOOM_100, "_Normal Size", "<control>equal", NULL, G_CALLBACK(view_zoom_100_cb) },
- { "/View/ResizeAllColumns", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", "<shift><control>R", NULL, G_CALLBACK(new_packet_list_resize_columns_cb) },
+ { "/View/ResizeAllColumns", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", "<shift><control>R", NULL, G_CALLBACK(packet_list_resize_columns_cb) },
{ "/View/DisplayedColumns", NULL, "Displayed Columns", NULL, NULL, NULL },
{ "/View/ExpandSubtrees", NULL, "E_xpand Subtrees", "<shift>Right", NULL, G_CALLBACK(expand_tree_cb) },
{ "/View/ExpandAll", NULL, "_Expand All", "<control>Right", NULL, G_CALLBACK(expand_all_cb) },
@@ -1808,21 +1808,21 @@ static void
sort_ascending_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortAscending");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING);
}
static void
sort_descending_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortDescending");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING);
}
static void
no_sorting_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/NoSorting");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE);
}
static void
@@ -1830,28 +1830,28 @@ packet_list_heading_show_resolved_cb(GtkAction *action _U_, gpointer user_data _
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ShowResolved");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED);
}
static void
packet_list_heading_align_left_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignLeft");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT);
}
static void
packet_list_heading_align_center_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignCenter");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER);
}
static void
packet_list_heading_align_right_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignRight");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT);
}
static void
@@ -1865,34 +1865,34 @@ static void
packet_list_heading_resize_col_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ResizeColumn");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE);
}
static void
packet_list_heading_change_col_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/EditColumnDetails");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE);
}
static void
packet_list_heading_activate_all_columns_cb(GtkAction *action _U_, gpointer user_data _U_)
{
- new_packet_list_set_all_columns_visible ();
+ packet_list_set_all_columns_visible ();
}
static void
packet_list_heading_hide_col_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/HideColumn");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE);
}
static void
packet_list_heading_remove_col_cb(GtkAction *action _U_, gpointer user_data)
{
GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/RemoveColumn");
- new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE);
+ packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE);
}
static void
@@ -2445,13 +2445,13 @@ packet_list_menu_color_conv_cba_new_rule_cb(GtkAction *action, gpointer user_dat
static void
packet_list_menu_copy_sum_txt(GtkAction *action _U_, gpointer user_data)
{
- new_packet_list_copy_summary_cb(user_data, CS_TEXT);
+ packet_list_copy_summary_cb(user_data, CS_TEXT);
}
static void
packet_list_menu_copy_sum_csv(GtkAction *action _U_, gpointer user_data)
{
- new_packet_list_copy_summary_cb(user_data, CS_CSV);
+ packet_list_copy_summary_cb(user_data, CS_CSV);
}
static void
@@ -2781,8 +2781,8 @@ static const GtkActionEntry apply_prepare_filter_action_entries[] = {
static const GtkActionEntry packet_list_menu_popup_action_entries[] = {
- { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) },
- { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) },
+ { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(packet_list_mark_frame_cb) },
+ { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(packet_list_ignore_frame_cb) },
{ "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) },
{ "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) },
{ "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) },
@@ -4438,7 +4438,7 @@ name_resolution_cb(GtkWidget *w, gpointer d _U_, gboolean* res_flag)
*res_flag = FALSE;
}
- new_packet_list_recreate();
+ packet_list_recreate();
redraw_packet_bytes_all();
}
@@ -4565,8 +4565,8 @@ menu_recent_read_finished(void) {
timestamp_set_type(recent.gui_time_format);
/* This call adjusts column width */
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
- /* the actual precision will be set in new_packet_list_queue_draw() below */
+ packet_list_queue_draw();
+ /* the actual precision will be set in packet_list_queue_draw() below */
if (recent.gui_time_precision == TS_PREC_AUTO) {
timestamp_set_precision(TS_PREC_AUTO_SEC);
} else {
@@ -4574,7 +4574,7 @@ menu_recent_read_finished(void) {
}
/* This call adjusts column width */
cf_timestamp_auto_precision(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
/* don't change the seconds format, if we had a command line value */
if (timestamp_get_seconds_type() != TS_SECONDS_NOT_SET) {
@@ -4628,12 +4628,12 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
if (widget == g_object_get_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_KEY) &&
((GdkEventButton *)event)->button != 1) {
gint physical_row;
- if (new_packet_list_get_event_row_column((GdkEventButton *)event, &physical_row, &row, &column)) {
+ if (packet_list_get_event_row_column((GdkEventButton *)event, &physical_row, &row, &column)) {
g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_ROW_KEY,
GINT_TO_POINTER(row));
g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_COL_KEY,
GINT_TO_POINTER(column));
- new_packet_list_set_selected_row(row);
+ packet_list_set_selected_row(row);
}
}
@@ -5372,7 +5372,7 @@ rebuild_protocol_prefs_menu (module_t *prefs_module_p, gboolean preferences)
static void
menu_visible_column_toggle (GtkWidget *w _U_, gpointer data)
{
- new_packet_list_toggle_visible_column (GPOINTER_TO_INT(data));
+ packet_list_toggle_visible_column (GPOINTER_TO_INT(data));
}
void
diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index 8508f775f7..36eb6b54e7 100644
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -376,7 +376,7 @@ toolbar_new(void)
GTK_STOCK_ZOOM_100, "Zoom 100%", view_zoom_100_cb, NULL);
toolbar_item(resize_columns_button, main_tb,
- WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", new_packet_list_resize_columns_cb, NULL);
+ WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", packet_list_resize_columns_cb, NULL);
toolbar_append_separator(main_tb);
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index 07433bdcce..f73f1df553 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -90,8 +90,8 @@ static gulong column_changed_handler_id;
static GtkWidget *create_view_and_model(void);
static void scroll_to_and_select_iter(GtkTreeModel *model, GtkTreeSelection *selection, GtkTreeIter *iter);
-static void new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_);
-static void new_packet_list_double_click_cb(GtkTreeView *treeview,
+static void packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_);
+static void packet_list_double_click_cb(GtkTreeView *treeview,
GtkTreePath *path _U_,
GtkTreeViewColumn *col _U_,
gpointer userdata _U_);
@@ -103,10 +103,10 @@ static void show_cell_data_func(GtkTreeViewColumn *col,
static gint row_number_from_iter(GtkTreeIter *iter);
static void scroll_to_current(void);
-void new_packet_list_set_sel_browse(gboolean val, gboolean force_set);
+void packet_list_set_sel_browse(gboolean val, gboolean force_set);
GtkWidget *
-new_packet_list_create(void)
+packet_list_create(void)
{
GtkWidget *view, *scrollwin;
@@ -114,7 +114,7 @@ new_packet_list_create(void)
view = create_view_and_model();
- new_packet_list_set_sel_browse(prefs.gui_plist_sel_browse, FALSE);
+ packet_list_set_sel_browse(prefs.gui_plist_sel_browse, FALSE);
gtk_container_add(GTK_CONTAINER(scrollwin), view);
@@ -125,7 +125,7 @@ new_packet_list_create(void)
/** @todo XXX - implement a smarter solution for recreating the packet list */
void
-new_packet_list_recreate(void)
+packet_list_recreate(void)
{
g_signal_handler_block(packetlist->view, column_changed_handler_id);
gtk_widget_destroy(pkt_scrollw);
@@ -134,7 +134,7 @@ new_packet_list_recreate(void)
build_column_format_array(&cfile.cinfo, prefs.num_cols, FALSE);
- pkt_scrollw = new_packet_list_create();
+ pkt_scrollw = packet_list_create();
gtk_widget_show_all(pkt_scrollw);
main_widgets_rearrange();
@@ -144,7 +144,7 @@ new_packet_list_recreate(void)
}
guint
-new_packet_list_append(column_info *cinfo _U_, frame_data *fdata, packet_info *pinfo _U_)
+packet_list_append(column_info *cinfo _U_, frame_data *fdata, packet_info *pinfo _U_)
{
/* fdata should be filled with the stuff we need
* strings are built at display time.
@@ -281,10 +281,10 @@ col_title_change_ok (GtkWidget *w, gpointer parent_w)
rebuild_visible_columns_menu ();
if (recreate) {
- new_packet_list_recreate();
+ packet_list_recreate();
}
- new_packet_list_resize_column (col_id);
+ packet_list_resize_column (col_id);
window_destroy(GTK_WIDGET(parent_w));
}
@@ -445,7 +445,7 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col)
* is not completed (i.e., stopped), then the sort request is aborted.
*/
static void
-new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order, gboolean sort_indicator)
+packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order, gboolean sort_indicator)
{
GtkTreeViewColumn *prev_col;
@@ -477,7 +477,7 @@ new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType or
* having empty sorting arrow widgets in the column header.
*/
static void
-new_packet_list_column_clicked_cb (GtkTreeViewColumn *col, gpointer user_data _U_)
+packet_list_column_clicked_cb (GtkTreeViewColumn *col, gpointer user_data _U_)
{
GtkSortType order = gtk_tree_view_column_get_sort_order (col);
gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY));
@@ -486,11 +486,11 @@ new_packet_list_column_clicked_cb (GtkTreeViewColumn *col, gpointer user_data _U
return;
if (!gtk_tree_view_column_get_sort_indicator(col)) {
- new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
+ packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
} else if (order == GTK_SORT_ASCENDING) {
- new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
+ packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
} else {
- new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
+ packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
}
}
@@ -523,7 +523,7 @@ get_xalign_value (gchar xalign, gboolean right_justify)
}
static void
-new_packet_list_xalign_column (gint col_id, GtkTreeViewColumn *col, gchar xalign)
+packet_list_xalign_column (gint col_id, GtkTreeViewColumn *col, gchar xalign)
{
GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(col));
gboolean right_justify = right_justify_column(col_id);
@@ -550,7 +550,7 @@ new_packet_list_xalign_column (gint col_id, GtkTreeViewColumn *col, gchar xalign
}
static void
-new_packet_list_set_visible_column (gint col_id, GtkTreeViewColumn *col, gboolean visible)
+packet_list_set_visible_column (gint col_id, GtkTreeViewColumn *col, gboolean visible)
{
gtk_tree_view_column_set_visible(col, visible);
set_column_visible(col_id, visible);
@@ -564,16 +564,16 @@ new_packet_list_set_visible_column (gint col_id, GtkTreeViewColumn *col, gboolea
}
void
-new_packet_list_toggle_visible_column (gint col_id)
+packet_list_toggle_visible_column (gint col_id)
{
GtkTreeViewColumn *col =
gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id);
- new_packet_list_set_visible_column (col_id, col, get_column_visible(col_id) ? FALSE : TRUE);
+ packet_list_set_visible_column (col_id, col, get_column_visible(col_id) ? FALSE : TRUE);
}
void
-new_packet_list_set_all_columns_visible (void)
+packet_list_set_all_columns_visible (void)
{
GtkTreeViewColumn *col;
int col_id;
@@ -593,7 +593,7 @@ new_packet_list_set_all_columns_visible (void)
}
static void
-new_packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_)
+packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_)
{
column_prefs_remove(col_id);
@@ -601,11 +601,11 @@ new_packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_)
prefs_main_write();
}
- new_packet_list_recreate();
+ packet_list_recreate();
}
static void
-new_packet_list_toggle_resolved (GtkWidget *w, gint col_id)
+packet_list_toggle_resolved (GtkWidget *w, gint col_id)
{
/* We have to check for skip-update because we get an emit in menus_set_column_resolved() */
if (g_object_get_data(G_OBJECT(w), "skip-update") == NULL) {
@@ -615,12 +615,12 @@ new_packet_list_toggle_resolved (GtkWidget *w, gint col_id)
prefs_main_write();
}
- new_packet_list_recreate();
+ packet_list_recreate();
}
}
void
-new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SELECTED_E action)
+packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SELECTED_E action)
{
GtkTreeViewColumn *col = (GtkTreeViewColumn *)
g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY);
@@ -628,40 +628,40 @@ new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SEL
switch (action) {
case COLUMN_SELECTED_SORT_ASCENDING:
- new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
+ packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
break;
case COLUMN_SELECTED_SORT_DESCENDING:
- new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
+ packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
break;
case COLUMN_SELECTED_SORT_NONE:
- new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
+ packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
break;
case COLUMN_SELECTED_TOGGLE_RESOLVED:
- new_packet_list_toggle_resolved (w, col_id);
+ packet_list_toggle_resolved (w, col_id);
break;
case COLUMN_SELECTED_ALIGN_LEFT:
- new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_LEFT);
+ packet_list_xalign_column (col_id, col, COLUMN_XALIGN_LEFT);
break;
case COLUMN_SELECTED_ALIGN_CENTER:
- new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_CENTER);
+ packet_list_xalign_column (col_id, col, COLUMN_XALIGN_CENTER);
break;
case COLUMN_SELECTED_ALIGN_RIGHT:
- new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_RIGHT);
+ packet_list_xalign_column (col_id, col, COLUMN_XALIGN_RIGHT);
break;
case COLUMN_SELECTED_ALIGN_DEFAULT:
- new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_DEFAULT);
+ packet_list_xalign_column (col_id, col, COLUMN_XALIGN_DEFAULT);
break;
case COLUMN_SELECTED_RESIZE:
- new_packet_list_resize_column (col_id);
+ packet_list_resize_column (col_id);
break;
case COLUMN_SELECTED_CHANGE:
col_details_edit_dlg (col_id, col);
break;
case COLUMN_SELECTED_HIDE:
- new_packet_list_set_visible_column (col_id, col, FALSE);
+ packet_list_set_visible_column (col_id, col, FALSE);
break;
case COLUMN_SELECTED_REMOVE:
- new_packet_list_remove_column (col_id, col);
+ packet_list_remove_column (col_id, col);
break;
default:
g_assert_not_reached();
@@ -670,7 +670,7 @@ new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SEL
}
static gboolean
-new_packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
+packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
{
GtkWidget *col = (GtkWidget *) data;
GtkWidget *menu = g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_COL_KEY);
@@ -718,7 +718,7 @@ column_dnd_changed_cb(GtkTreeView *tree_view, gpointer data _U_)
prefs_main_write();
}
- new_packet_list_recreate();
+ packet_list_recreate();
}
static GtkWidget *
@@ -733,16 +733,16 @@ create_view_and_model(void)
gint col_min_width;
gchar *escaped_title;
- packetlist = new_packet_list_new();
+ packetlist = packet_list_new();
packetlist->view = tree_view_new(GTK_TREE_MODEL(packetlist));
gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(packetlist->view),
TRUE);
g_signal_connect(packetlist->view, "cursor-changed",
- G_CALLBACK(new_packet_list_select_cb), NULL);
+ G_CALLBACK(packet_list_select_cb), NULL);
g_signal_connect(packetlist->view, "row-activated",
- G_CALLBACK(new_packet_list_double_click_cb), NULL);
+ G_CALLBACK(packet_list_double_click_cb), NULL);
g_signal_connect(packetlist->view, "button_press_event", G_CALLBACK(popup_menu_handler),
g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY));
column_changed_handler_id = g_signal_connect(packetlist->view, "columns-changed", G_CALLBACK(column_dnd_changed_cb), NULL);
@@ -802,7 +802,7 @@ create_view_and_model(void)
gtk_tree_view_column_set_reorderable(col, TRUE); /* XXX - Should this be saved in the prefs? */
g_object_set_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY, GINT_TO_POINTER(i));
- g_signal_connect(col, "clicked", G_CALLBACK(new_packet_list_column_clicked_cb), NULL);
+ g_signal_connect(col, "clicked", G_CALLBACK(packet_list_column_clicked_cb), NULL);
/*
* The column can't be adjusted to a size smaller than this
@@ -839,7 +839,7 @@ create_view_and_model(void)
gtk_widget_set_tooltip_text(gtk_tree_view_column_get_button(col), tooltip_text);
g_free(tooltip_text);
g_signal_connect(gtk_tree_view_column_get_button(col), "button_press_event",
- G_CALLBACK(new_packet_list_column_button_pressed_cb), col);
+ G_CALLBACK(packet_list_column_button_pressed_cb), col);
if (i == 0) { /* Default sort on first column */
g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY, col);
@@ -853,7 +853,7 @@ create_view_and_model(void)
}
static frame_data *
-new_packet_list_get_record(GtkTreeModel *model, GtkTreeIter *iter)
+packet_list_get_record(GtkTreeModel *model, GtkTreeIter *iter)
{
frame_data *fdata;
/* The last column is reserved for frame_data */
@@ -868,20 +868,20 @@ new_packet_list_get_record(GtkTreeModel *model, GtkTreeIter *iter)
}
void
-new_packet_list_clear(void)
+packet_list_clear(void)
{
packet_history_clear();
- new_packet_list_store_clear(packetlist);
+ packet_list_store_clear(packetlist);
gtk_widget_queue_draw(packetlist->view);
/* XXX is this correct in all cases?
* Reset the sort column, use packetlist as model in case the list is frozen.
*/
- new_packet_list_sort_column(0, NULL, GTK_SORT_ASCENDING, FALSE);
+ packet_list_sort_column(0, NULL, GTK_SORT_ASCENDING, FALSE);
}
void
-new_packet_list_freeze(void)
+packet_list_freeze(void)
{
/* So we don't lose the model by the time we want to thaw it */
g_object_ref(packetlist);
@@ -891,24 +891,24 @@ new_packet_list_freeze(void)
}
void
-new_packet_list_thaw(void)
+packet_list_thaw(void)
{
/* Apply model */
gtk_tree_view_set_model( GTK_TREE_VIEW(packetlist->view), GTK_TREE_MODEL(packetlist));
- /* Remove extra reference added by new_packet_list_freeze() */
+ /* Remove extra reference added by packet_list_freeze() */
g_object_unref(packetlist);
packets_bar_update();
}
void
-new_packet_list_recreate_visible_rows(void)
+packet_list_recreate_visible_rows(void)
{
- packet_list_recreate_visible_rows(packetlist);
+ packet_list_recreate_visible_rows_list(packetlist);
}
-void new_packet_list_resize_column(gint col)
+void packet_list_resize_column(gint col)
{
GtkTreeViewColumn *column;
gint col_width;
@@ -924,7 +924,7 @@ void new_packet_list_resize_column(gint col)
}
static void
-new_packet_list_resize_columns(void)
+packet_list_resize_columns(void)
{
gint progbar_loop_max;
gint progbar_loop_var;
@@ -932,13 +932,13 @@ new_packet_list_resize_columns(void)
progbar_loop_max = cfile.cinfo.num_cols;
for (progbar_loop_var = 0; progbar_loop_var < progbar_loop_max; ++progbar_loop_var)
- new_packet_list_resize_column(progbar_loop_var);
+ packet_list_resize_column(progbar_loop_var);
}
void
-new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_)
+packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_)
{
- new_packet_list_resize_columns();
+ packet_list_resize_columns();
}
static void
@@ -962,7 +962,7 @@ scroll_to_current(void)
}
void
-new_packet_list_next(void)
+packet_list_next(void)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
@@ -985,7 +985,7 @@ new_packet_list_next(void)
}
void
-new_packet_list_prev(void)
+packet_list_prev(void)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
@@ -1034,7 +1034,7 @@ scroll_to_and_select_iter(GtkTreeModel *model, GtkTreeSelection *selection, GtkT
0.5, /* row_align determines where the row is placed, 0.5 means center */
0); /* The horizontal alignment of the column */
- /* "cursor-changed" signal triggers new_packet_list_select_cb() */
+ /* "cursor-changed" signal triggers packet_list_select_cb() */
/* which will update the middle and bottom panes. */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(packetlist->view),
path,
@@ -1045,7 +1045,7 @@ scroll_to_and_select_iter(GtkTreeModel *model, GtkTreeSelection *selection, GtkT
}
void
-new_packet_list_select_first_row(void)
+packet_list_select_first_row(void)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
@@ -1058,7 +1058,7 @@ new_packet_list_select_first_row(void)
}
void
-new_packet_list_select_last_row(void)
+packet_list_select_last_row(void)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
@@ -1076,7 +1076,7 @@ new_packet_list_select_last_row(void)
}
void
-new_packet_list_moveto_end(void)
+packet_list_moveto_end(void)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
@@ -1105,7 +1105,7 @@ new_packet_list_moveto_end(void)
}
gboolean
-new_packet_list_check_end(void)
+packet_list_check_end(void)
{
gboolean at_end = FALSE;
GtkAdjustment *adj;
@@ -1135,7 +1135,7 @@ new_packet_list_check_end(void)
* row, return FALSE, otherwise return TRUE.
*/
gboolean
-new_packet_list_select_row_from_data(frame_data *fdata_needle)
+packet_list_select_row_from_data(frame_data *fdata_needle)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
@@ -1149,7 +1149,7 @@ new_packet_list_select_row_from_data(frame_data *fdata_needle)
do {
frame_data *fdata;
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
if(fdata == fdata_needle) {
scroll_to_and_select_iter(model, NULL, &iter);
@@ -1162,7 +1162,7 @@ new_packet_list_select_row_from_data(frame_data *fdata_needle)
}
void
-new_packet_list_set_selected_row(gint row)
+packet_list_set_selected_row(gint row)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
@@ -1178,7 +1178,7 @@ new_packet_list_set_selected_row(gint row)
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
gtk_tree_selection_select_iter (selection, &iter);
- /* "cursor-changed" signal triggers new_packet_list_select_cb() */
+ /* "cursor-changed" signal triggers packet_list_select_cb() */
/* which will update the middle and bottom panes. */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(packetlist->view),
path,
@@ -1209,7 +1209,7 @@ row_number_from_iter(GtkTreeIter *iter)
}
static void
-new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_)
+packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
@@ -1245,14 +1245,14 @@ new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_)
}
static void
-new_packet_list_double_click_cb(GtkTreeView *treeview, GtkTreePath *path _U_,
+packet_list_double_click_cb(GtkTreeView *treeview, GtkTreePath *path _U_,
GtkTreeViewColumn *col _U_, gpointer userdata _U_)
{
new_packet_window(GTK_WIDGET(treeview), FALSE);
}
gboolean
-new_packet_list_get_event_row_column(GdkEventButton *event_button,
+packet_list_get_event_row_column(GdkEventButton *event_button,
gint *physical_row, gint *row, gint *column)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
@@ -1277,7 +1277,7 @@ new_packet_list_get_event_row_column(GdkEventButton *event_button,
gtk_tree_path_free(path);
/* Fetch physical row */
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
*physical_row = fdata->num;
/* Fetch column */
@@ -1293,7 +1293,7 @@ new_packet_list_get_event_row_column(GdkEventButton *event_button,
}
frame_data *
-new_packet_list_get_row_data(gint row)
+packet_list_get_row_data(gint row)
{
GtkTreePath *path = gtk_tree_path_new();
GtkTreeIter iter;
@@ -1302,7 +1302,7 @@ new_packet_list_get_row_data(gint row)
gtk_tree_path_append_index(path, row-1);
gtk_tree_model_get_iter(GTK_TREE_MODEL(packetlist), &iter, path);
- fdata = new_packet_list_get_record(GTK_TREE_MODEL(packetlist), &iter);
+ fdata = packet_list_get_record(GTK_TREE_MODEL(packetlist), &iter);
gtk_tree_path_free(path);
@@ -1365,7 +1365,7 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer,
}
void
-new_packet_list_enable_color(gboolean enable)
+packet_list_enable_color(gboolean enable)
{
enable_color = enable;
gtk_widget_queue_draw (packetlist->view);
@@ -1373,7 +1373,7 @@ new_packet_list_enable_color(gboolean enable)
/* Redraw the packet list *and* currently-selected detail */
void
-new_packet_list_queue_draw(void)
+packet_list_queue_draw(void)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
@@ -1390,7 +1390,7 @@ new_packet_list_queue_draw(void)
/* Set the selection mode of the packet list window. */
void
-new_packet_list_set_sel_browse(gboolean val, gboolean force_set)
+packet_list_set_sel_browse(gboolean val, gboolean force_set)
{
GtkSelectionMode new_mode;
/* initialize with a mode we don't use, so that the mode == new_mode
@@ -1429,7 +1429,7 @@ new_packet_list_set_sel_browse(gboolean val, gboolean force_set)
}
void
-new_packet_list_set_font(PangoFontDescription *font)
+packet_list_set_font(PangoFontDescription *font)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_override_font(packetlist->view, font);
@@ -1444,7 +1444,7 @@ static void
mark_frames_ready(void)
{
packets_bar_update();
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
static void
@@ -1457,7 +1457,7 @@ set_frame_mark(gboolean set, frame_data *fdata)
}
void
-new_packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_)
{
GtkTreeModel *model;
GtkTreeSelection *selection;
@@ -1469,7 +1469,7 @@ new_packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_)
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
set_frame_mark(!fdata->flags.marked, fdata);
mark_frames_ready();
@@ -1489,14 +1489,14 @@ mark_all_displayed_frames(gboolean set)
}
void
-new_packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
mark_all_displayed_frames(TRUE);
mark_frames_ready();
}
void
-new_packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
mark_all_displayed_frames(FALSE);
mark_frames_ready();
@@ -1516,7 +1516,7 @@ toggle_mark_all_displayed_frames(void)
}
void
-new_packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
toggle_mark_all_displayed_frames();
mark_frames_ready();
@@ -1533,7 +1533,7 @@ set_frame_ignore(gboolean set, frame_data *fdata)
}
void
-new_packet_list_ignore_frame_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_ignore_frame_cb(GtkWidget *w _U_, gpointer data _U_)
{
GtkTreeModel *model;
GtkTreeSelection *selection;
@@ -1545,7 +1545,7 @@ new_packet_list_ignore_frame_cb(GtkWidget *w _U_, gpointer data _U_)
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
set_frame_ignore(!fdata->flags.ignored, fdata);
redissect_packets();
}
@@ -1566,7 +1566,7 @@ ignore_all_displayed_frames(gboolean set)
}
void
-new_packet_list_ignore_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_ignore_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
if(cfile.displayed_count < cfile.count){
frame_data *fdata;
@@ -1597,7 +1597,7 @@ unignore_all_frames(void)
}
void
-new_packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
unignore_all_frames();
}
@@ -1618,14 +1618,14 @@ untime_reference_all_frames(void)
}
void
-new_packet_list_untime_reference_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+packet_list_untime_reference_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
untime_reference_all_frames();
}
guint
-new_packet_list_get_column_id (gint col_num)
+packet_list_get_column_id (gint col_num)
{
GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW(packetlist->view), col_num);
gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), E_MPACKET_LIST_COL_KEY));
@@ -1634,7 +1634,7 @@ new_packet_list_get_column_id (gint col_num)
}
void
-new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
+packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
{
gint col;
gchar *celltext;
@@ -1664,7 +1664,7 @@ new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
}
}
- gtk_tree_model_get(model, &iter, new_packet_list_get_column_id(col), &celltext, -1);
+ gtk_tree_model_get(model, &iter, packet_list_get_column_id(col), &celltext, -1);
g_string_append(text,celltext);
g_free(celltext);
@@ -1678,7 +1678,7 @@ new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
}
gchar *
-new_packet_list_get_packet_comment(void)
+packet_list_get_packet_comment(void)
{
GtkTreeModel *model;
GtkTreeSelection *selection;
@@ -1690,13 +1690,13 @@ new_packet_list_get_packet_comment(void)
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return NULL;
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
return fdata->opt_comment;
}
void
-new_packet_list_update_packet_comment(gchar *new_packet_comment)
+packet_list_update_packet_comment(gchar *new_packet_comment)
{
GtkTreeModel *model;
@@ -1709,7 +1709,7 @@ new_packet_list_update_packet_comment(gchar *new_packet_comment)
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
- fdata = new_packet_list_get_record(model, &iter);
+ fdata = packet_list_get_record(model, &iter);
/* Check if the comment has changed */
if (fdata->opt_comment) {
@@ -1731,12 +1731,12 @@ new_packet_list_update_packet_comment(gchar *new_packet_comment)
/* Update the main window, as we now have unsaved changes. */
main_update_for_unsaved_changes(&cfile);
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
void
-new_packet_list_recent_write_all(FILE *rf)
+packet_list_recent_write_all(FILE *rf)
{
gint col, width, num_cols, col_fmt;
GtkTreeViewColumn *tree_column;
@@ -1770,7 +1770,7 @@ new_packet_list_recent_write_all(FILE *rf)
}
GtkWidget *
-new_packet_list_get_widget(void)
+packet_list_get_widget(void)
{
g_assert(packetlist);
g_assert(packetlist->view);
@@ -1778,7 +1778,7 @@ new_packet_list_get_widget(void)
}
void
-new_packet_list_colorize_packets(void)
+packet_list_colorize_packets(void)
{
packet_list_reset_colorized(packetlist);
gtk_widget_queue_draw (packetlist->view);
diff --git a/ui/gtk/packet_list.h b/ui/gtk/packet_list.h
index 4140598fab..979def0bfc 100644
--- a/ui/gtk/packet_list.h
+++ b/ui/gtk/packet_list.h
@@ -22,8 +22,8 @@
* USA.
*/
-#ifndef __NEW_PACKET_LIST_H__
-#define __NEW_PACKET_LIST_H__
+#ifndef __PACKET_LIST_H__
+#define __PACKET_LIST_H__
#include <gtk/gtk.h>
@@ -47,77 +47,77 @@ typedef enum {
} COLUMN_SELECTED_E;
/** Create the packet list */
-GtkWidget *new_packet_list_create(void);
+GtkWidget *packet_list_create(void);
/** Recreate the packetr list */
-void new_packet_list_recreate(void);
-void new_packet_list_toggle_visible_column (gint col_id);
-void new_packet_list_set_all_columns_visible (void);
-void new_packet_list_column_menu_cb (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
-void new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
-gboolean new_packet_list_get_event_row_column(GdkEventButton *event_button, gint *physical_row, gint *row, gint *column);
-guint new_packet_list_get_column_id (gint col_num);
+void packet_list_recreate(void);
+void packet_list_toggle_visible_column (gint col_id);
+void packet_list_set_all_columns_visible (void);
+void packet_list_column_menu_cb (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
+void packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
+gboolean packet_list_get_event_row_column(GdkEventButton *event_button, gint *physical_row, gint *row, gint *column);
+guint packet_list_get_column_id (gint col_num);
/** Set the font of the packet list window.
*
* @param font new font
*/
-extern void new_packet_list_set_font(PangoFontDescription *font);
+extern void packet_list_set_font(PangoFontDescription *font);
/** Mark the currently selected packet.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_mark_frame_cb(GtkWidget *widget, gpointer data);
+extern void packet_list_mark_frame_cb(GtkWidget *widget, gpointer data);
/** Toggle Mark on all displayed packets.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** Mark all displayed packets.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** UnMark all packets in the capture.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** Ignore the currently selected packet.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_ignore_frame_cb(GtkWidget *widget, gpointer data);
+extern void packet_list_ignore_frame_cb(GtkWidget *widget, gpointer data);
/** Ignore/Unignore all displayed packets.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_ignore_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_ignore_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** Un-ignore all packets in the list.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** Un-Time Reference all packets in the capture.
*
* @param widget parent widget (unused)
* @param data unused
*/
-extern void new_packet_list_untime_reference_all_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void packet_list_untime_reference_all_frames_cb(GtkWidget *w _U_, gpointer data _U_);
/** Different modes of copying summary data */
typedef enum {
@@ -131,13 +131,13 @@ typedef enum {
* @param data Not used.
* @param copy_type Mode in which to copy data (e.g. tab-separated, CSV)
*/
-void new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
+void packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
-gchar *new_packet_list_get_packet_comment(void);
-void new_packet_list_update_packet_comment(gchar *new_packet_comment);
+gchar *packet_list_get_packet_comment(void);
+void packet_list_update_packet_comment(gchar *new_packet_comment);
-GtkWidget * new_packet_list_get_widget(void);
-void new_packet_list_colorize_packets(void);
+GtkWidget * packet_list_get_widget(void);
+void packet_list_colorize_packets(void);
/** Set the selection mode of the packet list window.
*
@@ -145,6 +145,6 @@ void new_packet_list_colorize_packets(void);
* @param force_set TRUE to force setting of the selection mode even if it
* was already set (used within packet_list_recreate).
*/
-extern void new_packet_list_set_sel_browse(gboolean val, gboolean force_set);
+extern void packet_list_set_sel_browse(gboolean val, gboolean force_set);
-#endif /* __NEW_PACKET_LIST_H__ */
+#endif /* __PACKET_LIST_H__ */
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 3e9c696414..3a6e0ff15c 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -272,7 +272,7 @@ packet_list_init(PacketList *packet_list)
}
packet_list->n_text_cols = j;
-#ifdef NEW_PACKET_LIST_STATISTICS
+#ifdef PACKET_LIST_STATISTICS
packet_list->const_strings = 0;
#endif
}
@@ -576,7 +576,7 @@ packet_list_iter_parent(GtkTreeModel *tree_model _U_, GtkTreeIter *iter _U_,
}
PacketList *
-new_packet_list_new(void)
+packet_list_new(void)
{
PacketList *newpacketlist;
@@ -605,7 +605,7 @@ packet_list_row_deleted(PacketList *packet_list, guint pos)
#endif
void
-new_packet_list_store_clear(PacketList *packet_list)
+packet_list_store_clear(PacketList *packet_list)
{
g_return_if_fail(packet_list != NULL);
g_return_if_fail(PACKETLIST_IS_LIST(packet_list));
@@ -629,7 +629,7 @@ new_packet_list_store_clear(PacketList *packet_list)
/* Generate new number */
packet_list->stamp = g_random_int();
-#ifdef NEW_PACKET_LIST_STATISTICS
+#ifdef PACKET_LIST_STATISTICS
g_warning("Const strings: %u", packet_list->const_strings);
packet_list->const_strings = 0;
#endif
@@ -738,7 +738,7 @@ packet_list_change_record(PacketList *packet_list, PacketListRecord *record, gin
/* This is a constant string, so we don't have to copy it */
record->col_text[text_col] = (gchar *) cinfo->col_data[col];
record->col_text_len[text_col] = (gushort) col_text_len;
-#ifdef NEW_PACKET_LIST_STATISTICS
+#ifdef PACKET_LIST_STATISTICS
++packet_list->const_strings;
#endif
break;
@@ -753,7 +753,7 @@ packet_list_change_record(PacketList *packet_list, PacketListRecord *record, gin
record->col_text_len[text_col] = (gushort) col_text_len;
if (!record->col_text_len[text_col]) {
record->col_text[text_col] = "";
-#ifdef NEW_PACKET_LIST_STATISTICS
+#ifdef PACKET_LIST_STATISTICS
++packet_list->const_strings;
#endif
break;
@@ -1099,7 +1099,7 @@ packet_list_resort(PacketList *packet_list)
}
guint
-packet_list_recreate_visible_rows(PacketList *packet_list)
+packet_list_recreate_visible_rows_list(PacketList *packet_list)
{
guint phy_idx;
guint vis_idx;
diff --git a/ui/gtk/packet_list_store.h b/ui/gtk/packet_list_store.h
index 0704a99d81..e53dae2f88 100644
--- a/ui/gtk/packet_list_store.h
+++ b/ui/gtk/packet_list_store.h
@@ -23,7 +23,7 @@
*/
/* Uncomment to track some statistics (const strings, etc.) */
-/* #define NEW_PACKET_LIST_STATISTICS */
+/* #define PACKET_LIST_STATISTICS */
#ifndef __PACKET_LIST_STORE_H__
#define __PACKET_LIST_STORE_H__
@@ -80,7 +80,7 @@ struct _PacketList
/** Random integer to check whether an iter belongs to our model. */
gint stamp;
-#ifdef NEW_PACKET_LIST_STATISTICS
+#ifdef PACKET_LIST_STATISTICS
/** Statistics */
guint const_strings;
#endif
@@ -93,9 +93,9 @@ struct _PacketListClass
};
GType packet_list_list_get_type(void);
-PacketList *new_packet_list_new(void);
-void new_packet_list_store_clear(PacketList *packet_list);
-guint packet_list_recreate_visible_rows(PacketList *packet_list);
+PacketList *packet_list_new(void);
+void packet_list_store_clear(PacketList *packet_list);
+guint packet_list_recreate_visible_rows_list(PacketList *packet_list);
gint packet_list_append_record(PacketList *packet_list, frame_data *fdata);
gboolean packet_list_do_packet_list_dissect_and_cache_all(PacketList *packet_list, gint sort_col_id);
void packet_list_reset_colorized(PacketList *packet_list);
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index 5ccf29a34c..836c1313ae 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -797,7 +797,7 @@ column_prefs_apply(GtkWidget *w _U_)
{
/* Redraw the packet list if the columns were changed */
if(cfile.columns_changed) {
- new_packet_list_recreate();
+ packet_list_recreate();
cfile.columns_changed = FALSE; /* Reset value */
}
}
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 6542b1112d..df28f522ed 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -566,7 +566,7 @@ gui_prefs_apply(GtkWidget *w _U_ , gboolean redissect)
toolbar_redraw_all();
set_scrollbar_placement_all();
- new_packet_list_set_sel_browse(prefs.gui_plist_sel_browse, FALSE);
+ packet_list_set_sel_browse(prefs.gui_plist_sel_browse, FALSE);
set_ptree_sel_browse_all(prefs.gui_ptree_sel_browse);
set_tree_styles_all();
main_widgets_rearrange();
diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
index 8cf8314405..803686d4ba 100644
--- a/ui/gtk/time_shift_dlg.c
+++ b/ui/gtk/time_shift_dlg.c
@@ -620,7 +620,7 @@ action_timeshift(GtkWindow *parent_w)
continue; /* Shouldn't happen */
modify_time_perform(fd, neg, &offset, SHIFT_KEEPOFFSET);
}
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
return(0);
}
@@ -754,7 +754,7 @@ action_settime(GtkWindow *parent_w)
modify_time_perform(fd, SHIFT_POS, &difftime, SHIFT_SETTOZERO);
}
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
/*
@@ -892,7 +892,7 @@ action_adjtime(GtkWindow *parent_w _U_)
modify_time_perform(fd, SHIFT_POS, &d3t, SHIFT_SETTOZERO);
}
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
static void
@@ -913,7 +913,7 @@ action_undo(GtkWindow *parent_w _U_)
continue; /* Shouldn't happen */
modify_time_perform(fd, SHIFT_NEG, &nulltime, SHIFT_SETTOZERO);
}
- new_packet_list_queue_draw();
+ packet_list_queue_draw();
}
static void
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index 6cc4f65f26..3cfee08015 100644
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@@ -718,7 +718,7 @@ static void uat_down_cb(GtkButton *button _U_, gpointer u) {
static void uat_apply_changes(uat_t *uat) {
if(uat->flags & UAT_AFFECTS_FIELDS) {
/* Recreate list with new fields and redissect packets */
- new_packet_list_recreate ();
+ packet_list_recreate ();
} else {
if(uat->flags & UAT_AFFECTS_DISSECTION) {
/* Just redissect packets if we have any */
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index b18975f9b7..6e8301fefa 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -358,7 +358,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo _U_, packet_info *
gboolean inserted;
new_gai = g_malloc(sizeof(graph_analysis_item_t));
- new_gai->fd = new_packet_list_get_row_data(frame_num);
+ new_gai->fd = packet_list_get_row_data(frame_num);
COPY_ADDRESS(&(new_gai->src_addr),src_addr);
COPY_ADDRESS(&(new_gai->dst_addr),dst_addr);
diff --git a/ui/qt/monospace_font.cpp b/ui/qt/monospace_font.cpp
index acecc6382c..a1f129d3ca 100644
--- a/ui/qt/monospace_font.cpp
+++ b/ui/qt/monospace_font.cpp
@@ -132,7 +132,7 @@ user_font_apply(void) {
// }
// /* the font(s) seem to be ok */
-// new_packet_list_set_font(new_r_font);
+// packet_list_set_font(new_r_font);
// set_ptree_font_all(new_r_font);
// old_r_font = m_r_font;
// old_b_font = m_b_font;
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 24ad661fc5..3e17b8b373 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -57,7 +57,7 @@
static PacketList *gbl_cur_packet_list = NULL;
guint
-new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo)
+packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo)
{
Q_UNUSED(cinfo);
Q_UNUSED(pinfo);
@@ -75,13 +75,13 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
}
// Copied from ui/gtk/packet_list.c
-void new_packet_list_resize_column(gint col)
+void packet_list_resize_column(gint col)
{
// xxx qtshark
// gint col_width;
// const gchar *long_str;
-g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: new_packet_list_resize_column %d", col);
+g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: packet_list_resize_column %d", col);
// long_str = packet_list_get_widest_column_string(packetlist, col);
// if(!long_str || strcmp("",long_str)==0)
// /* If we get an empty string leave the width unchanged */
@@ -92,7 +92,7 @@ g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: new_packet_list_resize_column %d", col);
}
void
-new_packet_list_select_first_row(void)
+packet_list_select_first_row(void)
{
if (!gbl_cur_packet_list)
return;
@@ -101,7 +101,7 @@ new_packet_list_select_first_row(void)
}
void
-new_packet_list_select_last_row(void)
+packet_list_select_last_row(void)
{
if (!gbl_cur_packet_list)
return;
@@ -115,7 +115,7 @@ new_packet_list_select_last_row(void)
* row, return FALSE, otherwise return TRUE.
*/
gboolean
-new_packet_list_select_row_from_data(frame_data *fdata_needle)
+packet_list_select_row_from_data(frame_data *fdata_needle)
{
int row = gbl_cur_packet_list->packetListModel()->visibleIndexOf(fdata_needle);
if (row >= 0) {
@@ -127,7 +127,7 @@ new_packet_list_select_row_from_data(frame_data *fdata_needle)
}
gboolean
-new_packet_list_check_end(void)
+packet_list_check_end(void)
{
if (gbl_cur_packet_list) {
QScrollBar *sb = gbl_cur_packet_list->verticalScrollBar();
@@ -139,7 +139,7 @@ new_packet_list_check_end(void)
}
void
-new_packet_list_clear(void)
+packet_list_clear(void)
{
if (gbl_cur_packet_list) {
gbl_cur_packet_list->clear();
@@ -147,7 +147,7 @@ new_packet_list_clear(void)
}
void
-new_packet_list_enable_color(gboolean enable)
+packet_list_enable_color(gboolean enable)
{
if (gbl_cur_packet_list && gbl_cur_packet_list->packetListModel()) {
gbl_cur_packet_list->packetListModel()->setColorEnabled(enable);
@@ -156,7 +156,7 @@ new_packet_list_enable_color(gboolean enable)
}
void
-new_packet_list_freeze(void)
+packet_list_freeze(void)
{
if (gbl_cur_packet_list) {
gbl_cur_packet_list->setUpdatesEnabled(false);
@@ -164,7 +164,7 @@ new_packet_list_freeze(void)
}
void
-new_packet_list_thaw(void)
+packet_list_thaw(void)
{
if (gbl_cur_packet_list) {
gbl_cur_packet_list->setUpdatesEnabled(true);
@@ -174,7 +174,7 @@ new_packet_list_thaw(void)
}
void
-new_packet_list_recreate_visible_rows(void)
+packet_list_recreate_visible_rows(void)
{
if (gbl_cur_packet_list && gbl_cur_packet_list->packetListModel()) {
gbl_cur_packet_list->packetListModel()->recreateVisibleRows();
@@ -182,7 +182,7 @@ new_packet_list_recreate_visible_rows(void)
}
frame_data *
-new_packet_list_get_row_data(gint row)
+packet_list_get_row_data(gint row)
{
if (gbl_cur_packet_list && gbl_cur_packet_list->packetListModel()) {
return gbl_cur_packet_list->packetListModel()->getRowFdata(row);
@@ -191,7 +191,7 @@ new_packet_list_get_row_data(gint row)
}
void
-new_packet_list_moveto_end(void)
+packet_list_moveto_end(void)
{
if (gbl_cur_packet_list)
gbl_cur_packet_list->goLastPacket();
@@ -199,14 +199,14 @@ new_packet_list_moveto_end(void)
/* Redraw the packet list *and* currently-selected detail */
void
-new_packet_list_queue_draw(void)
+packet_list_queue_draw(void)
{
if (gbl_cur_packet_list)
gbl_cur_packet_list->updateAll();
}
void
-new_packet_list_recent_write_all(FILE *rf) {
+packet_list_recent_write_all(FILE *rf) {
if (!gbl_cur_packet_list)
return;
diff --git a/ui/recent_utils.h b/ui/recent_utils.h
index 4aad645ca1..2351f23c39 100644
--- a/ui/recent_utils.h
+++ b/ui/recent_utils.h
@@ -101,7 +101,7 @@ extern void window_geom_recent_write_all(gpointer rf);
*
* @param rf recent file handle from caller
*/
-extern void new_packet_list_recent_write_all(FILE *rf);
+extern void packet_list_recent_write_all(FILE *rf);
#ifdef __cplusplus
}
diff --git a/ui/ui_util.h b/ui/ui_util.h
index 0afadca0cc..3d1cd7f656 100644
--- a/ui/ui_util.h
+++ b/ui/ui_util.h
@@ -63,23 +63,23 @@ extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_p
/* packet_list.c */
-void new_packet_list_clear(void);
-void new_packet_list_freeze(void);
-void new_packet_list_recreate_visible_rows(void);
-void new_packet_list_thaw(void);
-void new_packet_list_next(void);
-void new_packet_list_prev(void);
-guint new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo);
-frame_data * new_packet_list_get_row_data(gint row);
-void new_packet_list_set_selected_row(gint row);
-void new_packet_list_enable_color(gboolean enable);
-void new_packet_list_queue_draw(void);
-void new_packet_list_select_first_row(void);
-void new_packet_list_select_last_row(void);
-void new_packet_list_moveto_end(void);
-gboolean new_packet_list_check_end(void);
-gboolean new_packet_list_select_row_from_data(frame_data *fdata_needle);
-void new_packet_list_resize_column(gint col);
+void packet_list_clear(void);
+void packet_list_freeze(void);
+void packet_list_recreate_visible_rows(void);
+void packet_list_thaw(void);
+void packet_list_next(void);
+void packet_list_prev(void);
+guint packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo);
+frame_data * packet_list_get_row_data(gint row);
+void packet_list_set_selected_row(gint row);
+void packet_list_enable_color(gboolean enable);
+void packet_list_queue_draw(void);
+void packet_list_select_first_row(void);
+void packet_list_select_last_row(void);
+void packet_list_moveto_end(void);
+gboolean packet_list_check_end(void);
+gboolean packet_list_select_row_from_data(frame_data *fdata_needle);
+void packet_list_resize_column(gint col);
#ifdef __cplusplus
}