From 243c09fa06bf7646b577e2baf024106432ec1bd9 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 7 Feb 2017 19:44:19 -0500 Subject: Switch export objects to use wmem_tree_t instead of (sorted) GSList. Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann --- ui/qt/main_window.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ui/qt/main_window.cpp') diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 9e33774057..45479df68d 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1986,10 +1986,10 @@ void MainWindow::initConversationMenus() connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); } -void MainWindow::addExportObjectsMenuItem(gpointer data, gpointer user_data) +gboolean MainWindow::addExportObjectsMenuItem(const void *key _U_, void *value, void *userdata) { - register_eo_t *eo = (register_eo_t*)data; - MainWindow *window = (MainWindow*)user_data; + register_eo_t *eo = (register_eo_t*)value; + MainWindow *window = (MainWindow*)userdata; ExportObjectAction *export_action = new ExportObjectAction(window->main_ui_->menuFileExportObjects, eo); window->main_ui_->menuFileExportObjects->addAction(export_action); @@ -2000,6 +2000,7 @@ void MainWindow::addExportObjectsMenuItem(gpointer data, gpointer user_data) connect(&window->capture_file_, SIGNAL(captureFileOpened()), export_action, SLOT(captureFileOpened())); connect(&window->capture_file_, SIGNAL(captureFileClosed()), export_action, SLOT(captureFileClosed())); connect(export_action, SIGNAL(triggered()), window, SLOT(applyExportObject())); + return FALSE; } void MainWindow::initExportObjectsMenus() -- cgit v1.2.1