diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-03-27 18:19:27 +0100 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2020-04-02 08:50:06 +0000 |
| commit | 772813fcc78388dfb0fe0779943cea6f20f35c2b (patch) | |
| tree | 808f448571aef49cacbbd2262b3140f52adc9cc4 /plugins | |
| parent | e37a7abf56d9e2df8db35303ff15df0adff1a61a (diff) | |
pluginifdemo: fix compilation when it's enabled.
Enable the plugin with ENABLE_PLUGIN_IFDEMO=1.
Change-Id: I8ebc076d3b4ea66443d58e57dce0d235a214a2bb
Reviewed-on: https://code.wireshark.org/review/36606
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'plugins')
4 files changed, 10 insertions, 4 deletions
diff --git a/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp index e8adf094ad..63a69fb190 100644 --- a/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp +++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp @@ -9,7 +9,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <plugins/pluginifdemo/ui/pluginifdemo_about.h> +#include <plugins/epan/pluginifdemo/ui/pluginifdemo_about.h> #include <ui_pluginifdemo_about.h> #include <config.h> diff --git a/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp index 544858d29e..5a663a5167 100644 --- a/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp +++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp @@ -9,7 +9,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <plugins/pluginifdemo/ui/pluginifdemo_main.h> +#include <plugins/epan/pluginifdemo/ui/pluginifdemo_main.h> #include <ui_pluginifdemo_main.h> #include <config.h> diff --git a/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h index d2a3acd0cb..e0bafaab27 100644 --- a/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h +++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h @@ -20,7 +20,7 @@ #include <QSortFilterProxyModel> #include <QStandardItemModel> -#include <plugin_if.h> +#include <epan/plugin_if.h> namespace Ui { class PluginIFDemo_Main; diff --git a/plugins/epan/pluginifdemo/ui/uihandler.cpp b/plugins/epan/pluginifdemo/ui/uihandler.cpp index 3fa659023f..e131d6d173 100644 --- a/plugins/epan/pluginifdemo/ui/uihandler.cpp +++ b/plugins/epan/pluginifdemo/ui/uihandler.cpp @@ -25,6 +25,7 @@ #include <ui/qt/main_window.h> #include <ui/uihandler.h> +#include <ui/simple_dialog.h> static void reset_dialog(void *data _U_) @@ -35,8 +36,13 @@ reset_dialog(void *data _U_) void pluginifdemo_ui_main(ext_menubar_gui_type gui_type, gpointer gui_data) { /* ensures, that the dialog is closing, if scm udid is set or a filter is applied */ - register_tap_listener("frame", NULL, NULL, 0, reset_dialog, NULL, NULL, NULL); + GString *error_string = register_tap_listener("frame", NULL, NULL, 0, reset_dialog, NULL, NULL, NULL); + if (error_string != NULL) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "%s", error_string->str); + g_string_free(error_string, TRUE); + } GuiHandler::getInstance()->showMainDialog(gui_type, gui_data); } |