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

The default interface should now be selected also on Windows. 

svn path=/trunk/; revision=48799
This commit is contained in:
Irene Rüngeler 2013-04-09 08:41:01 +00:00
parent c2ced4a2ab
commit afb0e76c8b
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/gtk/main.c
View File

@ -2919,7 +2919,7 @@ main(int argc, char *argv[])
interface_t device;
for (i = 0; i < global_capture_opts.all_ifaces->len; i++) {
device = g_array_index(global_capture_opts.all_ifaces, interface_t, i);
if (!device.hidden && strcmp(device.display_name, prefs.capture_device) == 0) {
if (!device.hidden && strstr(prefs.capture_device, device.name) != NULL) {
device.selected = TRUE;
global_capture_opts.num_selected++;
global_capture_opts.all_ifaces = g_array_remove_index(global_capture_opts.all_ifaces, i);

5
ui/gtk/main_welcome.c
View File

@ -935,11 +935,6 @@ update_capture_box(void)
if (!device.hidden) {
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, ICON, gtk_image_get_pixbuf(GTK_IMAGE(capture_get_if_icon(&device))), IFACE_DESCR, device.display_name, IFACE_NAME, device.name, -1);
if (global_capture_opts.num_selected == 0 && strcmp(device.name, prefs.capture_device) == 0) {
device.selected = TRUE;
global_capture_opts.all_ifaces = g_array_remove_index(global_capture_opts.all_ifaces, i);
g_array_insert_val(global_capture_opts.all_ifaces, i, device);
}
if (device.selected) {
gtk_tree_selection_select_iter(entry, &iter);
}