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/gtk/mtp3_summary.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
| download | wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.gz | |
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/gtk/mtp3_summary.c')
| -rw-r--r-- | ui/gtk/mtp3_summary.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index c45bc48ba5..1917720449 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -530,7 +530,7 @@ mtp3_summary_packet( void register_tap_listener_gtk_mtp3_summary(void) { - gchar *err_p; + GString *err_p; memset((void *) &mtp3_stat, 0, sizeof(mtp3_stat)); @@ -542,8 +542,8 @@ register_tap_listener_gtk_mtp3_summary(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, "%s", err_p); - wmem_free(NULL, err_p); + simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, "%s", err_p->str); + g_string_free(err_p, TRUE); exit(1); } |