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/simple_stattable.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/simple_stattable.c')
-rw-r--r-- | ui/gtk/simple_stattable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/simple_stattable.c b/ui/gtk/simple_stattable.c index a7d60ecd95..669815d916 100644 --- a/ui/gtk/simple_stattable.c +++ b/ui/gtk/simple_stattable.c @@ -196,7 +196,7 @@ static void init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter) { simple_stat_t *ss; - gchar *error_string; + GString *error_string; GtkWidget *bbox; GtkWidget *close_bt; @@ -221,8 +221,8 @@ init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter) error_string = register_tap_listener(new_stat_tap->tap_name, &ss->data, filter, 0, simple_stat_reset, new_stat_tap->packet_func, simple_stat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); - wmem_free(NULL, error_string); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); + g_string_free(error_string, TRUE); free_stat_tables(ss->new_stat_tap, NULL, NULL); g_free(ss); return; |