diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-12-02 07:32:48 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-12-02 09:57:35 +0000 |
| commit | 631172f2f4046255a78a5628b5499f38054039bb (patch) | |
| tree | 640e725ead042cea2baee469451fe7eb5ce8dfa0 /ui/qt/manage_interfaces_dialog.cpp | |
| parent | 3f3de12a881d2fba2d733fda0b3dad2f025cc0b9 (diff) | |
| download | wireshark-631172f2f4046255a78a5628b5499f38054039bb.tar.gz | |
Qt: Use uniform interface display name
Use common function to generate the interface display name, both
when scanning for interfaces (scan_local_interfaces()) and when
changing Comment in the Manage Interfaces dialog.
Change-Id: I3260208856563aaf387ce397d4ae61bddcc89b4f
Reviewed-on: https://code.wireshark.org/review/12362
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/manage_interfaces_dialog.cpp')
| -rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index 5f1e11ae89..89feac1621 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -389,14 +389,7 @@ void ManageInterfacesDialog::saveLocalCommentChanges(QTreeWidgetItem* item) } g_free(device.display_name); - // XXX The GTK+ UI uses the raw device name instead of the friendly name. - // This seems to make more sense. - gchar *if_string = device.friendly_name ? device.friendly_name : device.name; - if (comment.isEmpty()) { - device.display_name = g_strdup(if_string); - } else { - device.display_name = qstring_strdup(QString("%1: %2").arg(comment).arg(if_string)); - } + device.display_name = get_iface_display_name(comment.toUtf8().constData(), &device.if_info); 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); } |