diff options
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/capture_dlg.c | 3 | ||||
| -rw-r--r-- | ui/gtk/capture_if_dlg.c | 8 | ||||
| -rw-r--r-- | ui/gtk/prefs_capture.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 0a2f9fd1f2..c5d404ba41 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -3352,7 +3352,8 @@ add_pipe_cb(gpointer w _U_) device.active_dlt = -1; device.locked = FALSE; device.if_info.name = g_strdup(g_save_file); - device.if_info.description = NULL; + device.if_info.friendly_name = NULL; + device.if_info.vendor_description = NULL; device.if_info.addrs = NULL; device.if_info.loopback = FALSE; #if defined(HAVE_PCAP_CREATE) diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index c8f299f3ed..e22b54ae64 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -745,16 +745,16 @@ capture_if_refresh_if_list(void) data.descr_lb = gtk_label_new(user_descr); g_free (user_descr); } else { - if (device.if_info.description) - data.descr_lb = gtk_label_new(device.if_info.description); + if (device.if_info.vendor_description) + data.descr_lb = gtk_label_new(device.if_info.vendor_description); else data.descr_lb = gtk_label_new(""); } gtk_misc_set_alignment(GTK_MISC(data.descr_lb), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(if_tb), data.descr_lb, 4, 5, row, row+1); - if (device.if_info.description) { + if (device.if_info.vendor_description) { g_string_append(if_tool_str, "Description: "); - g_string_append(if_tool_str, device.if_info.description); + g_string_append(if_tool_str, device.if_info.vendor_description); g_string_append(if_tool_str, "\n"); } diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index 1baa8ad611..47560acc8c 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -1353,9 +1353,9 @@ ifopts_options_add(GtkListStore *list_store, if_info_t *if_info) /* set device name text */ text[0] = g_strdup(if_info->name); - /* set OS description */ - if (if_info->description != NULL) - text[1] = g_strdup(if_info->description); + /* set vendor description */ + if (if_info->vendor_description != NULL) + text[1] = g_strdup(if_info->vendor_description); else text[1] = g_strdup(""); |