diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
tree | ab6223527915ab1127a50563981816adc18b971f /ui/qt/bluetooth_hci_summary_dialog.cpp | |
parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) |
Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
It breaks the registration of codec, dissector and libwiretap plugins.
Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/qt/bluetooth_hci_summary_dialog.cpp')
-rw-r--r-- | ui/qt/bluetooth_hci_summary_dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 87aad65e67..a29d3f8136 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -79,7 +79,7 @@ bluetooth_device_tap_reset(void *tapinfo_ptr) static void bluetooth_devices_tap(void *data) { - gchar *error_string; + GString *error_string; error_string = register_tap_listener("bluetooth.hci_summary", data, NULL, 0, @@ -90,8 +90,8 @@ bluetooth_devices_tap(void *data) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "%s", error_string); - wmem_free(NULL, error_string); + "%s", error_string->str); + g_string_free(error_string, TRUE); } } |