aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/manage_interfaces_dialog.cpp
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-02-23 18:01:16 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-23 18:01:42 +0000
commit03f9912772af3dfa16b3cbed01d9b770c7a577f1 (patch)
tree8c5f9d352acf629e3224b3fb1a2d84ab7f560a75 /ui/qt/manage_interfaces_dialog.cpp
parentfd75aa2f3d8a6571ee23005a1f657040f4127d3a (diff)
Qt: add OS interface description to 'Manage Local Interfaces' window
In case the user did not provide a custom name for the interface, display the OS description in the 'Comment' column as how it is done in GTK UI. Bug: 12156 Change-Id: If9da58980169df3eaf25f74e7b81676cbc4f6ebd Reviewed-on: https://code.wireshark.org/review/14095 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui/qt/manage_interfaces_dialog.cpp')
-rw-r--r--ui/qt/manage_interfaces_dialog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 5a3e263b5c..9cdae345d7 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -342,9 +342,11 @@ void ManageInterfacesDialog::showLocalInterfaces()
if (comment) {
item->setText(col_l_comment_, comment);
g_free(comment);
+ } else if (device.if_info.vendor_description) {
+ item->setText(col_l_comment_, device.if_info.vendor_description);
}
} else {
- continue;
+ continue;
}
}
g_free(pr_descr);