diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-09-05 11:17:17 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-09-17 20:04:28 +0000 |
commit | 7e638057089bb9d599cd35d4673aef70e0ae58a1 (patch) | |
tree | ce2f546bac9c6c8bcac74b0d5ba0424ddefad0ca /ui/qt/conversation_dialog.h | |
parent | 478fab5206bf30a639ec9ba71edff2fb6ec2cad4 (diff) |
Qt: Add the "Map" button to the Endpoints dialog.
Move the map creation code from ui/gtk/hostlist_table.c to
ui/traffic_table_ui.c.
Add CMake commands to copy ipmap.html to the run directory so that
WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure
if they're entirely correct but they appear to work.
Add boundary checkes to geoip_db_lookup_ipv[46].
To do:
- It looks like there are prettier maps and newer APIs that we
might want to use.
Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966
Reviewed-on: https://code.wireshark.org/review/4011
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/conversation_dialog.h')
-rw-r--r-- | ui/qt/conversation_dialog.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/qt/conversation_dialog.h b/ui/qt/conversation_dialog.h index cfff90e9ee..e32e1e3c91 100644 --- a/ui/qt/conversation_dialog.h +++ b/ui/qt/conversation_dialog.h @@ -68,7 +68,6 @@ signals: void openTcpStreamGraph(int graph_type); private: - QList<QAction> conv_actions_; QPushButton *follow_bt_; QPushButton *graph_bt_; |