osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Do not hide the interface name in capture options. 

Fix for bug 8932 reported by tdarnell5.

svn path=/trunk/; revision=50609
This commit is contained in:
Irene Rüngeler 2013-07-15 08:58:32 +00:00
parent 19fcedc185
commit 776c949898
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/gtk/capture_dlg.c
View File

@ -418,7 +418,8 @@ update_visible_tree_view_columns(void)
GtkTreeViewColumn *col;
view = (GtkTreeView *)g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFACE_KEY);
for (col_id = 2; col_id < NUM_COLUMNS; col_id++) {
gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(view), INTERFACE), TRUE);
for (col_id = 3; col_id < NUM_COLUMNS; col_id++) {
col = gtk_tree_view_get_column(GTK_TREE_VIEW(view), col_id);
gtk_tree_view_column_set_visible(col, prefs_capture_options_dialog_column_is_visible(col_index_to_name(col_id))?TRUE:FALSE);
}

23
ui/gtk/prefs_capture.c
View File

@ -120,7 +120,7 @@ static GtkWidget *col_monitor_cb;
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
static GtkWidget *col_buf_cb;
#endif
static GtkWidget *col_interface_cb, *col_snap_cb;
static GtkWidget *col_snap_cb;
static GtkWidget *col_link_cb, *col_filter_cb, *col_pmode_cb;
static void colopts_edit_destroy_cb(GtkWidget *win, gpointer data);
static void colopts_edit_cb(GtkWidget *w, gpointer data);
@ -365,7 +365,7 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
GtkWidget *colopts_edit_dlg, *main_hb, *main_grid,
*ed_opts_fr, *main_vb,
*bbox, *ok_bt, *cancel_bt, *help_bt, *column_lb,
*col_interface_lb, *col_link_lb,
*col_link_lb,
#ifdef HAVE_PCAP_CREATE
*col_monitor_lb,
#endif
@ -420,21 +420,6 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
gtk_widget_show(column_lb);
row++;
/* create "Interface" label and button */
col_interface_cb = gtk_check_button_new();
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_interface_cb, 0, row, 1, 1);
if (!prefs.capture_columns || prefs_capture_options_dialog_column_is_visible("INTERFACE"))
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_interface_cb), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_interface_cb), FALSE);
gtk_widget_show(col_interface_cb);
col_interface_lb = gtk_label_new("Interface name");
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_interface_lb, 1, row, 1, 1);
gtk_misc_set_alignment(GTK_MISC(col_interface_lb), 0, 0.5f);
gtk_widget_show(col_interface_lb);
row++;
/* create "Link Layer" label and button */
col_link_cb = gtk_check_button_new();
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_link_cb, 0, row, 1, 1);
@ -979,9 +964,7 @@ colopts_edit_ok_cb(GtkWidget *w _U_, gpointer parent_w)
{
g_list_free(prefs.capture_columns);
prefs.capture_columns = NULL;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(col_interface_cb))) {
prefs.capture_columns = g_list_append(prefs.capture_columns, g_strdup("INTERFACE"));
}
prefs.capture_columns = g_list_append(prefs.capture_columns, g_strdup("INTERFACE"));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(col_link_cb))) {
prefs.capture_columns = g_list_append(prefs.capture_columns, g_strdup("LINK"));
}